Merge remote-tracking branch 'upstream/master'
Add smelting recipes
Cleanup
Merge remote-tracking branch 'jimx/master'