Another fix attempt
Merge branch 'master' into development
Merge branch 'development' into 1.8

Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java