From fa78ec5fe84ddc590b2b036b32946c8c31a3a3a5 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Tue, 17 Oct 2023 01:20:28 -0700 Subject: [PATCH] bump to 50.11-r2 --- CMakeLists.txt | 4 ++-- docs/changelog.txt | 18 ++++++++++++++++++ library/xml | 2 +- scripts | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ec38b28a..7f61bb111 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ project(dfhack) # set up versioning. set(DF_VERSION "50.11") -set(DFHACK_RELEASE "r2rc1") -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/docs/changelog.txt b/docs/changelog.txt index 7a7b29391..c5df00ba8 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-r2 + ## New Tools - `spectate`: (reinstated) automatically follow dwarves, cycling among interesting ones - `preserve-tombs`: keep tombs assigned to units when they die diff --git a/library/xml b/library/xml index b685d71c1..b9c0733e9 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit b685d71c152a05f8dc3752f74e9b7f7e73582468 +Subproject commit b9c0733e943fb0d22a6717596128b8d44ba4ce04 diff --git a/scripts b/scripts index d83b1c970..1fcc83838 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit d83b1c97091f52c26db1b68f4050818a2c4ac2f1 +Subproject commit 1fcc83838e471fd8ef50cc6d6cb9259b69f1d847