Creature effects are properly saved and loaded
Bump map version again to make map loading code read in entire save and fix terrain shift caused by addition of new terrain types.
Merge pull request #6283 from kevingranade/bump-map-version

Bump map version again.
Fix dumb error where enter would always be ignored
Merge branch 'fix-construction-menu' of https://github.com/kevingranade/Cataclysm-DDA into kevingranade-fix-construction-menu
Fixes and revert a problematic commit since it's so close to release.
Merge remote-tracking branch 'origin/master'