Actual 6.0.4 release
Change Digital Miner GUI to show actual energy usage per tick
Merge pull request #1334 from ngreatorex/ncg

Change Digital Miner GUI to show actual energy usage per tick
Merge branch 'master' into development

Conflicts:
	build.gradle
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/tools/common/MekanismTools.java