From 1fd807fc4d657ebfff30c658260014ed99937a4d Mon Sep 17 00:00:00 2001 From: lethosor Date: Wed, 8 Feb 2023 22:16:16 -0500 Subject: [PATCH 1/2] Mark as dev-only changes: #2848, #2842, #2816, #2792 --- docs/changelog.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/changelog.txt b/docs/changelog.txt index ad8763899..c151e2ebc 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -40,12 +40,12 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - Fix right click sometimes closing both a DFHack window and a vanilla panel - Fixed issue with scrollable lists having some data off-screen if they were scrolled before being made visible - `channel-safely`: fixed bug resulting in marker mode never being set for any designation -- `automelt`: fixed bug related to lua stack smashing behavior in returned stockpile configs -- `autochop`: fixed bug related to lua stack smashing behavior in returned stockpile configs +-@ `automelt`: fixed bug related to lua stack smashing behavior in returned stockpile configs +-@ `autochop`: fixed bug related to lua stack smashing behavior in returned stockpile configs ## Misc Improvements - `automelt`: is now more resistent to savegame corruption -- `hotkeys`: DFHack logo is now hidden on screens where it covers important information when in the default position (e.g. when choosing an embark site) +-@ `hotkeys`: DFHack logo is now hidden on screens where it covers important information when in the default position (e.g. when choosing an embark site) - `misery`: now persists state with the fort - `autodump`: reinstate ``autodump-destroy-item``, hotkey: Ctrl-K - `autodump`: new hotkey for ``autodump-destroy-here``: Ctrl-H @@ -53,7 +53,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - `clean`: new hotkey for `spotclean`: Ctrl-C - `autobutcher`: changed defaults from 5 females / 1 male to 4 females / 2 males so a single unfortunate accident doesn't leave players without a mating pair - `autobutcher`: now immediately loads races available at game start into the watchlist -- replaced DFHack logo used for the hover hotspot with a crisper image +-@ replaced DFHack logo used for the hover hotspot with a crisper image - `orders`: recipe for silver crossbows removed from ``library/military`` as it is not a vanilla recipe, but is available in ``library/military_include_artifact_materials`` ## Documentation @@ -72,7 +72,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: # 50.05-alpha3.1 ## Fixes -- `seedwatch`: fix parameter parsing when setting targets +-@ `seedwatch`: fix parameter parsing when setting targets # 50.05-alpha3 From 7cc3c08926c60bcc88240940a1f82cb87f66d0f7 Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Thu, 9 Feb 2023 05:14:15 +0000 Subject: [PATCH 2/2] 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 eff493010..06b0ed2e9 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit eff493010d11358fc8243239dbf8d07024eedb0c +Subproject commit 06b0ed2e996860ac29419405b6668f1cb4fd3b97 diff --git a/scripts b/scripts index 8807e7a78..95a159d2a 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 8807e7a7845611b2cc613fb3903f6f8763e91300 +Subproject commit 95a159d2af2038243776f5f8b6e5de1b77d52543