From a9df9f92d9017f28e08934abdf7398934102599a Mon Sep 17 00:00:00 2001
From: Myk Taylor <myk002@yahoo.com>
Date: Fri, 21 Jul 2023 18:50:15 -0700
Subject: [PATCH] update for 50.09-r2

---
 CMakeLists.txt                |  4 ++--
 data/blueprints/dreamfort.csv |  3 ++-
 docs/changelog.txt            | 20 ++++++++++++++++++--
 library/xml                   |  2 +-
 scripts                       |  2 +-
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69a3efed9..9fa7acbe1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,8 +8,8 @@ project(dfhack)
 
 # set up versioning.
 set(DF_VERSION "50.09")
-set(DFHACK_RELEASE "r2rc2")
-set(DFHACK_PRERELEASE TRUE)
+set(DFHACK_RELEASE "r2")
+set(DFHACK_PRERELEASE FALSE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
 set(DFHACK_ABI_VERSION 1)
diff --git a/data/blueprints/dreamfort.csv b/data/blueprints/dreamfort.csv
index 5ac765523..ea783e1e2 100644
--- a/data/blueprints/dreamfort.csv
+++ b/data/blueprints/dreamfort.csv
@@ -112,7 +112,7 @@ You can save some time by setting up your settings in gui/control-panel before y
 ""
 "On the gui/control-panel ""Autostart"" tab, additionally enable:"
 - autobutcher
-- autobutcher target 50 50 14 2 BIRD_GOOSE
+- autobutcher target 10 10 14 2 BIRD_GOOSE
 - autochop
 - autofarm
 - autofish
@@ -121,6 +121,7 @@ You can save some time by setting up your settings in gui/control-panel before y
 - ban-cooking all
 - buildingplan set boulders false
 - buildingplan set logs false
+- dwarfvet
 - nestboxes
 - prioritize
 - seedwatch
diff --git a/docs/changelog.txt b/docs/changelog.txt
index ff171fbb4..5e65b4909 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -33,6 +33,24 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+## New Plugins
+
+## Fixes
+
+## Misc Improvements
+
+## Documentation
+
+## API
+
+## Internals
+
+## Lua
+
+## Removed
+
+# 50.09-r2
+
 ## New Plugins
 - `3dveins`: reinstated for v50, this plugin replaces vanilla DF's blobby vein generation with veins that flow smoothly and naturally between z-levels
 - `zone`: new searchable, sortable, filterable screen for assigning units to pastures
@@ -71,8 +89,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 - ``dfhack.items.getValue``: gained optional ``caravan`` and ``caravan_buying`` parameters for prices that take trader races and agreements into account
 - ``widgets.TextButton``: wraps a ``HotkeyLabel`` and decorates it to look more like a button
 
-## Removed
-
 # 50.09-r1
 
 # 50.08-r4
diff --git a/library/xml b/library/xml
index 8358a5173..dd2f99f14 160000
--- a/library/xml
+++ b/library/xml
@@ -1 +1 @@
-Subproject commit 8358a51735ac1daeaa11d5a008c16301fa6759ce
+Subproject commit dd2f99f1498b903bb9ed28542b652e4c00d8188c
diff --git a/scripts b/scripts
index ae03c0d4e..03bf65057 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit ae03c0d4ea87ed4dcc74e49b177ad93c28baf42a
+Subproject commit 03bf65057d3a04badee4dfbffd99f85dd33b8e73