Commit graph

1019 commits

Author SHA1 Message Date
WayofTime 8c8331eddf Updated the guide so that it had more infos 2016-06-08 15:36:47 -04:00
WayofTime 150ed4c6a9 Fixed separate NPE with the Sigil of Holding.
Added possible fix to an Incense glitch.
2016-06-07 21:11:21 -04:00
Nicholas Ignoffo eccf747a09 Change from bold to italics
It's much less.. IN-YO-FAIC
2016-06-07 17:19:35 -07:00
Nicholas Ignoffo d16144ee2c Make sure sigils are bound before allowing use 2016-06-07 16:43:24 -07:00
Nicholas Ignoffo b1d73e3383 Fix NPE when pressing keybind with no held item 2016-06-07 16:21:23 -07:00
Arcaratus 8d66575530 Backstage Sigil of Holding (#785)
* Backstage Sigil of Holding
All Sigil of Holding features work, just need to add the aesthetics -> TehNut
Somebody might want to look at adding LP costs to the Sigil?
Also recipes need to be added
Added a keybinding system for future usage
Standardized some NBT tags

Compact classes

Fix lang stuff?

* Fancify Sigil of Holding GUI
Displays the selected sigil in the GUI now

Woops

* Quick fix

* Unused import

* Final commit I promise
2016-06-07 15:50:41 -07:00
WayofTime 9aa2f86c88 Fixed #778 2016-06-07 10:34:36 -04:00
WayofTime f0f6af3eac Fixed #782 2016-06-07 10:15:40 -04:00
Nicholas Ignoffo 2798fb5873 EntryText should have the "hover to display full" feature 2016-06-05 17:38:23 -07:00
Nicholas Ignoffo 600ff65aa8 Fix Plantable harvest handler not replanting (#781)
Another case of NutDerp!
2016-06-05 16:55:01 -07:00
Nicholas Ignoffo 8edf42a5cb Add IGuideLinked for ritual controller 2016-06-05 16:29:36 -07:00
Nicholas Ignoffo 75f8bd0bda Sync ImperfectRitual data 2016-06-05 16:29:06 -07:00
Nicholas Ignoffo 4af15fc059 Move Bucket over to Forge system 2016-06-05 12:31:35 -07:00
WayofTime 9e7517459e Played around a bit more with the guide. Added a simple recipe getter for the recipe pages. 2016-06-05 14:12:28 -04:00
Nicholas Ignoffo 7c1cbb2503 Fix book model 2016-06-04 13:56:02 -07:00
WayofTime 50aa866e24 Updated Guide-API version 2016-06-04 16:19:25 -04:00
WayofTime 424d84d5ad Added a test entry for the Demon Kin 2016-06-04 15:01:25 -04:00
Nicholas Ignoffo 93623a6687 Begin GuideAPI integration 2016-06-03 16:56:13 -07:00
Nicholas Ignoffo d0c0700fda Un-hardcode block documentation
Opens it up for all our custom blocks to be able to provide information.

Need a texture from @Yulife.
2016-06-02 17:03:21 -07:00
WayofTime e406a4fa6f Grew a Pair 2016-06-02 19:13:50 -04:00
WayofTime cf72036ff9 Added an initial (read: rough) method to divine where a blood rune is missing for the next tier of altar 2016-06-02 19:09:02 -04:00
Nicholas Ignoffo c884c3819b Fix retention for @Handler 2016-06-01 16:01:36 -07:00
WayofTime 2ad836fa32 Fixed Demon Crucible's weird behaviour where right-clicking it with an invalid item would still put the item in the crucible and give the player an item with a stacksize of 0 2016-06-01 08:10:15 -04:00
Nicholas Ignoffo ce6c014191 Restore Java 6 compatibility 2016-05-31 17:00:55 -07:00
Nicholas Ignoffo f474c31bc9 Re-implement Waila integration 2016-05-31 16:43:11 -07:00
Nicholas Ignoffo b9464e3dbb Fix Elytra Wings in obf environments
I forgot that obfuscation was a thing last night :D
2016-05-31 16:14:15 -07:00
Nicholas Ignoffo 5d96b9d2bd Add Elytra render for Elytra Upgrade
Temporarily stole a texture for it from https://www.reddit.com/user/lemoncake__ (http://imgur.com/a/sI5cv) until @Yulife can make a real one.
2016-05-30 19:48:28 -07:00
Nicholas Ignoffo 027787e3cd Fix logging levels of LogHelper
Apparently this has always been wrong *shrug*
2016-05-30 18:20:50 -07:00
Nicholas Ignoffo 512600a677 Split EventHandler into multiple different handlers
Better organization allows for finding things easier
2016-05-30 18:20:31 -07:00
Nicholas Ignoffo 5aea7b637a Fix Green Grove Sigil destroying plants (#767) 2016-05-29 16:39:31 -07:00
Nicholas Ignoffo 439e830105 Fix commands for usage in Command Blocks (#748) 2016-05-28 05:19:50 -07:00
Nicholas Ignoffo a37cf7d60b Fix Tile data syncing (#763) 2016-05-28 04:53:19 -07:00
WayofTime bdf540aa76 Changed it so the Sentient Sword drops will for IMob instead of EntityMob - slimes have a 33% reduction to will drop. 2016-05-28 07:27:29 -04:00
WayofTime 5e0a390f48 Fixed Sigil of Magnetism and Call of the Zephyr picking up "dead" items. 2016-05-28 07:19:43 -04:00
Nicholas Ignoffo 3ac00ce4d6 Add recipe for Vengeful Crystal Clusters (#759) 2016-05-28 04:05:16 -07:00
Nicholas Ignoffo 36a5b7f6a1 Fix bound tools working on incorrect materials (#752) 2016-05-27 23:03:32 -07:00
Nicholas Ignoffo 6302ce8133 Fix Life Essence being solid (#751)
Forge missed some fluid changes in 1.9.4.
2016-05-27 22:55:40 -07:00
WayofTime aa3bef31c5 Fixed the Trick Shot upgrade 2016-05-22 12:09:36 -04:00
Nicholas Ignoffo cebf71c329 Fix Gate of the Fold endless loop (#743) 2016-05-21 12:57:04 -07:00
Nicholas Ignoffo dce6bf1e93 Add rune type colors Ritual Diviner tooltip
Fixes casing for direction as well. IE: north -> North
2016-05-21 12:47:17 -07:00
Nicholas Ignoffo 253da93b3e Make it clearer when arrow is not able to fire (#744)
- Now does not fire an arrow (seems kinda obvious)
- Plays the "fire extinguish" sound as further indication.
2016-05-20 22:39:54 -07:00
Nicholas Ignoffo c66b99b535 Remove things that shouldn't be there 2016-05-19 17:46:11 -07:00
Nicholas Ignoffo de5e23e6c4 package-info upd- I mean 1.9.4 update
These are now "required" thanks to Mojang giving us some annotations. Yay..?
2016-05-19 17:43:33 -07:00
Nicholas Ignoffo cb05e643a3 Crusher ritual should ignore unbreakable blocks
Also does destroy effects when removing block
2016-05-16 19:12:33 -07:00
WayofTime 1936e2d251 Fixed bound sword stuttering 2016-05-14 15:33:05 -04:00
Nicholas Ignoffo 0855c61943 Fix bound tool attributes (#741) 2016-05-13 17:05:40 -07:00
Nicholas Ignoffo d70f423a10 Fix NPE in Crusher ritual (#739)
Also adds a utility for spawning an itemstack at a specific block location
2016-05-13 16:50:07 -07:00
WayofTime b684aebdaa Fixed the Living Armour so that it wouldn't get damaged by self-sacrificing when you had upgrades that mitigate unblockable sources. 2016-05-12 15:44:12 -04:00
WayofTime e363ba8ffb - Fixed it so that the Sentient weaponry is actually repairable using any demon will crystals in an anvil
- Changed the stat tracker for Tough Palms so that it counts number of hearts sacrificed, not number of sacrifices
2016-05-12 14:51:42 -04:00
Nicholas Ignoffo d8de125f52 Reduce debug commands perm level to support command blocks (#678) 2016-05-11 20:35:12 -07:00
Nicholas Ignoffo 3f28a9e268 Config for spectral block visible-ness
true = Invisible (default)
false = Visible from the outside
2016-05-11 20:30:23 -07:00
Nicholas Ignoffo 9253d6a410 Add an entity blacklist for the Teleposer (#701)
Added event for when an entity is teleposed. Includes a Post version as well to allow modification of the entity after the fact.
2016-05-11 20:29:16 -07:00
Nicholas Ignoffo cfce1a4a6c Fix spectral blocks being opaque (#716)
Now you can see through the missing fluids

Also reduced the opacity slightly.
2016-05-11 17:40:41 -07:00
Nicholas Ignoffo b2fb264108 Phantom Bridge sigil should now work while riding entities (#717)
http://i.imgur.com/TnQRX6v.gifv
2016-05-11 17:27:01 -07:00
Nicholas Ignoffo f3173c80a7 Fix Phantom Block rendering 2016-05-11 17:26:38 -07:00
Nicholas Ignoffo a37f3fad7b Beets should increase Tranquility (#737) 2016-05-11 16:44:52 -07:00
WayofTime 4486e03736 Merge branch '1.9' of https://github.com/WayofTime/BloodMagic into 1.9 2016-05-11 18:39:03 -04:00
WayofTime d26b300b7b Fixed Elytra upgrade not working on servers. Oops! 2016-05-11 18:38:38 -04:00
Nicholas Ignoffo 3ce6735920 Allow Demonic Will to drop from passive mobs in Peaceful (#733)
Goes along with b2d1b75f49 and #711
2016-05-09 16:38:43 -07:00
WayofTime d79be6d312 Added saltpeter and sulfur, used for gunpowder creation and will be used for other things. 2016-05-06 17:51:39 -04:00
WayofTime ec2ddbd427 Added more alchemy recipes 2016-05-05 15:46:09 -04:00
WayofTime 03fa7b2712 Added plant oil and associated recipes - need to compile a list for future alchemy items 2016-05-05 07:59:08 -04:00
WayofTime e3b72c3b7e Made the Tough Skin effect easier to get, and increased the durability of living armour by 50%. 2016-05-04 19:32:32 -04:00
WayofTime 37cb2a1360 Added some more recipes (like rudimentary ore doubling) to the alchemy table 2016-05-04 19:25:42 -04:00
WayofTime 86efa8b1a3 Updated the Alchemy Table recipe system so that it can provide better custom recipes 2016-05-04 16:44:32 -04:00
WayofTime a5dee50984 Attempted to fix the CME in the routing. 2016-05-03 09:16:56 -04:00
WayofTime 7ce9040aeb Changed Blood Altar to be stone level for the pick. 2016-05-03 07:29:35 -04:00
WayofTime 25108a5838 Formatting pass. 2016-05-02 20:56:32 -04:00
WayofTime 1e9f3dadd3 Merge pull request #723 from lazerzes/1.9
Fixed Issue #703; Blocks with MetaData being reset to 0
2016-05-02 20:54:22 -04:00
lazerzes 3f5fd16f87 Fixed Issue #703; Blocks with MetaData being reset to 0 2016-05-02 20:45:38 -04:00
WayofTime c80b083865 More tweaks to the alchemy table, as well as some minor recipes. 2016-05-02 20:08:25 -04:00
WayofTime ce385bd9a6 Added JEI compat for the Alchemy Table 2016-05-02 13:45:52 -04:00
WayofTime f9fc33d1ee Finished work on ISided nature of the alchemy table 2016-05-02 11:45:11 -04:00
WayofTime a03bc4d9a9 Forgot files... 2016-05-02 11:24:34 -04:00
WayofTime c32ac20936 Work on alchemy table 2016-05-02 11:24:22 -04:00
WayofTime 7116e3775e Worked on the Alchemy Table - final push for -35 2016-05-02 08:27:38 -04:00
WayofTime bc7760b11b Removed bad code from Elytra upgrade. 2016-05-01 22:33:13 -04:00
WayofTime d3379ff69b Additional work on the Alchemy Table, as well as the Elytra upgrade. 2016-05-01 22:32:15 -04:00
Nicholas Ignoffo d10d6e6275 Comment out Waila compat until Waila updates mappings 2016-05-01 13:55:15 -07:00
WayofTime f754d14927 Elytra upgrade~ (Untested) 2016-05-01 15:10:32 -04:00
Nicholas Ignoffo 08f865ba8a Fix JEI support for orb recipes with more than 1 orb 2016-05-01 09:10:12 -07:00
Nicholas Ignoffo 8283047bf1 Re-implement Waila compat 2016-05-01 09:00:49 -07:00
Nicholas Ignoffo cfa40e9bfb Update JEI compat
Supports new category item system.
Fixes Binding category input slot cycling through input and catalyst.
2016-05-01 08:35:07 -07:00
WayofTime 41edd86602 Work on Elytra upgrade.
Fixed Lava Crystals again
2016-05-01 10:01:00 -04:00
WayofTime 08de13b482 Added fall distance mitigation to the jump upgrade 2016-04-30 10:39:50 -04:00
WayofTime aba4332699 Changed it so that the Mending enchantment consumes the EXP before the Tome of Peritia does 2016-04-29 19:55:23 -04:00
WayofTime 172cf86348 - Changed Living Armour so that it is now damagable. The Living Armour Chestplate will be damaged, but will not break. If it gets to ~0 durability, it will damage your LP network heavily.
- Living Armour is now repairable in an anvil with Binding Reagent.
- Started adding in the Alchemy Table... not really started.
2016-04-29 19:45:45 -04:00
Nicholas Ignoffo aacb54962b Remove Compression mod bandaid
An actual fix was implemented by the author.
2016-04-24 11:54:05 -07:00
Nicholas Ignoffo 4a1484965c Fix spam when registering potions 2016-04-24 11:52:58 -07:00
Nicholas Ignoffo d550513f0a Update Forge + mappings 2016-04-24 10:06:28 -07:00
Nicholas Ignoffo b408234ab0 Fix formatting in compression compat 2016-04-24 08:50:10 -07:00
Nicholas Ignoffo ba17fe126e Config for ignoring Compression mod's compress recipes
Over 3200 recipes with *just* vanilla + BM is... bad. Nobody should be adding that many...
2016-04-24 08:30:59 -07:00
Nick 137beb4006 Add a clickable area to Soul Forge to view recipes 2016-04-18 19:23:47 -07:00
Nick 6449da0733 Use separate texture for activated sac dagger instead of enchant overlay 2016-04-17 14:03:26 -07:00
Nick a4f55d88b6 Change some int displays to Roman Numerals
May not be 100% accurate if you somehow manage to get these really, really high, but it's good enough.
2016-04-17 13:51:39 -07:00
Nick d71f181729 Add decoration safe tooltip to Blood Runes and Ritual Stones 2016-04-17 13:50:23 -07:00
Nick 458f8810b6 Fix Sacrificial Runes not affect sacrifice amount (#713) 2016-04-17 00:03:53 -07:00
Nick b2d1b75f49 Allow passives to drop Will in Peaceful (#711) 2016-04-15 16:46:58 -07:00
WayofTime 0e4e428f0e Fixed NPE when re-activating a ritual. 2016-04-15 13:19:32 -04:00
WayofTime f770f5eb30 Finished localization of ritual descriptions (for now). 2016-04-15 10:59:22 -04:00
WayofTime 7ca72320c5 Initial work on Capabilities usage for inventories. 2016-04-13 17:58:06 -04:00
WayofTime 744feffc54 Added the recipe for the ritual tinkerer and modified the recipe for the bloodstone blocks. 2016-04-13 14:50:42 -04:00
WayofTime 049d7c8472 Fixed shift-clicking for the routing nodes 2016-04-13 11:46:28 -04:00
WayofTime c0b39039cc Fixed the Speed and Jump rituals so that they correctly update the player's motion 2016-04-13 11:05:17 -04:00
Nick Ignoffo 81e9452a21 Merge pull request #709 from Arcaratus/1.9
Improved the API and internal workings
2016-04-12 18:37:05 -07:00
Arcaratus 3e50dd4117 Improved the API and internal workings
Update things

Fix some more things

Update once more

Refactoring and removing unnecessary null checks

Woops

Fix

Nother fix

Moar fix

Fix imports

Update ItemBindable.java
2016-04-12 20:34:08 -04:00
WayofTime 8571d4d264 Potential fix for routing nodes (I changed nothing, but it now works). Fixed blocks that are solid that did not block sunlight. 2016-04-12 15:25:16 -04:00
WayofTime 0a2dfb4fd4 Finished more ritual stuff 2016-04-11 17:31:14 -04:00
WayofTime 91ddb8b761 A lot more implementation work for custom areas for rituals. 2016-04-11 15:36:27 -04:00
WayofTime 51c79f15a9 Added chest ranges to the rituals that have chests, allowing the location of the chest to be assigned by the player. 2016-04-11 09:57:57 -04:00
WayofTime 9fe525b74b Did more work on the Ritual Reader. Fixed issue with the Ritual Diviner cycling its direction when you right click on the MRS. 2016-04-11 08:26:41 -04:00
WayofTime 057a951732 Did more work on the Ritual Reader - functionally, it is at about 80%. 2016-04-10 22:09:32 -04:00
WayofTime 30f233b81a Untested Ritual Reader stuff, and removing some registry shenanigans. 2016-04-10 21:19:18 -04:00
WayofTime db268b23a4 Started work on the "Ritual Reader," which will in the future give more information about rituals as well as allow you to set the custom areas of the rituals. 2016-04-10 15:05:51 -04:00
Nick f88dae6dda Add setRegistryName calls where missing
Also fixed Teleposition Sigil having Teleposition Focus's name. Stupid auto-complete not knowing which "TELEP" I wanted.
2016-04-09 17:06:41 -07:00
Nick d48e4e5ae8 Move setRegistryName out of item/block constructors 2016-04-09 16:50:16 -07:00
WayofTime b259afc7df Updated changelog, changed Sacrificial Dagger's call to protected 2016-04-09 17:59:25 -04:00
WayofTime 8b4a7d4999 Did some work on the Sentient Bow to start adding abilities to it 2016-04-09 17:57:30 -04:00
WayofTime 9768909eb8 Fixed it so the sentient bow actually shoots sentient arrows. 2016-04-09 15:35:02 -04:00
WayofTime 0b38f16672 Attempted to do a bit of rebalancing with the upgrade points 2016-04-07 21:11:25 -04:00
WayofTime 21473c12cd Added True Strike, increasing the damage of critical hits 2016-04-07 16:27:34 -04:00
WayofTime 7b94e414f8 Added Charging Strike armour upgrade 2016-04-07 15:12:57 -04:00
WayofTime bd36e95fc9 Reworked damage-modifying upgrades 2016-04-07 14:22:45 -04:00
WayofTime aa6d7bcfaa WTP, SourceTree? 2016-04-07 14:05:36 -04:00
WayofTime 2c72a27f8f Added step assist living armour upgrade tracker 2016-04-07 14:00:18 -04:00
WayofTime 832371271a Added recipe for the Tome of Peritia 2016-04-07 10:44:20 -04:00
WayofTime c3922fad63 Rebalanced Grave Digger so that it takes into account the swing cooldown 2016-04-07 10:35:00 -04:00
WayofTime 7d9312b2f8 Reverted changes to Living Armour - waiting on change to Forge's armour to balance properly. 2016-04-07 10:07:55 -04:00
WayofTime aa480af518 Updated forge, did random stuff to the armour before realizing issues with armour calculations 2016-04-06 21:04:50 -04:00
WayofTime b56bbef29e Formatting! 2016-04-05 16:16:17 -04:00
WayofTime 029091852d Fixed Water and Lava sigils placing two sources in special scenarios. 2016-04-05 16:13:49 -04:00
Nick 794ac6a7a2 Move binding back to PIE
BM will now only load with Forge 1840+ as that is the version that PIE was re-implemented. Set dependency to avoid crashes. Also updated JEI version so it wouldn't crash with new Forge.
2016-04-04 19:23:06 -07:00
WayofTime b0b61798fe Added "Grave Digger" living armour upgrade 2016-04-04 20:18:10 -04:00
WayofTime 1c6c7ba0a6 Fixed some minor bugs with the Living Armour 2016-04-04 19:24:43 -04:00
WayofTime 0755202a35 Fixed custom potion effects so they could be applied server-sided 2016-04-04 13:35:10 -04:00
WayofTime fa6c57091b Fixed an issue with the sentient sword having an attack speed of 4 when it did not make a will bracket. 2016-04-03 21:59:47 -04:00
WayofTime 6630e50efd Fixed the Sentient Sword so that it would use the default will type if it didn't have enough will. 2016-04-03 21:46:23 -04:00
WayofTime 02adac819d Fixed OutOfBoundsException in the Sentient Sword when you didn't have enough Will 2016-04-03 19:19:45 -04:00
WayofTime 912f1694e8 Added increase in speed for Routing nodes inside of a chunk with Demon Aura 2016-04-03 17:08:00 -04:00
WayofTime 25bfa0c969 Fixed armour calculations for unblockable sources 2016-04-03 13:44:47 -04:00
WayofTime 0afc150cc3 Rebalanced soft fall upgrade poings 2016-04-03 12:19:52 -04:00
WayofTime 96ecd73286 Added Soft Fall and Strong Legs living armour upgrades. 2016-04-03 12:17:42 -04:00
WayofTime f9bf63ccf1 Fixed NPE when using an empty bucket 2016-04-03 10:12:10 -04:00
WayofTime fe5a544e9d Finished the behaviour of the experience book. 2016-04-03 08:54:15 -04:00
WayofTime dbedcf0745 Fixed it so that the blood orb is no longer consumed in the crafting grid 2016-04-03 07:58:01 -04:00
WayofTime be87a96a5f Fixed formatting not working properly on servers. 2016-04-02 21:44:50 -04:00
WayofTime d20ad198be Working on the experience book 2016-04-02 20:09:23 -04:00
Nick 2258f7b442 Fix registered name spam 2016-04-02 16:15:22 -07:00
WayofTime 7a119adaf9 More work on the Item Experience Book. Changed the names of the Sanguimancy rituals to be more... majestic. 2016-04-02 18:45:52 -04:00
WayofTime 1d14692a93 Slowly working on an experience book for the mod. Changed Curse building to Beta 2016-04-02 16:42:04 -04:00
WayofTime 378c59d2b3 Updated to Forge 1826 2016-04-02 16:02:01 -04:00
WayofTime 39df6d5bb0 Fixed living armour's training bracelet so that it deactivates any training of upgrades not supported
Added "Experienced" living armour upgrade, which provides more xp from picked up orbs.
2016-04-02 10:10:49 -04:00
WayofTime cc7c594c52 - Removed health buff from Steadfast armour
- Changed corrosive sword's effect from poison to wither
2016-04-01 14:29:56 -04:00
WayofTime 66f3a9b581 Fixed #697 2016-03-31 21:11:58 -04:00
WayofTime b1a532950d Added damage boost and attack speed penalty for the Destructive sentient armour 2016-03-31 12:37:39 -04:00
WayofTime 92992e246b Fixed issue with Sentient Sword damage always being 12. 2016-03-30 19:32:57 -04:00
Nick 1cdcd81508 Pull teleportBlocks method into general utility class
It's useful in other places and those other places really shouldn't be firing off the TeleposeEvent.
2016-03-29 17:38:11 -07:00
WayofTime 63b541da06 Fixed Teh Nut derp 2016-03-29 19:56:15 -04:00
WayofTime 1b0e07cdb1 Added speed effect to Vengeful armour 2016-03-29 19:36:12 -04:00
Nick 7716e743ad Fix possible NPE on telepose (#693) 2016-03-29 16:27:59 -07:00
WayofTime eb43a7d04a Added movement speed on the Vengeful sword when in-hand. 2016-03-29 18:54:12 -04:00
WayofTime 7977fa351f FINALLY changed it so farm animals do not drop demon will
Did work on the armour's unique effects.
2016-03-29 18:39:52 -04:00
WayofTime 3fc5a76d53 Tweaked Tartaric Gem interactions. 2016-03-29 16:34:39 -04:00
WayofTime 39dbaea109 Finalized sentient sword effects 2016-03-29 16:11:16 -04:00
WayofTime 4f6f3860c0 Added Sentient Bow textures and models. Not the most elegant method. 2016-03-29 13:25:00 -04:00
WayofTime 4a58fc5518 Updated Forge to 1813. Worked on the SentientArmour so that it is able to use the different will types depending on what is the highest. 2016-03-29 09:22:25 -04:00
WayofTime 4ea3e0ca92 Created visual niceties when an item uses/contains a different will type. 2016-03-28 20:14:05 -04:00
WayofTime bd79afd46d Fixed the divination sigil and did a variety of other fixes. 2016-03-28 07:25:51 -04:00
Nick c2fe583496 Temporary workaround for binding
Also fixes lots of things that went wonky when #684 was merged

I have no clue how much is still broken. Guess we'll find out :D
2016-03-27 20:11:03 -07:00
Nick 1aaa817e65 Cleanup Alchemy Array recipe registry a bit 2016-03-27 20:09:30 -07:00
WayofTime ed42650c2e Playing with secondary effects provided by the offhand. 2016-03-27 16:53:08 -04:00
Nick Ignoffo 000ef44068 Merge pull request #687 from Arcaratus/1.9
OreDict recipe support!
2016-03-27 10:13:42 -07:00
Arcaratus 800ffa213b OreDict Altar Recipes!
OreDict support for altar and alchemy array recipes!
Changed the alchemy array JEI image

Recipe modularizations

Fix

Like this?

Tehnut patch

Change to List<ItemStack>
2016-03-27 13:12:56 -04:00
Nick 30bc020055 Localized some routing tooltips/chat 2016-03-26 12:32:51 -07:00
WayofTime 5cb39d1dbd Updated to Forge 1811 2016-03-26 14:32:06 -04:00
WayofTime f9cb1a08ba Finished the crystal automation ritual, "Gathering of the Forsaken Souls." 2016-03-24 19:10:57 -04:00
CJCutrone ba00b166aa Fix ItemBoundSword damage [1.9 branch]
Redid this on the proper branch.
https://github.com/WayofTime/BloodMagic/pull/685
2016-03-24 16:45:51 -05:00
WayofTime 3d2e1d911f 90% finished implementing the crystal growing ritual. 2016-03-24 16:18:39 -04:00
WayofTime f0730791f7 - Changed the growth behavior of the crystals
- Fixed Potion getting for various methods
- Started work on crystal automation ritual
- Finished first iteration of the iterator of AreaDescriptor
2016-03-24 14:11:05 -04:00
Arcaratus 0383f0fb31 Move some base classes into the API
Add Javadocs for API classes that didn't already have them

Redo

'nother redo

Another redo

Update ItemSigil.java

Last one, I swear

Fix
2016-03-23 20:23:39 -04:00
WayofTime 801355c051 Fixed rendering of .obj models in hand as well as a few small tweaks to attachment logic for routing nodes. 2016-03-22 11:11:11 -04:00
WayofTime 95b10f35c8 Fixed "see through world" syndrome for most blocks 2016-03-22 09:31:47 -04:00
Nick d8fe6d21bd Update Forge + Mappings 2016-03-21 12:55:36 -07:00
Nick aa48c540f5 Move armor items to IMeshProvider
Minor change to IMeshProvider allow for this
2016-03-20 23:21:07 -07:00
Nick 6cd993a619 Re-add localization checks to tooltips 2016-03-20 22:55:03 -07:00
WayofTime fc70319fa2 Sentient Bow now properly renders when pulling. 2016-03-20 10:06:53 -04:00
WayofTime fdbdcd56b6 Fixed armour textures 2016-03-19 10:30:01 -04:00
WayofTime 647046fd22 Fixed sentient armour gem. 2016-03-19 10:24:37 -04:00
WayofTime b86f7c24ed Fixed #677 2016-03-19 08:47:59 -04:00
WayofTime 48b3a7ce8b Fixed #676 2016-03-19 08:29:38 -04:00
Nick b9e4ac1e98 Combine TranquilityHandlers into single class 2016-03-18 21:31:18 -07:00
WayofTime fc70bcf107 Changed so items only give their "bonus" while in hand - will change for LivingArmour too. 2016-03-18 18:01:52 -04:00
WayofTime a71673a60e Fixed so that it now boots properly 2016-03-18 17:20:48 -04:00
WayofTime 239b6e5b1f Updated teleport logic (Untested) (0 errors) 2016-03-18 17:12:34 -04:00
WayofTime 966f663270 Entities (20 errors) 2016-03-18 16:57:57 -04:00
WayofTime ac3ac8d272 Items (27 errors) 2016-03-18 16:50:33 -04:00
WayofTime 000c4c5692 Bound Tools (61 errors) 2016-03-18 16:31:55 -04:00
WayofTime dcbc1c0bc4 ModItems and random imports (114 errors) 2016-03-18 16:08:06 -04:00
Nick 1bcc4e47e0 Fix a few nutderps on block updates
Incorrect assumptions + adopting very early = mistakes were made
2016-03-18 13:05:57 -07:00
WayofTime 26f7c874ff EventHandler (139 errors) 2016-03-18 16:05:01 -04:00
Nick 34f5753b17 More item fixes
- Living and Sentient armor have no armor models
- (Self) Sacrifice Pack have no armor models
2016-03-18 12:45:37 -07:00
WayofTime f95949a1c8 Sigils (257 errors) 2016-03-18 15:38:26 -04:00
Nick d05d3b90df Update BlockInteger/String 2016-03-18 12:01:58 -07:00
WayofTime 5e9454d390 Divination and Seer sigils (362 errors) 2016-03-18 15:00:23 -04:00
WayofTime 09168fa386 More error fixes (down to 381) 2016-03-18 14:54:31 -04:00
WayofTime 7706d0667a Fixed command and rendering of the sentient arrow. 2016-03-18 13:21:45 -04:00
WayofTime 10c6829482 Block fixes 2016-03-18 13:16:38 -04:00
Nick 252a4559f0 Re-add JEI compat 2016-03-18 04:07:49 -07:00
WayofTime 0c268a0bea Test push to verify everything is working 100% 2016-03-17 16:47:15 -04:00
Nick 6c729db70c Initial 1.9 commit
This DOES NOT BUILD. Do not even attempt.

Almost everything has been ported besides the block/item packages. Then it's a matter of testing what broke.
2016-03-17 13:00:46 -07:00
Nick f896383fe6 Allow Mob Spawners to be teleposed (default blacklisted) (#671) 2016-03-16 15:47:42 -07:00
WayofTime 134b11f177 Normalized code formatting. 2016-03-16 18:41:06 -04:00
Nick b1db7c5152 Most blocks are done 2016-03-16 15:37:55 -07:00
Nick e8d2c523e4 Decrease teleport cooldown for non-living entities (#671) 2016-03-16 11:26:29 -07:00
Nick 599ff5ab67 Blacklist Demon Crystal from Teleposer (#671) 2016-03-16 11:23:22 -07:00
Nick 03662c0cd3 Most items done now 2016-03-16 01:10:33 -07:00
Nick ba0b24d231 Begin new model system
Includes some examples for both ways.
2016-03-15 22:48:01 -07:00
Nick 2700841973 Changed wills to go straight to inventory and only drop excess (#654) 2016-03-15 19:50:03 -07:00
Nick 6a6cb53d8f Bound Tools are now enchantable (#664) 2016-03-15 19:38:45 -07:00
Nick 14267656cb Fix bound tools unreliably breaking blocks 2016-03-15 18:37:34 -07:00
Nick 830a6bcc36 Fix desync with Phantom Blocks (again) (#668) 2016-03-15 12:12:15 -07:00
Nick 173fdbfb2d Make Blood Lights more visible when holding Sigil (#340)
Spawns some extra particles to make it more noticeable
2016-03-14 20:23:31 -07:00
Nick 6736d2cf4b Fixed Blood Light Sigil not using LP (#653)
Also a bandaid for accidental spamming of lights. 10 tick cooldown before being able to place another.
2016-03-14 20:18:54 -07:00
Nick 0f4e1ad4cb Fix step height being reset to incorrect value (#652) 2016-03-14 19:46:59 -07:00
Nick d9e9a4704a Debug commands
Not fully tested. The ones tested do work, though.
2016-03-14 19:00:03 -07:00
Nick a3b7001d55 SoulNetwork setters should automatically markDirty() 2016-03-14 18:58:44 -07:00
Nick abb58b57e5 Fix Creative dagger not filling Altar to capacity 2016-03-14 18:58:13 -07:00
Nick 399442cf62 Helper method for getting the max LP contained in a tier
Finds the highest capacity of the orbs in a given tier
2016-03-14 18:57:39 -07:00
Nick 0ba6ff8235 Fix orb tier never being set in SoulNetwork
Oopsy
2016-03-14 18:56:55 -07:00
Nick f5d02b2807 Interface cleanup
Specifying public in an interface is redundant.
2016-03-14 18:55:44 -07:00
Nick 76b3c14499 AddToNetworkEvent should be cancellable 2016-03-14 18:55:05 -07:00
WayofTime 22bd2f0628 Fixed WillChunks so that you should not get a null chunk when requested. 2016-03-14 20:16:31 -04:00
WayofTime cbe858e581 Fixed Hellfire Forge's GUI 2016-03-07 06:39:37 -05:00
WayofTime 4fd39b6348 Fixed altar crashing 2016-03-07 06:30:58 -05:00
Nick 126d17b55d Clean up some javadoc spam
Still need to figure out why delombok is priting an error for every non-BM import. It was apparently fixed in `gradle-lombok` 1.5 but it seems to have returned.
2016-03-02 12:56:57 -08:00
Nick fe18be56fd Update graphic for Altar page in docs
Removes the Sanguimancy part and use new graphical style
2016-03-01 13:45:45 -08:00
Nick 5cd44fd40c Change node beam texture to an internal one
So @Yulife shuts up about it :P
2016-03-01 09:09:21 -08:00
Nick 3f8cccf056 Config to only render routing lines while an INodeRenderer is held
Current INodeRenderer's are the Node Router and all Routing Nodes
2016-02-29 23:20:57 -08:00
WayofTime 507d41111d Reverted GuiButton variables to standard method. 2016-02-27 19:37:42 -05:00
WayofTime 6b52b5131b Merge pull request #649 from Arcaratus/1.8
Routing node cleanup
2016-02-27 19:35:03 -05:00
WayofTime 7106579201 Updated changelog and added recipes. Also created behaviour for the crystals to drop single crystals. 2016-02-27 19:34:42 -05:00
WayofTime 620023d098 Fully implemented discrete demon will, which means the demon crystals can be inserted into demon crucibles to create will. 2016-02-27 16:36:56 -05:00
Arcaratus e89451ed36 Routing node cleanup 2016-02-27 11:38:40 -05:00
Nick f21e97063a Fix formatting + tooltips 2016-02-26 21:35:41 -08:00
Nick 8d5e9c125b Initial stab at documentation 2016-02-26 21:22:34 -08:00
WayofTime 70f4c117d7 Added growth method for the crystals. 2016-02-26 22:11:28 -05:00
WayofTime ea24e7edd8 Created the proper rendering for the crystal clusters while in hand 2016-02-25 22:00:02 -05:00
WayofTime 19fec96bfd Added different types of Demon Will crystals. Obtainment method still TBD 2016-02-25 16:19:57 -05:00
WayofTime 8077962e08 Fixed brightness issue with crystals. 2016-02-25 11:29:48 -05:00
WayofTime 3fc6b5627f Testing translucent textures. 2016-02-25 10:45:00 -05:00
WayofTime da6f410394 Lots of import rearrangement due to odd "clean up" algorithm. Added Crystals, which are very WIP. 2016-02-25 08:54:18 -05:00
Nick 99c2b26c6b Durability for Inscription Tools 2016-02-23 22:48:34 -08:00
Nick 7af53ce85b Add AltarCraftedEvent
Called after an altar has crafted an item. Not cancellable, however the output itemstack may be modified.
2016-02-23 22:48:15 -08:00
Nick 45710ebb8f Some minor cleanup
* Hid Dimensional Portal from JEI and Creative
* Fixed stacktrace spam when invalid portal was stepped into
* Fixed tank rendering no model at all
* Fixed NBT saving for Dimensional Portal
2016-02-23 22:47:28 -08:00
Nick Ignoffo 5c5cda1917 Merge pull request #641 from Alex-hawks/1.8
Add Capability support to Ritual Sones, Finish TE support as well
2016-02-23 21:33:55 -08:00
WayofTime 743af85a61 Added Demon Pylon (currently no model) which pulls demon will from surrounding chunks into its chunk. 2016-02-23 13:40:08 -05:00
alex-hawks 33f05cd819 Add Capability support to Ritual Sones, Finish TE support as well 2016-02-24 01:52:52 +08:00
WayofTime 7104138e2b Implemented Priority System for the item routing system. Lower numbers are looked at first. 2016-02-22 21:19:22 -05:00
WayofTime 2c49c49441 Started work on Demon Will Inversion system. 2016-02-21 20:10:56 -05:00
WayofTime 0524daa16c Fixed suicidal portals in SMP 2016-02-21 13:26:09 -05:00
Nick 8393cca118 Blacklist Alchemy Array from JEI 2016-02-20 15:51:44 -08:00
WayofTime 37227d42f9 Fixed path blocks so they are actually craftable. 2016-02-20 15:34:16 -05:00
WayofTime 4a1cf11f6d Merge pull request #637 from Arcaratus/1.8
Backwards rune recipes and texture fix
2016-02-20 14:33:22 -05:00
Arcaratus f83838c8b1 Backwards rune recipes and texture fix 2016-02-20 14:30:35 -05:00
WayofTime c364ebf6ae Fixed armour so that it properly increments the upgrade points for extended play sessions. 2016-02-20 13:46:53 -05:00
WayofTime 8e8562e5a0 Minor fix to crushing ritual. Felling ritual's upkeep cost was reduced. 2016-02-19 20:11:29 -05:00
WayofTime b3636fe12f Fixed filters so that they would send a block update to the inventories when updated. Also nerfed the bound sword. 2016-02-19 19:47:58 -05:00
WayofTime a88d7f43b8 Created fillWill method for the tartaric gem. 2016-02-19 08:03:33 -05:00
Nick a056835a31 Move last PR into single event handlers
Also includes a var in the main class for if we're running in an obf env or not. Use this for debugging
2016-02-18 19:44:39 -08:00
Arcaratus da711c0461 Ritual holograms! 2016-02-18 21:59:10 -05:00
WayofTime 035ba94976 Reworked Tartaric Gems so that they contain specific demon will types (work for the future) 2016-02-18 18:00:02 -05:00
WayofTime e2e1b3c50f Merge branch '1.8' of https://github.com/WayofTime/BloodMagic into 1.8 2016-02-18 12:53:36 -05:00
WayofTime 70d0723dde Added recipes for sigils. Updated changelog for -18 release. 2016-02-18 12:53:04 -05:00
Nick a35aced93a Check if owner is set before syphoning 2016-02-18 09:51:58 -08:00
Nick 48622bf2e7 All Getter methods for lists/maps in registry now return new copies 2016-02-18 09:49:12 -08:00
Nick d997932306 Water Sigil can now fill the Cauldron (#617) 2016-02-18 09:37:31 -08:00
WayofTime 19bf728da3 Fixed rituals not correctly re-activating when taking off a redstone signal after reloading the world. 2016-02-18 12:26:42 -05:00
WayofTime 34a9b5a7ec Fixed Portal ritual. 2016-02-18 12:11:29 -05:00
Tombenpotter 7e8aec8652 Huge commit for the Pull-Request.
Added a lot of things:
- Blood Tank
- Teleposition Sigil
- Transposition Sigil
- Cobblestone/Netherrack/Obisidian generation Ritual
- Tree Cutter Ritual
- Pump Ritual
- Altar Builder Ritual
- Block Placing Ritual
- Portal Ritual
- Teleportation System and API Components
- Cross pattern Area Descriptor
- Two reagents and their textures for the sigils’ crafting

Fixed:
- Teleposer not teleporting entities correctly

And probably other things I forgot!
2016-02-18 17:25:11 +01:00
WayofTime d947f23696 Attempted to improve the crucible's logic. 2016-02-18 09:03:18 -05:00
Nick 29a8117771 Fix Spectral Block storing of block 2016-02-18 02:03:38 -08:00
Nick 4becdbf969 Update JEI to latest
Fixes issue where setting "after:JEI@[1.2.3,)" would cause the blacklist to break.
2016-02-18 00:06:25 -08:00
WayofTime c641f69809 Fixed a bit more logic of the demon crucible. 2016-02-17 21:23:13 -05:00
Nick 8a9b88d0cb Sigils now cut their description tooltip if too long 2016-02-17 16:10:16 -08:00
WayofTime ccb706f15c - Removed the FOV effect from the Quick Feet speed upgrade.
- Minor work on the Demon Crucible.
2016-02-17 16:31:11 -05:00
WayofTime 3e94aeae77 Added obj for WIP Demon Crucible (name pending). Fixed Floating Incense Altar syndrome. 2016-02-17 09:21:22 -05:00
Nick af193c3e5b JEI support for Blood Orb recipe type
We can now move all the recipes over to Shape(d/less)BloodOrbRecipe
2016-02-16 20:48:42 -08:00
Nick 65dd24b19b Move Revealing upgrade to tc compat class/package 2016-02-16 15:45:44 -08:00
Arcaratus abf54bf9af Beginning Thaumcraft compat
Derp
2016-02-16 18:41:59 -05:00
WayofTime 15650bac8b Amended range of Zephyr ritual
Fixed Green Grove ritual
Fixed Crusher ritual so it didn't break everything at once.
2016-02-16 11:46:47 -05:00
Nick 8f453f6e1e ItemBindable static methods now look for IBindable 2016-02-15 15:02:32 -08:00
Nick 58e51b9d51 Move IMC handling to it's own class 2016-02-15 15:01:03 -08:00
WayofTime 3c26dba99e Added recipe for the training bracelet. Combine in an anvil with an upgrade tome to set it as the upgrade to train 2016-02-15 17:20:33 -05:00
WayofTime db4c68e5f3 Added Ritual: Ritual of Living Evolution, which is used to set the living armour's max upgrade points to 300. 2016-02-15 17:13:50 -05:00
WayofTime 7610329d0a Added Ritual: Song of the Cleansing Soul to remove Living Armour upgrades from the armour. 2016-02-15 15:27:39 -05:00
WayofTime b5c8c2242a Fixed step height issues. 2016-02-15 13:36:47 -05:00
WayofTime 8ec653b2a7 Fixed lava crystal working even if there is no LP available. Causes a desync on server worlds. 2016-02-15 08:11:18 -05:00
WayofTime 18a36b9778 Fixed incense altar so that it checked two blocks above its level properly. 2016-02-15 07:11:02 -05:00
WayofTime 64efaf854b Implemented most of the framework required for training specific Living Armour Upgrades. 2016-02-14 21:50:32 -05:00
WayofTime 01d4bdffa2 Fixed Sacrificial Dagger so it properly bypasses armour reduction checks. 2016-02-14 08:26:19 -05:00
WayofTime 1787f50a65 Added recipes for various sigils. 2016-02-12 20:48:00 -05:00
WayofTime f195c5a486 Fixed bug where Living Armour would give its upgrades even if you didn't have the full set. 2016-02-12 20:24:20 -05:00
Nick 0828e965c6 Fix NPE when setting position of Teleposition Focus (#609) 2016-02-12 12:49:32 -08:00
WayofTime bb106e84ef Fixed tranquility check on seer sigil. 2016-02-12 06:27:44 -05:00
WayofTime 95354ad557 Added Runic Shielding upgrade to the Living Armour. 2016-02-11 17:53:20 -05:00
WayofTime 460df89e10 Fixed Blood Altar resetting when clicked with an item. 2016-02-11 15:56:08 -05:00
WayofTime c6b446faf9 Fixed uncommon error in the Seer and Divination sigils. 2016-02-11 15:44:32 -05:00
WayofTime 69eb621fc8 Finalized Solar Powered perk. Worked a bit more on Grim Reaper's Sprint. 2016-02-11 14:10:43 -05:00
WayofTime a5391840a4 Small change to docs in NetworkHelper. 2016-02-11 07:29:11 -05:00
Nick 04c0c32188 More work on moving models into ItemStates 2016-02-10 18:49:02 -08:00
Nick 325cda2f71 Begin cleaning up model registration 2016-02-09 19:07:56 -08:00
Nick f613c00970 Change Revealing upgrade to follow other upgrades
Obtained the same way as before.
2016-02-09 18:49:38 -08:00
Nick be0a93143d Blacklist some more NBT tags from JEI 2016-02-09 18:26:30 -08:00
WayofTime bb40cbb216 Fixed something 2016-02-09 21:08:54 -05:00
WayofTime 1d7b6febb9 Merge branch '1.8' of https://github.com/WayofTime/BloodMagic into 1.8 2016-02-09 20:22:18 -05:00
WayofTime 2be1d50541 Attempt to implement the Living Armour upgrade for the Grim Reaper's Sprint. 2016-02-09 20:22:14 -05:00
Arcaratus a0b5571f96 Touched up Divination Sigil -> Incense Altar interaction 2016-02-09 18:13:18 -05:00
WayofTime 4e054224ac Fixed step height issues with PotionBoost. Fixed some formatting errors. Set the path blocks' max path lengths. 2016-02-09 15:53:22 -05:00
Nick 82e802e936 Update JEI compat 2016-02-08 16:23:58 -08:00
WayofTime e4b724a6e4 Fixed routing nodes so that their parts do not fight when rendering. 2016-02-08 18:42:45 -05:00
Nick 5757fab22d Alchemy Array should only store a max stack size of 1 2016-02-08 14:41:58 -08:00
Nick faf4562df9 Bound tools now follow the BreakEvent (#79) 2016-02-08 14:17:56 -08:00
Nick 64660d2d28 Comparator support for Blood Altar
Default behavior is to check the amount of LP currently inside the Altar. To modify the behavior to check the amount of LP in a network (As it did in 1.7.10), place a Blood Stone Brick (either kind) directly underneath the altar.
2016-02-08 13:49:40 -08:00
Nick 4e1de51cf8 Implement new path blocks 2016-02-08 00:57:02 -08:00
WayofTime 8c3019447a fixed NPE in the blood orbs. 2016-02-07 18:21:28 -05:00
WayofTime b406bb4672 Fixed melee damage, trick shot, and defense stat trackers. 2016-02-07 15:37:35 -05:00
WayofTime fa6b338a03 Fixed NPE when draining the Blood Altar while it has an empty buffer. 2016-02-07 06:45:38 -05:00
WayofTime b90f498282 Translucified the node textures and decreased the beam width. 2016-02-06 18:06:25 -05:00
WayofTime 9d64a43ee4 Go go node models~ 2016-02-06 17:36:37 -05:00
WayofTime f1621f1bce Fixed imports.
Apparently that's important too.
2016-02-05 22:29:22 -05:00
WayofTime 52aae56335 There were more. 2016-02-05 22:25:26 -05:00
WayofTime 22db498592 Fixed Bound Sword custom mesh definition so that it isn't registered server-side 2016-02-05 22:23:00 -05:00
Nick ca64ecfc66 Inform players if they are not using their Divination sigil
Should lower the amount of "why isn't my network filling?" questions.
2016-02-05 18:05:44 -08:00
Nick 10b58ee7ad Update models. Change bounding box of Hellfire Forge 2016-02-05 15:17:43 -08:00
Nick fc49dc92ed Fix imperfect rituals crashing client
I should really, *really* stop breaking this.
2016-02-05 14:38:32 -08:00
WayofTime 333c6d71d2 Added flame particles to the incense altar for when it is actually operating. 2016-02-04 21:20:29 -05:00
WayofTime fd671f2902 Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite 2016-02-04 21:12:58 -05:00
WayofTime 233f50de31 Registered item model for master routing node. 2016-02-04 21:11:51 -05:00
Nick 4a2b6e0641 Stop registering test spell block 2016-02-04 17:58:15 -08:00
Nick ff1425f773 Alchemy Array no longer has missing particles for break animation
Also provides Arcane Ashes on pick block.
2016-02-04 17:43:29 -08:00
Nick c0b85276e9 Alchemy Array no longer causes height change 2016-02-04 17:32:21 -08:00
Nick ef6e066d94 Waila handler for Alchemy Array 2016-02-04 17:07:53 -08:00
Nick 2bf401f1d6 Re-activating a ritual via Redstone should not consume LP 2016-02-04 13:32:59 -08:00
Nick cd794250bd Ritual Stones should always drop blanks 2016-02-04 12:31:44 -08:00
WayofTime 4260ea7a8a Fixed glitch where for altar tier >= 3 the edge runes counted twice. 2016-02-04 08:25:37 -05:00
Nick 352d2ab35c Fix Bound Tools having high damage while deactivated 2016-02-04 02:51:54 -08:00
Nick cc66af7eb1 Allow Bound Sword to be enchanted
Also changes how the models are handled and changing activation states does not cause the "item change" animation.
2016-02-04 02:45:19 -08:00
Nick fd16a58b6b Move getOwnerName/UUID to IBindable
Where it should have been to begin with... hehe...

Deprecated methods will be removed after beta
2016-02-04 00:25:37 -08:00
Nick 8c1eaddb97 Rewrite Binding system to be fully automated
No more manual handling of binding items to players. Retains all previous functionality.

I have tested on both the Client and Server and it seems to work just fine. If any issues arise from this, do not hesitate to yell at me.

The deprecated methods will be removed after beta.
2016-02-03 23:14:26 -08:00
Nick e219b50589 Config option for Goggles upgrade 2016-02-03 20:41:41 -08:00