moved gravel and ore blocks back to orecore.
Merge branch 'master' into 1.7.2