Merge branch 'weird-weather-removal' of https://github.com/WillyGalleta/Cataclysm-DDA into merge2

Conflicts:
	src/weather_gen.cpp

Looked straightforward.
Merge branch 'uninvincible-spitters' of https://github.com/kevingranade/Cataclysm-DDA into merge2
Merge remote-tracking branch 'dda/pr/8513' into dda-master

* dda/pr/8513:
  Let the mod manager show the actual keybindings
  Cosmetic edit to default keybinding file
  Show actual keybindings in world manager name tab
  Slightly more reasonable default keybindings
  Add keybinding helptext to more menus
  Add string for space key

Conflicts:
	src/worldfactory.cpp
Merge remote-tracking branch 'dda/pr/8519' into dda-master

* dda/pr/8519:
  Use different font color for special saves
  Reserve world names “TUTORIAL” and “DEFENSE”

Conflicts:
	src/main_menu.cpp
Merge remote-tracking branch 'dda/pr/8568' into dda-master

* dda/pr/8568:
  Fix typo
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into merge2
adjust for the cata year starting in spring
since the cata year starts in spring, we have to add that difference once so time is a constant and not dependant on wether you want to believe in it or not
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into merge2
Merge branch 'weird-weather-removal' of https://github.com/WillyGalleta/Cataclysm-DDA into merge2
Removes the bugcheck line.
Fixes a typo and a capitalization.
mod to mainline
item groups
empty line
Revert "refactored season length calculation for consistency"

This reverts commit 6bdfe81ebc665c85ccf985dc9b4e76ee5a687211.

Conflicts:
	src/calendar.cpp

Test-revert, see if it lets weather work yet doesn't break saving
RC control to item groups
It's not a good court

Because it's stale, rotting, and overpriced mall food!
improvements
clear code
big dex - dodge, little cleaning code