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.
Basic hordes
Allow Escrima, Silat, and Fencing to use more weapons

Also alphabetized the allowed weapons lists and removed some weapons that didn't make sense.
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.
generate version before bindist
Add TKD, Karate, very rare Muay Thai manual spawns to boxing gym
fix all warnigs in worlfactory.cpp
fix all warnings in veh_typedef.cpp
Added cents, other stuff to trader_avoid

Active oil/gas lamps based on the active candle prohibition, dead stuff
because it's trash, carver, etc based on the chainsaw prohibition,
geiger based on the mp3, advanced from the standard, and PDA from the
mp3 & candles.
Tweaks

Removed the crude and 2-by-sword from Fencing, and the trench knife from Eskrima and Silat.
Add melee and unarmed magazines/manuals to dojo
Merge branch 'patch-7' of https://github.com/Izicata/Cataclysm-DDA into Izicata-patch-7
Add weeabooks to dojo
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Be more careful about leaving the vehicle with nothing at 0,0.
Merge pull request #6602 from KA101/trader-avoid-update

Added cents, other stuff to trader_avoid
Translation-enabling

Partial fix for #6587.

This ought to cure the MA and crafting options; the kill-all-hostiles
looks like it ought to work. already.
Unlocks a selection of gunmods for use on launcher class weapons.
Merge makefile, warning, and vehicle dissasembly fixes.