Merge branch 'basketball-items' of https://github.com/Snaaty/Cataclysm-DDA into merge
Merge branch 'basketball-profession' of https://github.com/Snaaty/Cataclysm-DDA into merge
Breaks out Carnivore eating exclusion

Rather than having it show up as a Wheat Allergy.
Fixes bad skill IDs.
Shifting

Resets the code to check for banned rather than permissible stuff, and
makes junk food a problem.  Not as bad as ANTIJUNK, though.
Merge branch 'butcher-this' of https://github.com/BevapDin/Cataclysm-DDA into butcher
Beginning of a formatter for the JSON template that conforms the standards I see in the JSON files.
Merge pull request #8719 from KA101/jsonfix

Fixes bad skill IDs.
German update
Spanish update
Japanese update
Korean update
Russian update
Add a fencing foil
Some changes

Increased warmth
reduced coverage (many masks have no coverage on the lower back of the head
Remove varsize
different material
Add and buff two honey types, solid and liquid
Add glassed honey to all recipes with bottled honey
Make glassed honey spawn

in kitchens (only?)
Rockets rebalanse
Update line.cpp