Push back those fixes
Merge branch 'development' into 1.8

Conflicts:
	src/main/java/mekanism/common/EnergyNetwork.java