Merge branch '1.7-Update---DO-NOT-USE'
Merge branch 'master' of https://github.com/bloxgate/BloxgateMod