Tooltip tweaks
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/jkmau5/alternativeenergy/client/gui/GuiPowerBox.java
Fixed the energy indicators
I'm a fucking derp. Call the super constructor, jk!