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

Conflicts:
	data/json/recipes/recipes.json