Merge branch 'mc16' into mc16_block

Conflicts:
	common/logisticspipes/LogisticsPipes.java
	common/logisticspipes/pipes/basic/LogisticsTileGenericPipe.java