Made MekGen recipes more OreDict friendly
Merge branch 'development' into 1.8

Conflicts:
	src/main/java/mekanism/generators/common/MekanismGenerators.java