Fixed Metal ladder bug
Readded onEntityCollidedWithBlock
Merge branch 'master' of https://github.com/lclc98/Metallurgy into ladder-fix
Changed to a 'vanilla' world gen
Threaded OreFinder. No more server thread locked
Re-added end and nether world gen
Finally fixed Ore gen
Re-added vein chance
Added configuration for the ore finder
Added configuration for machines
Merged 1.6 branch  into 1.7 branch to get it caught up.
Merge pull request #111 from BlockAcquisitionConsortium/1.7

Catch up 1.7
Merged upsream changes