Aidan C. Brady 2fe4cf290d Merge branch 'master' into development (@unpairedbracket, make sure I did this right) ... Conflicts: src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java src/main/java/mekanism/common/util/MekanismUtils.java		2015-02-19 16:12:28 -05:00
..
api	Work on fusion fuel creation mechanics, allowed Chemical Washer to accept upgrades	2015-02-17 21:27:35 -05:00
client	Chemical Infuser, Chemical Washer and Electrolytic Separator are now upgradeable	2015-02-18 19:33:03 -05:00
common	Merge branch 'master' into development (@unpairedbracket, make sure I did this right)	2015-02-19 16:12:28 -05:00
generators	Fixed Heat Generator burn time	2015-02-19 09:00:20 -05:00
tools	Actually increment the Mod classes' versions	2015-02-13 14:40:14 +00:00