Merge branch 'develop' into patch-18

myk002 · web-flow · commit 4b3e22726fe2 · 2025-04-03T15:28:40.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0074 NEW)
 
 # set up versioning.
-set(DF_VERSION "51.08")
+set(DF_VERSION "51.10")
 set(DFHACK_RELEASE "r1")
 set(DFHACK_PRERELEASE FALSE)
 
@@ -66,7 +66,7 @@ endif()
 
 if(WIN32)
     set(MSVC_MIN_VER 1930)
-    set(MSVC_MAX_VER 1942)
+    set(MSVC_MAX_VER 1943)
     if(NOT MSVC)
         message(SEND_ERROR "No MSVC found! MSVC 2022 version ${MSVC_MIN_VER} to ${MSVC_MAX_VER} is required.")
     elseif((MSVC_VERSION LESS MSVC_MIN_VER) OR (MSVC_VERSION GREATER MSVC_MAX_VER))
diff --git a/data/art/design_toolbar.png b/data/art/design_toolbar.png
diff --git a/data/art/logo.png b/data/art/logo.png
diff --git a/data/art/logo_hovered.png b/data/art/logo_hovered.png
diff --git a/data/art/sitemap_toolbar.png b/data/art/sitemap_toolbar.png
diff --git a/data/init/dfhack.keybindings.init b/data/init/dfhack.keybindings.init
@@ -47,6 +47,9 @@ keybinding add Ctrl-G@dwarfmode/Default|dungeonmode/Default gui/sitemap
 # toggle keyboard cursor
 keybinding add Alt-K@dwarfmode|dungeonmode/Default|dungeonmode/Look toggle-kbd-cursor
 
+# gui/journal
+keybinding add Ctrl-J@dwarfmode|dungeonmode gui/journal
+
 
 ######################
 # dwarfmode bindings #
@@ -151,9 +154,6 @@ keybinding add Ctrl-Shift-Q@dwarfmode gui/quickfort
 keybinding add Ctrl-D@dwarfmode/Default gui/design
 keybinding add Ctrl-M@dwarfmode/Default gui/mass-remove
 
-# gui/journal
-keybinding add Ctrl-J@dwarfmode gui/journal
-
 
 ########################
 # dungeonmode bindings #
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -63,12 +63,27 @@ Template for new versions:
 ## Documentation
 
 ## API
-- ``Filesystem`` module: rewritten to use C++ standard library components, for better portability
 
 ## Lua
 
 ## Removed
 
+# 51.10-r1
+
+## Misc Improvements
+- Compatibility with DF 51.10
+
+# 51.09-r1
+
+## New Features
+- `gui/journal`: Ctrl-j hotkey to launch `gui/journal` now works in adventure mode!
+
+## Fixes
+- Fix processing error in the overlay that displays unit preferences in the baron selection list
+
+## API
+- ``Filesystem`` module: rewritten to use C++ standard library components, for better portability
+
 # 51.08-r1
 
 ## Misc Improvements
diff --git a/docs/dev/Lua API.rst b/docs/dev/Lua API.rst
@@ -5945,17 +5945,21 @@ common text token lists that you can then pass as ``text`` to a ``Label``:
     Example 2: The DFHack logo - a graphical button in graphics mode and a text
     button in ASCII mode. The ASCII colors use the default for hovering::
 
+        local logo_textures=dfhack.textures.loadTileset(
+            'hack/data/art/logo.png', 8, 12, true),
         widgets.Label{
             text=widgets.makeButtonLabelText{
                 chars={
                     {179, 'D', 'F', 179},
                     {179, 'H', 'a', 179},
                     {179, 'c', 'k', 179},
                 },
-                tileset=dfhack.textures.loadTileset(
-                    'hack/data/art/logo.png', 8, 12, true),
-                tileset_hover=dfhack.textures.loadTileset(
-                    'hack/data/art/logo_hovered.png', 8, 12, true),
+                tileset=logo_textures,
+                tileset_offset=1,
+                tileset_stride=8,
+                tileset_hover=logo_textures,
+                tileset_hover_offset=5,
+                tileset_hover_stride=8,
             },
             on_click=function()
                 dfhack.run_command{'hotkeys', 'menu', self.name}
diff --git a/library/xml b/library/xml
@@ -1 +1 @@
-Subproject commit 860017b193c5cce1ee6c16321301b0a1d4788569
+Subproject commit ec3ab067aef716817d9c5b84a6fb85bc22516caa
diff --git a/plugins/lua/hotkeys.lua b/plugins/lua/hotkeys.lua
@@ -6,7 +6,6 @@ local overlay = require('plugins.overlay')
 local widgets = require('gui.widgets')
 
 local logo_textures = dfhack.textures.loadTileset('hack/data/art/logo.png', 8, 12, true)
-local logo_hovered_textures = dfhack.textures.loadTileset('hack/data/art/logo_hovered.png', 8, 12, true)
 
 local function get_command(cmdline)
     local first_word = cmdline:trim():split(' +')[1]
@@ -41,7 +40,11 @@ function HotspotMenuWidget:init()
                     {VERT_BAR, 'c', 'k', VERT_BAR},
                 },
                 tileset=logo_textures,
-                tileset_hover=logo_hovered_textures,
+                tileset_offset=1,
+                tileset_stride=8,
+                tileset_hover=logo_textures,
+                tileset_hover_offset=5,
+                tileset_hover_stride=8,
             },
             on_click=function() dfhack.run_command{'hotkeys', 'menu', self.name} end,
         },
diff --git a/plugins/lua/sort/diplomacy.lua b/plugins/lua/sort/diplomacy.lua
@@ -64,7 +64,7 @@ local function get_preferences(unit)
     if not unit then return {} end
     local preferences = {}
     for _, pref in ipairs(unit.status.current_soul.preferences) do
-        if pref.type == df.unitpref_type.LikeItem and pref.active then
+        if pref.type == df.unitpref_type.LikeItem and pref.flags.visible then
             table.insert(preferences, make_item_description(pref.item_type, pref.item_subtype))
         end
     end
diff --git a/plugins/stonesense b/plugins/stonesense
@@ -1 +1 @@
-Subproject commit c783692f43a205cef821e669adc26bc725f5c159
+Subproject commit d0c14fa0a6702f396e147bbd3c9b325c0677aa2b
diff --git a/scripts b/scripts
@@ -1 +1 @@
-Subproject commit ccdc48f2dd4d1a777dc9d1002c707202ffdffff3
+Subproject commit d8912409bb3c7398a2859aa0c0092d792c9211e7
