Merge pull request #446 from alexbegt/master

Add my changes, Client runs, I broke Smeltery ATM, Needs to be fixed :)
port in some fixes from 1.6.x
Fix Smeltery.