From a50013af26680351e283dde2a2f6d18d23bc5515 Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Sun, 1 Oct 2023 18:57:06 +0000 Subject: [PATCH 1/6] Auto-update submodules library/xml: master scripts: master --- library/xml | 2 +- scripts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/xml b/library/xml index b313b69ad..22d59be19 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit b313b69adafef0bc3597df285504b729c44bea86 +Subproject commit 22d59be193d833bc822ae9b3f45d5c0639dbe886 diff --git a/scripts b/scripts index 8259d95e9..4250c075d 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 8259d95e9ee9d88c88f32b22608d0d8c977aac18 +Subproject commit 4250c075d237b4da1efed8a9fd4af302b3f0c8c4 From 66b363b2918556470bb9a65ba726af8c7917757b Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Sun, 1 Oct 2023 20:24:16 +0000 Subject: [PATCH 2/6] Auto-update submodules library/xml: master scripts: master --- library/xml | 2 +- scripts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/xml b/library/xml index 22d59be19..ab5c2aff1 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 22d59be193d833bc822ae9b3f45d5c0639dbe886 +Subproject commit ab5c2aff11c5f8c9c0f38820073be9ba51b8edce diff --git a/scripts b/scripts index 4250c075d..7911f7589 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 4250c075d237b4da1efed8a9fd4af302b3f0c8c4 +Subproject commit 7911f758979f1a8e9bf4d2ca893a3c1d9c9a43aa From 942cbe2015e6ef3f352a9df1b1db963a5141b109 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sun, 1 Oct 2023 13:35:29 -0700 Subject: [PATCH 3/6] bump 50.11-r1 --- CMakeLists.txt | 2 +- docs/changelog.txt | 25 +++++++++++++++++-------- library/xml | 2 +- scripts | 2 +- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74c37d4c7..c09fc6b71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_policy(SET CMP0074 NEW) project(dfhack) # set up versioning. -set(DF_VERSION "50.10") +set(DF_VERSION "50.11") set(DFHACK_RELEASE "r1") set(DFHACK_PRERELEASE FALSE) diff --git a/docs/changelog.txt b/docs/changelog.txt index 8d3d45778..db9fe5d88 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -53,10 +53,25 @@ Template for new versions: ## New Tools -- `tubefill`: (reinstated) replenishes mined-out adamantine - ## New Features +## Fixes + +## Misc Improvements + +## Documentation + +## API + +## Lua + +## Removed + +# 50.11-r1 + +## New Tools +- `tubefill`: (reinstated) replenishes mined-out adamantine + ## Fixes - `autolabor`: ensure vanilla work details are reinstated when the fort or the plugin is unloaded - ``dfhack.TranslateName()``: fixed crash on certain invalid names, which affected `warn-starving` @@ -70,15 +85,9 @@ Template for new versions: - EventManager: guard against potential iterator invalidation if one of the event listeners were to modify the global data structure being iterated over - EventManager: for ``onBuildingCreatedDestroyed`` events, changed firing order of events so destroyed events come before created events -## Documentation - -## API - ## Lua - mouse key events are now aligned with internal DF semantics: ``_MOUSE_L`` indicates that the left mouse button has just been pressed and ``_MOUSE_L_DOWN`` indicates that the left mouse button is being held down. similarly for ``_MOUSE_R`` and ``_MOUSE_M``. 3rd party scripts may have to adjust. -## Removed - # 50.10-r1 ## Fixes diff --git a/library/xml b/library/xml index ab5c2aff1..f38f3c495 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit ab5c2aff11c5f8c9c0f38820073be9ba51b8edce +Subproject commit f38f3c4955d604f2b5a8e0d952e676a0ab05c053 diff --git a/scripts b/scripts index 7911f7589..bcfbfe51b 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 7911f758979f1a8e9bf4d2ca893a3c1d9c9a43aa +Subproject commit bcfbfe51ba2256b0cfe3f172f51dea29d370cd82 From 8ed48901605a051c4b6a7312352a4b54648a9de3 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Sun, 1 Oct 2023 16:21:25 -0700 Subject: [PATCH 4/6] put highlights first in the release notes template --- .github/release_template.md | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/release_template.md b/.github/release_template.md index eb1c43146..9431a4e18 100644 --- a/.github/release_template.md +++ b/.github/release_template.md @@ -12,45 +12,45 @@ This release is compatible with all distributions of Dwarf Fortress: [Steam](htt Please report any issues (or feature requests) on the DFHack [GitHub issue tracker](https://github.com/DFHack/dfhack/issues). When reporting issues, please upload a zip file of your savegame and a zip file of your `mods` directory to the cloud and add links to the GitHub issue. Make sure your files are downloadable by "everyone with the link". We need your savegame to reproduce the problem and test the fix, and we need your active mods so we can load your savegame. Issues with savegames and mods attached get fixed first! -Announcements +Highlights ----------------------------------
-Annc 1, PSAs - -### Annc 1 +Highlight 1, Highlight 2 -Text +### Highlight 1 -### PSAs +Demo screenshot/vidcap -As always, remember that, just like the vanilla DF game, DFHack tools can also have bugs. It is a good idea to **save often and keep backups** of the forts that you care about. +Text -Many DFHack tools that worked in previous (pre-Steam) versions of DF have not been updated yet and are marked with the "unavailable" tag in their docs. If you try to run them, they will show a warning and exit immediately. You can run the command again to override the warning (though of course the tools may not work). We make no guarantees of reliability for the tools that are marked as "unavailable". +### Highlight 2 -The in-game interface for running DFHack commands (`gui/launcher`) will not show "unavailable" tools by default. You can still run them if you know their names, or you can turn on dev mode by hitting Ctrl-D while in `gui/launcher` and they will be added to the autocomplete list. Some tools do not compile yet and are not available at all, even when in dev mode. +Demo screenshot/vidcap -If you see a tool complaining about the lack of a cursor, know that it's referring to the **keyboard** cursor (which used to be the only real option in Dwarf Fortress). You can enable the keyboard cursor by entering mining mode or selecting the dump/forbid tool and hitting Alt-K (the DFHack keybinding for `toggle-kbd-cursor`. We're working on making DFHack tools more mouse-aware and accessible so this step isn't necessary in the future. +Text
-Highlights +Announcements ----------------------------------
-Highlight 1, Highlight 2 - -### Highlight 1 +Annc 1, PSAs -Demo screenshot/vidcap +### Annc 1 Text -### Highlight 2 +### PSAs -Demo screenshot/vidcap +As always, remember that, just like the vanilla DF game, DFHack tools can also have bugs. It is a good idea to **save often and keep backups** of the forts that you care about. -Text +Many DFHack tools that worked in previous (pre-Steam) versions of DF have not been updated yet and are marked with the "unavailable" tag in their docs. If you try to run them, they will show a warning and exit immediately. You can run the command again to override the warning (though of course the tools may not work). We make no guarantees of reliability for the tools that are marked as "unavailable". + +The in-game interface for running DFHack commands (`gui/launcher`) will not show "unavailable" tools by default. You can still run them if you know their names, or you can turn on dev mode by hitting Ctrl-D while in `gui/launcher` and they will be added to the autocomplete list. Some tools do not compile yet and are not available at all, even when in dev mode. + +If you see a tool complaining about the lack of a cursor, know that it's referring to the **keyboard** cursor (which used to be the only real option in Dwarf Fortress). You can enable the keyboard cursor by entering mining mode or selecting the dump/forbid tool and hitting Alt-K (the DFHack keybinding for `toggle-kbd-cursor`. We're working on making DFHack tools more mouse-aware and accessible so this step isn't necessary in the future.
@@ -61,5 +61,4 @@ Generated release notes New tools, fixes, and improvements %RELEASE_NOTES% - From c22ac294a0ba1e233fc2fa989492a162cc3d7537 Mon Sep 17 00:00:00 2001 From: lethosor Date: Sun, 1 Oct 2023 22:57:24 -0400 Subject: [PATCH 5/6] Re-add tags in embark-tools docs They appear to have accidentally been removed in 2627820bfa3df3841d78e79f9895f166346d0041 (no other plugins were affected) --- docs/plugins/embark-tools.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/plugins/embark-tools.rst b/docs/plugins/embark-tools.rst index f320706ff..0c76b887f 100644 --- a/docs/plugins/embark-tools.rst +++ b/docs/plugins/embark-tools.rst @@ -3,7 +3,7 @@ embark-tools .. dfhack-tool:: :summary: Extend the embark screen functionality. - + :tags: unavailable embark fort interface Usage ----- From b0bbe2bd5af35839c1274833688059d41570c95b Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Mon, 2 Oct 2023 07:13:30 +0000 Subject: [PATCH 6/6] Auto-update submodules scripts: master --- scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts b/scripts index bcfbfe51b..d2ad86165 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit bcfbfe51ba2256b0cfe3f172f51dea29d370cd82 +Subproject commit d2ad86165e89dc3b0f262eea00db8e2347cc4421