Merge branch 'master' of C:\Users\Seth\Documents\IntellaJ Stuff\Ocelot Box Plugins\OcelotBox with conflicts.
Commit