Arcaratus 098d86596b Merge branch 'master' of https://github.com/WayofTime/BloodMagic ... Conflicts: src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java		2015-07-18 10:08:42 -04:00
..
api	Fixed API calls.	2015-07-17 12:07:38 -04:00
client	Arcaratus and Vanilla are derps.	2015-07-16 18:29:53 -04:00
common	Merge branch 'master' of https://github.com/WayofTime/BloodMagic	2015-07-18 10:08:42 -04:00
AlchemicalWizardry.java	Fixed API calls.	2015-07-17 12:07:38 -04:00
BloodMagicConfiguration.java	Fix #373 and did #375	2015-07-09 11:17:55 -04:00
ModBlocks.java	Performance Commit --Too lazy to do the Altar recipe	2015-07-02 11:05:07 -04:00
ModItems.java	Performance Commit --Too lazy to do the Altar recipe	2015-07-02 11:05:07 -04:00