Revert "Fixed item subtypes"

This reverts commit 16516b98b9b26df890ecf3cbc69c5bfd131a1c93.
Revert "Revert "Fixed item subtypes""

This reverts commit 21d60cfb596aa0118f76507706fdec0aabbec878.
Fixed some other stuff, lowered the light level of redstone torches