Added a warning message to 'blech' consumables. It warns you that the food you are trying to eat is unsafe if your cooking skill is 2 or higher.
Allow TKD and Tai Chi manuals to spawn in dojos

Also equalized the spawn chance between all manuals.
Reduce repeats on manual spawn

Because sometimes you can find a dozen manuals all in the same dojo, and that feels silly.
Add TKD, Karate, very rare Muay Thai manual spawns to boxing gym
Add melee and unarmed magazines/manuals to dojo
Add weeabooks to dojo
Reload the whole map if our number of map entity types changes.
Revert to using vsnprintf that can handle positional parameters.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into drinkin_bleach
Removed skill requirement.
comment added.
Adds balaclava recipe.
Merge pull request #6615 from Rivet-the-Zombie/balaclava-recipe

Adds balaclava recipe.
Merge branch 'Drinkin_bleach' of https://github.com/Soyweiser/Cataclysm-DDA into Soyweiser-Drinkin_bleach
Merge branch 'patch-11' of https://github.com/Izicata/Cataclysm-DDA into Izicata-patch-11
fix missing comma

I've forgotten commas, too.  No big.
Merge branch 'hair-trigger-map-reload' of https://github.com/kevingranade/Cataclysm-DDA into kevingranade-hair-trigger-map-reload