Shorten the GUI stuff. I hope it is short enough for the GUIs
Merge pull request #561 from Vexatos/patch-2

Shorten the GUI stuff. I hope it is short enough for the GUIs
Added Factory input slot distribution, configurable voice ports, fixed several bugs
Update de_DE.lang
Merge pull request #570 from Vexatos/patch-2

Update de_DE.lang
Fixed teslas, merged Electrostatic Linker into Configurator
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
Remove Maganese Alloy in hopes for better balance, fixed several GUI color issues as well as Osmium Ore darkness
Begin work on copper and tin ore and ingots :)
Updated UE API
Merge branch 'master' into universal-wires

Conflicts:
	common/mekanism/induction/common/MekanismInduction.java
	resources/assets/mekanism/lang/en_US.lang
Add OreDict registrations, fix charcoal block reverse crafting
Placed UE higher in priority for energy production
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
Fixed Obsidian TNT render
Fix tank rendering, make Configurator serve as a BuildCraft wrench
Add config option to override UE ratios
Removed unnessary "instanceof"
Updated UE API
Merge branch 'master' into universal-wires