adjusted weather to make it easier to survive
Breaks out Carnivore eating exclusion

Rather than having it show up as a Wheat Allergy.
Shifting

Resets the code to check for banned rather than permissible stuff, and
makes junk food a problem.  Not as bad as ANTIJUNK, though.
Beginning of a formatter for the JSON template that conforms the standards I see in the JSON files.
German update
Spanish update
Japanese update
Korean update
Russian update
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
Merge pull request #8728 from cellxiecao/patch-1

Update line.cpp
Merge branch 'formatter' of https://github.com/jeremyosborne/Cataclysm-DDA into merge
Merge branch 'lang-update' of https://github.com/VlasovVitaly/Cataclysm-DDA into merge
Merge branch 'Two-honey-tpyes' of https://github.com/Snaaty/Cataclysm-DDA into merge
Merge branch 'rocketb' of https://github.com/Mshock777/Cataclysm-DDA into merge
Fixed a few miscalled mutations in mutant scen

Thanks to Khrysanth for reporting, thought I'd fit this in whilst
merging.