Merge branch 'develop' into channel-safely

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}")

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.
@@ -54,8 +68,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()``
@@ -65,8 +77,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

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;
 }

library/xml

@@ -1 +1 @@
-Subproject commit 0cc481bebfc02b88c7d1b0e6d70a79cfba72d7f1
+Subproject commit d4170eacfc0f82fcb7364e558d0e782dc497f7d5

scripts

@@ -1 +1 @@
-Subproject commit e70393ff2132e2f5d00ffeb154e8d9242f89a284
+Subproject commit c7345f6fe096bc6ce1700b70b4f7d4c65b2a3e57