Before pull from upstream
Merge branch 'master' of
https://github.com/Ipsis/Mining-And-Construction-Kit.git

Conflicts:
	common/ipsis/mackit/tileentity/TileDyeTransposer.java
Merge branch 'master' of https://github.com/Ipsis/Mining-And-Construction-Kit.git
More changing everything