Update items.txt
Remove items from Block.Type. Closes #112
Fix NPE thrown by Item.getEnchantment(). Fixes #125
Fixes #124
Merge branch 'crow' of https://github.com/damagefilter/CanaryMod into crow

Closes #121
Deprecated EntityLiving.applyDamage() ...

... added a couple of new applyDamage methods that use the new damage stuff
Merge branch 'crow' of github.com:FallenMoonNetwork/CanaryMod into crow