Added Thaumic support
and fixed some composting issues