From 290586604138d197c5eeeacb45218b3e1f357b7c Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Sat, 2 Mar 2024 21:02:30 -0800
Subject: [PATCH] update changelog, version, and refs for 50.11-r7

---
 CMakeLists.txt     |  2 +-
 docs/changelog.txt | 26 ++++++++++++++++++++------
 library/xml        |  2 +-
 scripts            |  2 +-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fb1339121..3153d070f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ project(dfhack)
 
 # set up versioning.
 set(DF_VERSION "50.11")
-set(DFHACK_RELEASE "r6")
+set(DFHACK_RELEASE "r7")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index e46e86b06e..dea9d1d061 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -51,6 +51,24 @@ Template for new versions:
 
 # Future
 
+## New Tools
+
+## New Features
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+## Removed
+
+# 50.11-r7
+
 ## New Tools
 - `tweak`: (reinstated) a collection of small bugfixes and gameplay tweaks
 - `pet-uncapper`: (reinstated, renamed from ``petcapRemover``) allow pets to breed beyond the default population cap of 50
@@ -78,10 +96,8 @@ Template for new versions:
 - `zone`: animal assignment dialog now shows distance to pasture/cage and allows sorting by distance
 - `zone`: animal assignment dialog shows number of creatures assigned to this pasture/cage/etc.
 
-## Documentation
-
 ## API
-- Gui module Announcement functions now use DF's new announcement alert system, popups parsed into ``markup_text_boxst``
+- Gui module Announcement functions now use DF's new announcement alert system
 - ``Gui::addCombatReport``, ``Gui::addCombatReportAuto``: add versions that take ``report *`` instead of report vector index
 - ``Gui::MTB_clean``, ``Gui::MTB_parse``, ``Gui::MTB_set_width``: new functions for manipulating ``markup_text_boxst``
 - ``toupper_cp437(char)``, ``tolower_cp437(char)``: new ``MiscUtils`` functions, return a char with case changed, respecting CP437
@@ -93,9 +109,7 @@ Template for new versions:
 - Overlay framework now respects ``active`` and ``visible`` widget attributes
 - ``dfhack.gui`` announcement functions use default arguments when omitted
 - ``dfhack.units.getCitizens`` now only returns units that are on the map
-- ``dfhack.upperCp437(string)``, ``dfhack.lowerCp437(string)``: new functions, return string with all chars changed, respecting CP437
-
-## Removed
+- ``dfhack.upperCp437(string)``, ``dfhack.lowerCp437(string)``: new functions, return string with all chars changed, respecting CP437 code page
 
 # 50.11-r6
 
diff --git a/library/xml b/library/xml
index fd5ea049fd..cca87907c1 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit fd5ea049fdac1bf5013d76903c08c5d69ae49926
+Subproject commit cca87907c1cbfcf4af957b0bea3a961a345b1581
diff --git a/scripts b/scripts
index cbb6d41681..f2fcb871b1 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit cbb6d4168138ccd0e0cd478984ed1c294c7b0d99
+Subproject commit f2fcb871b1232d6d79893748e5e4c5190b9f6160