lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
1534 commits 12 branches 0 tags 44 MiB
Commit graph

1534 commits

This branch
This branch
All branches
Author SHA1 Message Date
WayofTime 4d8933b8b9 Merge branch '1.9' of https://github.com/WayofTime/BloodMagic into 1.9 2016-06-11 11:52:14 -04:00
WayofTime fd931a06a4 Fixed an issue added by TehNut ( ;) ) and updated forge to 1957 2016-06-11 11:42:58 -04:00
qianzha 51d59f0340 Update zh_CN.lang (#789) 2016-06-10 21:50:45 -04:00
WayofTime d1bdec7113 (Possibly?) fixed Tome of Peritia bug of the Negative Speed of Light 2016-06-10 19:36:21 -04:00
WayofTime 5388dbf883 Added the dyeable recipes for the Sigil of Holding to the Alchemy Table. 2016-06-09 21:43:37 -04:00
Nicholas Ignoffo 4eda0d6caa First pass at coloring Sigil of Holding (#787) 2016-06-09 16:59:11 -07:00
Nicholas Ignoffo 513bb113e1 Add transposition blacklist to API (#790) 
Blacklist the same blocks that are blacklisted from the Teleposer.
 2016-06-09 16:01:32 -07:00
qianzha cc5f7b88c0 Update zh_CN.lang (#779) 
* Update zh_CN.lang

* Update zh_CN.lang
 2016-06-08 20:39:08 -07:00
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
WayofTime 686d79570f Updated the changelog 2016-06-02 17:20:43 -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
Yulife 889d943573 Elytra for Living Armour 
@TehNut , Credits to lemoncake__ for the Red Dragon Wings, I took
inspiration from those imgur.com/a/sI5cv
 2016-05-31 10:33:28 +02: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
Yulife 6e1383c6e0 Upgrade Trainer and Sheathed Tool 2016-05-30 13:49:43 +02:00
Nicholas Ignoffo 5aea7b637a Fix Green Grove Sigil destroying plants (#767) 2016-05-29 16:39:31 -07:00
WayofTime 3eb1c0f43d Updated the changelog as well as updated gradle.properties. Final commit for 2.0.1-40 2016-05-29 19:19:21 -04:00
Vexatos 6e8c05f464 Update de_DE.lang (#764) 2016-05-28 09:39:31 -04:00
Tridon343 21a69176da Update de_DE.lang (#730) 2016-05-28 08:24:29 -04:00
qianzha 9ab95320d8 Update zh_CN.lang (#734) 
* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_CN.lang
 2016-05-28 08:23:57 -04:00
ImmortalPharaoh7 51fce309dd Update fr_FR.lang (#761) 2016-05-28 08:23:41 -04: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