rename makeshift halberd to makeshift glaive

that thing sure isn't a halberd
update recipe to match name change
fix border colors in 'choose world' screen
fix incorrect type definition
Merge a batch of small fixes.
Revert changing the makeshift halberd item id to avoid breaking tilesets and saves.