Merge remote-tracking branch 'upstream/develop' into SquidHack

realSquidCoder · realSquidCoder · commit 095a5a9dd4b1 · 2025-09-06T16:52:53.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,8 +6,8 @@ cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0074 NEW)
 
 # set up versioning.
-set(DF_VERSION "52.03")
-set(DFHACK_RELEASE "r2")
+set(DF_VERSION "52.04")
+set(DFHACK_RELEASE "r1")
 set(DFHACK_PRERELEASE FALSE)
 set(SQUIDHACK_INFO "Compatible with DFxTwitch v0.1.x")
 
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -67,6 +67,25 @@ Template for new versions:
 
 ## Removed
 
+# 52.04-r1
+
+## New Tools
+
+## New Features
+- Compatibility with DF 52.04
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+## Removed
+
 # 52.03-r2
 
 ## New Tools
diff --git a/library/xml b/library/xml
@@ -1 +1 @@
-Subproject commit e4993ceef7907351fd2ac6f9bd3a9e5ff24699db
+Subproject commit 7b691d256f9427036e7ff24fa795a0f9334739e7
