Move 74 generic "melee" items to JSON, fix some item_factory color typos