Merge branch 'develop' into refactor/hotkey_module

Author: NicksWorld

.github/workflows/generate-symbols.yml

@@ -164,7 +164,7 @@ jobs:
         pip install itch-dl
         minor=$(echo "${{ inputs.version }}" | cut -d. -f1)
         patch=$(echo "${{ inputs.version }}" | cut -d. -f2)
-        fname="dwarf_fortress_${minor}_${patch}_linux*.tar.bz2"
+        fname="dwarf_fortress_${minor}_${patch}_linux.tar.bz2"
         itch-dl https://kitfoxgames.itch.io/dwarf-fortress --download-to . --api-key $ITCH_API_KEY --filter-files-glob "${fname}"
         tar xjf "kitfoxgames/dwarf-fortress/files/${fname}" -C DF_itch
         tar xjf dfhack-symbols-linux64-build.tar.bz2 -C DF_itch
@@ -272,7 +272,7 @@ jobs:
         pip install itch-dl
         minor=$(echo "${{ inputs.version }}" | cut -d. -f1)
         patch=$(echo "${{ inputs.version }}" | cut -d. -f2)
-        fname="dwarf_fortress_${minor}_${patch}_windows*.zip"
+        fname="dwarf_fortress_${minor}_${patch}_windows.zip"
         itch-dl https://kitfoxgames.itch.io/dwarf-fortress --download-to . --api-key $ITCH_API_KEY --filter-files-glob "${fname}"
         unzip -d DF_itch "kitfoxgames/dwarf-fortress/files/${fname}"
         xml/symbols_gen_windows.sh ${{ inputs.version }} ITCH DF_itch

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.34.1
+  rev: 0.35.0
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks

CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0074 NEW)
 
 # set up versioning.
-set(DF_VERSION "53.05")
+set(DF_VERSION "53.06")
 set(DFHACK_RELEASE "r1")
 set(DFHACK_PRERELEASE FALSE)
 

docs/changelog.txt

@@ -62,6 +62,7 @@ Template for new versions:
 
 ## Misc Improvements
 - `keybinding`: keybinds may now include the super key, and are no longer limited to particular keys ranges of keys, allowing any recognized by SDL.
+- The ``fpause`` console command can now be used to force world generation to pause (as it did prior to version 50).
 
 ## Documentation
 
@@ -78,6 +79,25 @@ Template for new versions:
 
 ## Removed
 
+# 53.06-r1
+
+## New Tools
+
+## New Features
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+## Removed
+- `infiniteSky`: Temporarily disabled due to incompatibility with changes made as part of DF's siege update
+
 # 53.05-r1
 
 ## New Tools
@@ -86,6 +106,7 @@ Template for new versions:
 - compatibility with 53.05
 
 ## Fixes
+- `sort`: Using the squad unit selector will no longer cause Dwarf Fortress to crash on exit
 
 ## Misc Improvements
 

docs/dev/Lua API.rst

@@ -7515,6 +7515,15 @@ Importing scripts
 
       --@ module = true
 
+     In order to be recognized, this line **must** begin with ``--@`` with no
+     whitespace characters before it::
+
+      --@ module = true   OK
+      --@module = true    OK
+      -- @module = true   NOT OK (no --@ found due to space after --)
+       --@module = true   NOT OK (leading space, --@ is not at the beginning of the line)
+      ---@module = true   NOT OK (leading dash, --@ is not at the beginning of the line)
+
   2. Include a check for ``dfhack_flags.module``, and avoid running any code
      that has side-effects if this flag is true. For instance::
 

library/CMakeLists.txt

@@ -48,6 +48,7 @@ set(MAIN_HEADERS
     include/DFHackVersion.h
     include/BitArray.h
     include/ColorText.h
+    include/Commands.h
     include/Console.h
     include/Core.h
     include/CoreDefs.h
@@ -66,6 +67,7 @@ set(MAIN_HEADERS
     include/MiscUtils.h
     include/Module.h
     include/MemAccess.h
+    include/MemoryPatcher.h
     include/ModuleFactory.h
     include/PluginLua.h
     include/PluginManager.h
@@ -88,6 +90,7 @@ set(MAIN_HEADERS_WINDOWS
 set(MAIN_SOURCES
     Core.cpp
     ColorText.cpp
+    Commands.cpp
     CompilerWorkAround.cpp
     DataDefs.cpp
     DataIdentity.cpp
@@ -100,6 +103,7 @@ set(MAIN_SOURCES
     LuaApi.cpp
     DataStatics.cpp
     DataStaticsCtor.cpp
+    MemoryPatcher.cpp
     MiscUtils.cpp
     Types.cpp
     PluginManager.cpp