Merge remote-tracking branch 'upstream/master' into squid-stocks

Author: realSquidCoder

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.31.2
+  rev: 0.33.0
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks

changelog.txt

@@ -16,8 +16,12 @@ Template for new versions:
 
 ## New Features
 
+- `gui/design`: add option to draw N-point stars, hollow or filled or inverted, and change the main axis to orient in any direction
+
 ## Fixes
 
+- `gui/design`: prevent line thickness from extending outside the map boundary
+
 ## Misc Improvements
 
 ## Removed
@@ -27,19 +31,46 @@ Template for new versions:
 # Future
 
 ## New Tools
+- `deteriorate`: (reinstated) allow corpses, body parts, food, and/or damaged clothes to rot away
+- `modtools/moddable-gods`: (reinstated) create new deities from scratch
 
 ## New Features
-- `gui/mass-remove`: add a button to the bottom toolbar when eraser mode is active for launching `gui/mass-remove`
-- `idle-crafting`: default to only considering happy and ecstatic units for the highest need threshold
-- `gui/sitemap`: add a button to the toolbar at the bottom left corner of the screen for launching `gui/sitemap`
+- `gui/spectate`: added "Prefer nicknamed" to the list of options
+- `gui/mod-manager`: when run in a loaded world, shows a list of active mods -- click to export the list to the clipboard for easy sharing or posting
+- `gui/blueprint`: now records zone designations
 
 ## Fixes
-- `idle-crafting`: check that units still have crafting needs before creating a job for them
+- `starvingdead`: properly restore to correct enabled state when loading a new game that is different from the first game loaded in this session
+- `starvingdead`: ensure undead decay does not happen faster than the declared decay rate when saving and loading the game
 
 ## Misc Improvements
+- `remove-stress`: also applied to long-term stress, immediately removing stressed and haggard statuses
 
 ## Removed
 
+# 51.11-r1
+
+## Fixes
+- `list-agreements`: fix date math when determining petition age
+- `gui/petitions`: fix date math when determining petition age
+- `gui/rename`: fix commandline processing when manually specifying target ids
+- `gui/sandbox`: restore metal equipment options when spawning units
+
+## Misc Improvements
+- `fix/loyaltycascade`: now also breaks up brawls and other intra-fort conflicts that *look* like loyalty cascades
+- `makeown`: remove selected unit from any current conflicts so they don't just start attacking other citizens when you make them a citizen of your fort
+
+# 51.09-r1
+
+## New Features
+- `gui/mass-remove`: add a button to the bottom toolbar when eraser mode is active for launching `gui/mass-remove`
+- `idle-crafting`: default to only considering happy and ecstatic units for the highest need threshold
+- `gui/sitemap`: add a button to the toolbar at the bottom left corner of the screen for launching `gui/sitemap`
+
+## Fixes
+- `idle-crafting`: check that units still have crafting needs before creating a job for them
+- `gui/journal`: prevent pause/unpause events from leaking through the UI when keys are mashed
+
 # 51.07-r1
 
 ## New Tools