Fixed problem where diff itemStacks would stack

This would happen when you shift clicked it, it was because hasSubtypes
was false, allowing it to ignore what the damage was when mergeItemStack
was called.