Merge https://github.com/delta534/MineFactoryReloaded

Conflicts:
	src/powercrystals/minefactoryreloaded/modhelpers/pam/Pam.java
	src/powercrystals/minefactoryreloaded/modhelpers/pam/PamFruit.java
Fixes a git derp by me.