Fixed last compiler errors
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/jkmau5/alternativeenergy/world/tileentity/TileEntityPowerBox.java