…'origin/pr/20947', 'origin/pr/20958', 'origin/pr/20959', 'origin/pr/20961', 'origin/pr/20962', 'origin/pr/20964', 'origin/pr/20967', 'origin/pr/20975', 'origin/pr/20991', 'origin/pr/21001', 'origin/pr/21002', 'origin/pr/21008', 'origin/pr/21012', 'origin/pr/21013', 'origin/pr/21014' and 'origin/pr/21015'

* origin/pr/20717:
  Added missing bracket.
  Update makeshift bayonet.
  Update knife_cambat as a bayonet.
  Update modinfo.json
  Add to makeshift_sword_bayonet recipe.

* origin/pr/20942:
  Rewrite marker calculations
  Correct marker pos
  Fix double target marker bug
  Tweak target marker position on overmap

* origin/pr/20947:
  Fix worldgen mod selection scrollbar not showing
  Rewrite scrollbar drawing function for consistency of parameters. Update relevant code.
  Rewrite scrollbar start position calculation
  Ensure consistent proportion of srollbar
  Ensure consistent folding

* origin/pr/20958:
  Avoid magic number
  Fix advanced inventory UI message window overflow

* origin/pr/20959:
  Compare to mission ID instead of 'Install Repeater Mod' name
  Add mission::mission_id() function

* origin/pr/20961:
  Fix revealing unvisible monster when looking around

* origin/pr/20962:
  Fix up fat finger mistake
  Fix ammotype mistype
  Remove note from H&K railgun regarding silence
  Add sound effect to railgun types
  Minor astyle whitespace fix
  Use flammable ammogroup for gun noise flag rather than gasoline

* origin/pr/20964:
  Add menu error sound effect to various main menu errors
  Add left/right sound effects to options menu

* origin/pr/20967:
  Remove out of date "release checklist" doc
  Syntax fixes and spelling error fixes to translation doc
  Trival header change to Tests doc
  Minor cleanup of Martial Arts JSON doc
  Fix broken syntax and heiarchy in JSON Info, add formatting
  Fix Markdown formatting and typos in Item Spawn doc
  Modding doc code fixes and wording cleanup
  Add Markdown syntax to Modding doc
  Change MODDING doc to Markdown
  Add Markdown syntax to Code Style guide
  Move CODE_STYLE to Markdown
  Remove JSON doc reference to nonexistent file
  Remove data/recycling folder and old JSON
  Remove unused Jekyll config file

* origin/pr/20975:
  Get rid of ambiguity of player name and savegame base path

* origin/pr/20991:
  Fix crash in profession::items

* origin/pr/21001:
  Fix season names not being detected by xgettext

* origin/pr/21002:
  Update flags in flag.json
  Remove description for filthy from item.cpp

* origin/pr/21008:
  Remove pt_PT which doesn't exist
  Add Polish into options.cpp
  Import Polish translation

* origin/pr/21012:
  Fix duplicate count in pickup message of charged items

* origin/pr/21013:
  Fix side not cleared when taking off an item

* origin/pr/21014:
  Fix unexpected popup when trying to sleep while e-ink pc music is on

* origin/pr/21015:
  Fix blazemod flamethrower turrets for tanks, fixes _simple turret, fixes manaul RM451