Put your water in the mix!
Merge branch 'master' of https://github.com/tobiasvdp/industrialProcessing.git

Conflicts:
	src/minecraft/ip/industrialProcessing/IndustrialProcessing.java
Merge branch 'master' of https://github.com/tobiasvdp/industrialProcessing