Changed back to ushort for RAM purposes
Merge branch 'master' of https://github.com/MCForge/MCForge-Vanilla-Redux
Clean up