From a3cae2a6f9d66a6067a55990e384e22a6aeb8050 Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Thu, 21 Mar 2024 21:38:32 -0700
Subject: [PATCH] bump changelog to 50.12-r2.1

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d14666b8a..f4ce88755a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ project(dfhack)
 
 # set up versioning.
 set(DF_VERSION "50.12")
-set(DFHACK_RELEASE "r2")
+set(DFHACK_RELEASE "r2.1")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index d76fe4f0a9..63d492b68a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -56,7 +56,6 @@ Template for new versions:
 ## New Features
 
 ## Fixes
-- `orders`: don't intercept keyboard input for setting skill or labor restrictions on workshop workers tab when the player is setting the building nickname
 
 ## Misc Improvements
 
@@ -68,6 +67,11 @@ Template for new versions:
 
 ## Removed
 
+# 50.12-r2.1
+
+## Fixes
+- `orders`: don't intercept keyboard input for setting skill or labor restrictions on workshop workers tab when the player is setting the building nickname
+
 # 50.12-r2
 
 ## New Features
diff --git a/library/xml b/library/xml
index 6d08791b98..ff11195e83 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 6d08791b987deaab6f9006abde4941fb0b836d1d
+Subproject commit ff11195e83d9632cf9ea75f7e2e961207c9ceecf
diff --git a/scripts b/scripts
index 6a75e3d2bc..280aaa6ccd 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 6a75e3d2bc6da13aeca4b8a0a1d58f0f080cc6d3
+Subproject commit 280aaa6ccd9ab30bd982b026f829aedb0d801a50