From 032cd64c10bf38fcb9d955c75a8ade4e857cc579 Mon Sep 17 00:00:00 2001 From: lethosor Date: Sat, 6 Mar 2021 13:30:16 -0500 Subject: [PATCH] Bump to r1, update submodules and changelog --- CMakeLists.txt | 4 ++-- docs/changelog.txt | 6 ++++-- library/xml | 2 +- scripts | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ec1f02fb..4635db7a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,8 +185,8 @@ endif() # set up versioning. set(DF_VERSION "0.47.05") -set(DFHACK_RELEASE "beta1") -set(DFHACK_PRERELEASE TRUE) +set(DFHACK_RELEASE "r1") +set(DFHACK_PRERELEASE FALSE) set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") diff --git a/docs/changelog.txt b/docs/changelog.txt index 826c0b65f..a92bd7ee9 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -33,18 +33,20 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: # Future +# 0.47.05-r1 + ## Fixes - `confirm`: stopped exposing alternate names when convicting units - `prospector`: improved pre embark rough estimates, particularly for small clusters ## Misc Improvements -- `autohauler`: allow the ``Alchemist`` labor to be enabled in `manipulator` and other labor screens so it can be used for its intended purpose of flagging that no hauling labors should be assigned to a dwarf. Before, the only way to set the flag was to use an external program like Dwarf Therapist. +- `autohauler`: allowed the ``Alchemist`` labor to be enabled in `manipulator` and other labor screens so it can be used for its intended purpose of flagging that no hauling labors should be assigned to a dwarf. Before, the only way to set the flag was to use an external program like Dwarf Therapist. - `embark-assistant`: slightly improved performance of surveying - `quickfort`: Dreamfort blueprint set improvements: `significant `_ refinements across the entire blueprint set. Dreamfort is now much faster, much more efficient, and much easier to use. The `checklist `__ now includes a mini-walkthrough for quick reference. The spreadsheet now also includes `embark profile suggestions `__ - `quickfort`: added aliases for configuring masterwork and artifact core quality for all stockpile categories that have them; made it possible to take from multiple stockpiles in the ``quantumstop`` alias ## Documentation -- `fortplan`: fortplan has been replaced by `quickfort`. add deprecation warnings to command output and documentation. +- `fortplan`: added deprecation warnings - fortplan has been replaced by `quickfort` # 0.47.05-beta1 diff --git a/library/xml b/library/xml index 5c85c48a8..11c379ffd 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 5c85c48a89d48c468b92f0d0c69eb5ef94528b25 +Subproject commit 11c379ffd31255f2a1415d98106114a46245e1c3 diff --git a/scripts b/scripts index 734f2d5eb..a3b686ae4 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 734f2d5eb63431598a04e659b519b50640d1f333 +Subproject commit a3b686ae4ac6ea81853975b6e58480f031af9c70