merge
Merge branch 'master' of https://github.com/tobiasvdp/industrialProcessing

Conflicts:
	src/minecraft/ip/industrialProcessing/config/ConfigBaseRecipes.java