Aidan C. Brady c01212aae1 Merge branch 'development' into 1.8 ... Conflicts: src/main/java/mekanism/generators/common/MekanismGenerators.java		2014-09-27 15:23:31 -04:00
..
api	Added in a fun little silk touch multiplier config	2014-09-27 15:07:55 -04:00
client	Cleanup	2014-09-27 14:44:13 -04:00
common	Added in a fun little silk touch multiplier config	2014-09-27 15:07:55 -04:00
generators	Merge branch 'development' into 1.8	2014-09-27 15:23:31 -04:00
tools	Update version to 7.1.1 due to Configurator ehancements.	2014-09-05 16:56:45 +01:00