Commit graph

308 commits

Author SHA1 Message Date
Nick Ignoffo
081698c6f9 Merge pull request #490 from Arcaratus/1.8-Rewrite
Finished the Altar
2015-11-03 07:35:50 -08:00
Arcaratus
ab60e5f3fe Finished the Altar 2015-11-03 10:34:11 -05:00
Nick
ed515f5c80 Air Sigil 2015-11-02 19:57:48 -08:00
Nick
ac5402df6b Cleanup
Renders for Runes
Creative crystal renders
Formatting
Lang additions
Some attempted (not successful) fixes for SoulNetwork
2015-11-02 19:18:53 -08:00
Arcaratus
4734f1207a Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite
Conflicts:
	src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
2015-11-02 21:35:23 -05:00
Arcaratus
75143520ed Pre-emptive things 2015-11-02 21:30:28 -05:00
Nick
b59bc9766e Fix BlockRitualController's ItemBlock name 2015-11-02 15:55:17 -08:00
Nick
096ba02450 Refactor everything to WayofTime.bloodmagic.* 2015-11-02 12:39:47 -08:00