Aidan C. Brady ed8823b038 Merge branch 'development' into 1.8 ... Conflicts: src/main/java/mekanism/common/CommonProxy.java src/main/java/mekanism/common/Mekanism.java		2014-10-02 12:47:22 -04:00
..
codechicken/core/launch	Major 1.7 work, down to a little more than 500 errors	2014-05-29 17:55:47 +01:00
mekanism	Merge branch 'development' into 1.8	2014-10-02 12:47:22 -04:00