Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct
merge/ comment out some armor ticking code for now to prevent NPE's