Major Refactoring when loading mod
Merge remote-tracking branch 'remotes/origin/1.7.2' into 1.7.10