Changed flintlocks
Forgot the newline at the end of the file
Fixed lots of little mistakes
Recipes and other changes
Add craftable glass shiv.
Merge adjustments to flintlock guns.

Conflicts:
	data/json/recipes/recipes.json
Gear

Gas mask, rebreather, tentacle-socks, and jumpsuit.  Debating whether
Labs would slap a wetsuit on Fish/Cephalopod mutant-subjects...thinking
not.
Add nails as a component for caltrops.
Merge pull request #5006 from kevingranade/nails-to-caltrops

Add nails as a component for caltrops.
Recipes, recipe locations, and spawns

This ought to cover it.
Hooves too
rebreather fix

Thanks for the reminder, Rivet.
json fix

fatfingered Cut rather than Copy, looks like.
More json syntax
Merge pull request #5009 from KA101/MutantGear

[MWR] Mutant gear
Merge pull request #5004 from ianestrachan/glass-shiv

Add craftable glass shiv.
Improved list_monsters() with healthbar, attitude and aggro indicator.
Merge shiney