Extend ComparableItemStack from CoFH because I want the "block" oreName ignored
Replace ComparableItemStackSafe with ComparableItemStackBlockSafe
Cleanup some debug/trace