some 1.7 updating
Merge branch 'master' of https://github.com/TheSlayerMC/MixedCraft.git