From f84299bc463c403737fd5a26a5dd28c1effa0f6d Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Fri, 24 Feb 2023 23:31:20 +0000 Subject: [PATCH 1/3] Auto-update submodules library/xml: master --- library/xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/xml b/library/xml index 0cc481beb..e7143ec5e 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 0cc481bebfc02b88c7d1b0e6d70a79cfba72d7f1 +Subproject commit e7143ec5e29d88a114fb8e72091c54413944df1d From b8fdc985ec359d02d18e5b084dafe754175b2648 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 24 Feb 2023 15:41:54 -0800 Subject: [PATCH 2/3] bump version and changelog to 50.07-alpha2 --- CMakeLists.txt | 2 +- docs/changelog.txt | 18 ++++++++++++++---- library/xml | 2 +- scripts | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b58c54fe4..56c81ba72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -192,7 +192,7 @@ endif() # set up versioning. set(DF_VERSION "50.07") -set(DFHACK_RELEASE "alpha1") +set(DFHACK_RELEASE "alpha2") set(DFHACK_PRERELEASE TRUE) set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") diff --git a/docs/changelog.txt b/docs/changelog.txt index 9ee7ff102..d83417933 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -35,6 +35,20 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: ## New Plugins +## Fixes + +## Misc Improvements + +## Documentation + +## API + +## Lua + +## Removed + +# 50.07-alpha2 + ## Fixes -@ `nestboxes`: fixed bug causing nestboxes themselves to be forbidden, which prevented citizens from using them to lay eggs. Now only eggs are forbidden. - `autobutcher`: implemented work-around for Dwarf Fortress not setting nicknames properly, so that nicknames created in the in-game interface are detected & protect animals from being butchered properly. Note that nicknames for unnamed units are not currently saved by dwarf fortress - use ``enable fix/protect-nicks`` to fix any nicknames created/removed within dwarf fortress so they can be saved/reloaded when you reload the game. @@ -53,8 +67,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - `confirm`: configuration data is now persisted globally. - `tailor`: add support for adamantine cloth (off by default); improve logging -## Documentation - ## API - ``Gui::any_civzone_hotkey``, ``Gui::getAnyCivZone``, ``Gui::getSelectedCivZone``: new functions to operate on the new zone system - Units module: added new predicates for ``isGeldable()``, ``isMarkedForGelding()``, and ``isPet()`` @@ -64,8 +76,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - ``widgets.FilteredList``: Added ``edit_on_change`` optional parameter to allow a custom callback on filter edit change. - ``widgets.TabBar``: new library widget (migrated from control-panel.lua) -## Removed - # 50.07-alpha1 ## Fixes diff --git a/library/xml b/library/xml index e7143ec5e..d4170eacf 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit e7143ec5e29d88a114fb8e72091c54413944df1d +Subproject commit d4170eacfc0f82fcb7364e558d0e782dc497f7d5 diff --git a/scripts b/scripts index e70393ff2..c7345f6fe 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit e70393ff2132e2f5d00ffeb154e8d9242f89a284 +Subproject commit c7345f6fe096bc6ce1700b70b4f7d4c65b2a3e57 From 4bf0849d51d96c67f16ad8efbedcfb8f7c529587 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 24 Feb 2023 15:50:56 -0800 Subject: [PATCH 3/3] fix usage of squad equipment vector --- library/modules/Items.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/modules/Items.cpp b/library/modules/Items.cpp index 11d170725..bfdd525be 100644 --- a/library/modules/Items.cpp +++ b/library/modules/Items.cpp @@ -1647,5 +1647,5 @@ bool Items::isSquadEquipment(df::item *item) return false; auto &vec = plotinfo->equipment.items_assigned[item->getType()]; - return binsearch_index(vec, &df::item::id, item->id) >= 0; + return binsearch_index(vec, item->id) >= 0; }