Fix jump-stacking
Fix crafting recipe for iron bars
Merge remote-tracking branch 'upstream/master'

Updates from upstream