Skip to content

Commit b6fd3af

Browse files
Merge remote-tracking branch 'upstream/master' into realSquidCoder-patch-1
2 parents b86f9f0 + 8a2c8e7 commit b6fd3af

26 files changed

Lines changed: 1158 additions & 589 deletions

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repos:
2020
args: ['--fix=lf']
2121
- id: trailing-whitespace
2222
- repo: https://github.com/python-jsonschema/check-jsonschema
23-
rev: 0.32.1
23+
rev: 0.33.0
2424
hooks:
2525
- id: check-github-workflows
2626
- repo: https://github.com/Lucas-C/pre-commit-hooks

changelog.txt

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,44 @@ Template for new versions:
3030

3131
## New Features
3232

33+
## Fixes
34+
35+
## Misc Improvements
36+
37+
## Removed
38+
39+
# 51.12-r1
40+
41+
## New Tools
42+
- `deteriorate`: (reinstated) allow corpses, body parts, food, and/or damaged clothes to rot away
43+
- `modtools/moddable-gods`: (reinstated) create new deities from scratch
44+
45+
## New Features
46+
- `gui/spectate`: added "Prefer nicknamed" to the list of options
47+
- `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
48+
- `gui/blueprint`: now records zone designations
49+
- `gui/design`: add option to draw N-point stars, hollow or filled or inverted, and change the main axis to orient in any direction
50+
51+
## Fixes
52+
- `starvingdead`: properly restore to correct enabled state when loading a new game that is different from the first game loaded in this session
53+
- `starvingdead`: ensure undead decay does not happen faster than the declared decay rate when saving and loading the game
54+
- `gui/design`: prevent line thickness from extending outside the map boundary
55+
56+
## Misc Improvements
57+
- `remove-stress`: also applied to long-term stress, immediately removing stressed and haggard statuses
58+
59+
# 51.11-r1
60+
3361
## Fixes
3462
- `list-agreements`: fix date math when determining petition age
3563
- `gui/petitions`: fix date math when determining petition age
3664
- `gui/rename`: fix commandline processing when manually specifying target ids
65+
- `gui/sandbox`: restore metal equipment options when spawning units
3766

3867
## Misc Improvements
3968
- `fix/loyaltycascade`: now also breaks up brawls and other intra-fort conflicts that *look* like loyalty cascades
4069
- `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
4170

42-
## Removed
43-
4471
# 51.09-r1
4572

4673
## New Features

0 commit comments

Comments
 (0)