Yulife 6cd78757bf Merge remote-tracking branch 'origin/1.9' into 1.9 ... # Conflicts: # src/main/resources/assets/bloodmagic/textures/items/ExplosivePowder.png # src/main/resources/assets/bloodmagic/textures/items/PlantOil.png # src/main/resources/assets/bloodmagic/textures/items/Saltpeter.png # src/main/resources/assets/bloodmagic/textures/items/Sulfur.png		2016-05-08 15:08:56 +02:00
..
blockstates	Added saltpeter and sulfur, used for gunpowder creation and will be used for other things.	2016-05-06 17:51:39 -04:00
books	Refactor everything to WayofTime.bloodmagic.*	2015-11-02 12:39:47 -08:00
gui	Added JEI compat for the Alchemy Table	2016-05-02 13:45:52 -04:00
lang	Merge pull request #726 from qianzha/patch-14	2016-05-06 17:54:29 -04:00
models	More tweaks to the alchemy table, as well as some minor recipes.	2016-05-02 20:08:25 -04:00
schematics/building	Refactor everything to WayofTime.bloodmagic.*	2015-11-02 12:39:47 -08:00
shaders	Tinkered with the beam a bit. Added WIP models for the routing nodes. Added basic item routing node.	2016-01-15 21:53:55 -05:00
textures	Alchemy items 💃	2016-05-08 15:07:00 +02:00
altar.png	Refactor everything to WayofTime.bloodmagic.*	2015-11-02 12:39:47 -08:00
properties.png	Demon Will Variants & Formula	2016-03-28 17:15:11 +02:00
properties.txt	Demon Will Variants & Formula	2016-03-28 17:15:11 +02:00