v6.0.4 push
Merge branch 'master' into development

Conflicts:
	common/mekanism/client/render/MekanismRenderer.java
	common/mekanism/common/Mekanism.java
	common/mekanism/common/integration/OreDictManager.java
	common/mekanism/common/network/PacketPortableTeleport.java
	common/mekanism/common/tile/TileEntitySalinationController.java
	common/mekanism/generators/common/MekanismGenerators.java
	common/mekanism/tools/common/MekanismTools.java
Several fixes
Fix key calls
Fix a few annoying bugs
Fix a bug with advanced electric machines
Merge branch 'master' into development
Filter Cards, all done
Work on Digital Miner material filters
Got the GUI working mostly
Just about finished, onto sorters
Work on sorter material filters
Finished material filters
Fix dumb crash
Hopefully finish GUI stuff
Fix a tiny bug
A few creative enhancements
Safer onUpdate in ItemProxy, should fix #1187
Merge pull request #1190 from tterrag1098/patch-4

Safer onUpdate in ItemProxy, should fix #1187
Update de_DE.lang