Merged in block/item ID changes from FTB