Commit graph

5 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 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
Renamed from src/main/java/WayofTime/alchemicalWizardry/registry/ModBlocks.java (Browse further)