Compatibility metallurgy 2
Merge branch 'master' of https://github.com/Smeagolworms4/Metallurgy

Conflicts:
	common/rebelkeithy/mods/metallurgy/machines/ConfigMachines.java
	common/rebelkeithy/mods/metallurgy/machines/MetallurgyMachines.java
	resources/assets/metallurgy/data/spreadsheet.csv