Commit graph

305 commits

Author SHA1 Message Date
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
d285736ca9 Imperfect ritual system hopefully works correctly now 2015-11-02 18:00:48 -08:00
Nick
92bf7cc35b Imperfect rituals work mostly now
Just need to figure out an issue with the config
2015-11-02 17:45:11 -08:00
Nick
096ba02450 Refactor everything to WayofTime.bloodmagic.* 2015-11-02 12:39:47 -08:00