From ecd0275b21dddde99c56a6100a6fe25afc77aaca Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Wed, 25 Sep 2024 12:22:47 -0500 Subject: [PATCH] updates for 50.14-r1 --- CMakeLists.txt | 4 ++-- docs/changelog.txt | 18 ++++++++++++++++++ library/xml | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5817107a42..a060806b7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ project(dfhack) # set up versioning. set(DF_VERSION "50.14") -set(DFHACK_RELEASE "beta") -set(DFHACK_PRERELEASE TRUE) +set(DFHACK_RELEASE "r1") +set(DFHACK_PRERELEASE FALSE) set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_ABI_VERSION 2) diff --git a/docs/changelog.txt b/docs/changelog.txt index 656a31a8b0..e6baf71475 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -55,6 +55,24 @@ Template for new versions: ## New Features +## Fixes + +## Misc Improvements + +## Documentation + +## API + +## Lua + +## Removed + +# 50.14-r1 + +## New Tools + +## New Features + ## Fixes - `preserve-rooms`: don't reserve a room for citizens that you expel from the fort - `autobutcher`: fix regression in ordering of butcherable animals diff --git a/library/xml b/library/xml index 7ec88aae2d..9f7e9d1c2f 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 7ec88aae2d9e115e23e47184a04c521ecb760db0 +Subproject commit 9f7e9d1c2fa9348af3a4e50f9b692663fc01a6a2