Melee magazine.
Stabbing magazine.
Unarmed magazine.
Launcher magazine.
Pistol magazine.
Rifle magazine.
Shotgun magazine.
SMG magazine.
Tweak.
Correct an overzealous find-and-replace.
Add some missing colors to color.cpp's color conversion functions.
Make furn_t and ter_t load from JSON, and use string flags instead of enum flags.
Changes Jabberwock's special attack frequency to 5.
A big steel mitten-thing to make your fists hit super hard!
Tweak.
Replace hideous function-that-returns-a-function-pointer declaration with a typedef.
Removed enum that no longer exists from ENUMS.md.
Tweak.
Merge branch 'upstream/master'

Conflicts:
	inventory.cpp
Brass knuckles, too!