Merge remote-tracking branch 'upstream/master' into SquidHack

Author: realSquidCoder

changelog.txt

@@ -17,8 +17,6 @@ Template for new versions:
 ## New Features
 
 ## Fixes
-- `gui/gm-unit`: remove reference to ``think_counter``, removed in v51.12
-- fixed references to removed ``unit.curse`` compound
 
 ## Misc Improvements
 
@@ -33,6 +31,20 @@ Template for new versions:
 ## New Features
 
 ## Fixes
+
+## Misc Improvements
+
+## Removed
+
+# 52.01-r1
+
+## New Tools
+
+## New Features
+
+## Fixes
+- fixed references to removed ``unit.curse`` compound
+- `gui/gm-unit`: remove reference to ``think_counter``, removed in v51.12
 - `gui/journal`: fix typo which caused the table of contents to always be regenerated even when not needed
 - `gui/mod-manager`: gracefully handle mods with missing or broken ``info.txt`` files
 - `uniform-unstick`: resolve overlap with new buttons in 51.13