Some new stuff from git
Merge branch 'weapon_testing' of github.com:MarioSMB/esk-modpack into weapon_testing