Bump to r1, update submodules and changelog

DFHack · Mar 6, 2021 · 032cd64 · 032cd64
1 parent 2bb4dbc
commit 032cd64
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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 <http://www.bay12forums.com/smf/index.php?topic=176889.msg8239017#msg8239017>`_ refinements across the entire blueprint set. Dreamfort is now much faster, much more efficient, and much easier to use. The `checklist <https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=1459509569>`__ now includes a mini-walkthrough for quick reference. The spreadsheet now also includes `embark profile suggestions <https://docs.google.com/spreadsheets/d/13PVZ2h3Mm3x_G1OXQvwKd7oIR2lK4A1Ahf6Om1kFigw/edit#gid=149144025>`__
 - `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
diff --git a/scripts b/scripts