stackable dried mushrooms, dials down mushroom nutrition a tad
Fixed mistake in map::grid refactor in editmap.

Once again, was calling the wrong function.
tweaked shrooms back, updated desc
updated desc
adds secondary req to account for shroom iding
astyle a*.cpp & c*.h, c*.cpp
Merge branch 'driedshrooms' of https://github.com/cSep/Cataclysm-DDA into cSep-driedshrooms
Fix typo
Merge branch 'master' of https://github.com/CIB/Cataclysm-DDA into CIB-master
Merge pull request #7232 from illi-kun/astyle_a&c

Astyle a few files