added some ore and an ingot, and also moved the clientproxy to avoid future conflicts
Merge branch 'master' of https://github.com/nick7397/TheShrooms