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.
Junk+Meat=OK

As requested.  Wheat is still a lockout though, so the meat pizza is
actually inedible for Carnivores.
Pizza fix

Now the Carnivores can enjoy their meat pizza.
New irradiated fruit can spawn. New irradiated fruit can be used in the normal fruit recipies.
Merge pull request #8720 from KA101/carniwheat

(Ready) Breaks out Carnivore eating exclusion
Merge pull request #8732 from jeremyosborne/loomofthefruit

New irradiated fruit can spawn. New irradiated fruit can be used in the normal fruit recipes.
Reduces weight of rolling papers.

It's not perfect, but these things have a weight that's so negligible
that our current weight system can't even really handle it properly.
And reading and writing of std::list to json.
Changed player::illness to std::list.

Changed player::rem_disease to set the duration of the disease to -1, instead of removing it from the container.
Check ammo type of items in quiver to match ammo type of weapon.

Allows bolts to be used from quivers and avoids crash when the quiver contains non-matching ammo.
Generic fix for old save games that existed before scenarios.

Falls back to using the generic evacuee scenario if scenario not
marked in save file.

Fixes #8698.
clean up .ignore files
Merge branch 'rolling-paper-fix' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Merge branch 'diseases' of https://github.com/BevapDin/Cataclysm-DDA into merge
Merge branch 'fix-quiver-crash' of https://github.com/BevapDin/Cataclysm-DDA into merge
Merge branch 'generic_scenario_fallback' of https://github.com/jeremyosborne/Cataclysm-DDA into merge
Merge branch 'merge_ignore_files' of https://github.com/illi-kun/Cataclysm-DDA into merge
Adds one more tiny fix to issue #5828.

Since there is more than one python tool floating around cataclysm,
added .pyc files to the official ignore list.