From af6b17f0ef3fc8adf3d8327bd686a422b97f857d Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Fri, 2 Feb 2024 15:01:31 -0800
Subject: [PATCH] bump to 50.11-r6

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 040076a4d4..ce0dcdcf5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ project(dfhack)
 
 # set up versioning.
 set(DF_VERSION "50.11")
-set(DFHACK_RELEASE "r5")
+set(DFHACK_RELEASE "r6")
 set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
diff --git a/docs/changelog.txt b/docs/changelog.txt
index a516aaff78..fa811c824f 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -29,7 +29,7 @@ Template for new versions:
 ## New Features
 
 ## Fixes
-- `dig-now`: now properly removes ramps rendered unusable by digging and changes newly exposed areas to light/outside when digging around the surface.
+
 ## Misc Improvements
 
 ## Documentation
@@ -53,11 +53,29 @@ Template for new versions:
 
 ## New Tools
 
+## New Features
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Lua
+
+## Removed
+
+# 50.11-r6
+
 ## New Features
 - `zone`: Add overlay for toggling butchering/gelding/adoption/taming options in animal "Overview" tabs
 
 ## Fixes
-- `sort`: fix potential crash when switching between info tabs
+- `dig-now`: remove diagonal ramps rendered unusable by digging
+- `dig-now`: fix error propagating "light" and "outside" properties to newly exposed tiles when piercing the surface
+- `sort`: fix potential crash when switching between certain info tabs
 - `suspendmanager`: overlays for suspended building info panels no longer disappear when another window has focus
 
 ## Misc Improvements
@@ -65,8 +83,6 @@ Template for new versions:
 - `autonestbox`: don't automatically assign partially trained egg-layers to nestboxes if they don't have an ongoing trainer assigned since they might revert to wild
 - `buildingplan`: replace ``[edit filters]`` button in planner overlay with abbreviated filter information
 
-## Documentation
-
 ## API
 - ``Units::assignTrainer``: assign a trainer to a trainable animal
 - ``Units::unassignTrainer``: unassign a trainer from an animal
diff --git a/library/xml b/library/xml
index ebdeca538b..5c2432edb1 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit ebdeca538b843b913c4a208016fafbd4f313a7f3
+Subproject commit 5c2432edb1021a07ba8b0161e1e5fa472c021055
diff --git a/scripts b/scripts
index 35d9796e1b..ead5eaa603 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 35d9796e1b540a94e63ead1e9b3689a72ed0f778
+Subproject commit ead5eaa603a4d7c97908206414fd06155d07a05e