More conversions
Converted Mineshaft code to use Blocks instead of IDs
Merge branch 'ThisLooksFun'
Merge branch 'ThisLooksFun'
Merge remote-tracking branch 'origin/master' into thislooksfun