Fixed things
Merge commit 'a67cc750a26523d897f24cedcd00626ba519329c'

Conflicts:
	electro/handlers/Crafting.java
	electro/oreProccessing/te/TileEntitySmeltory.java