Corrected merge errors, included EnumHammerType and modified the creative tab handler