Merge branch 'develop' into constexpr-in-core

Author: ab9rf

.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

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

@@ -58,6 +58,24 @@ Template for new versions:
 
 ## New Features
 
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+## Removed
+
+# 53.06-r1
+
+## New Tools
+
+## New Features
+
 ## Fixes
 - `sort`: Using the squad unit selector will no longer cause Dwarf Fortress to crash on exit