Fix color averaging, issues with fluid overlay.
Merge branch 'master' of https://github.com/CoFH/CoFHLib

Conflicts:
	src/main/java/cofh/util/RegistryUtils.java