diff --git a/CMakeLists.txt b/CMakeLists.txt index ed92b1eca..1309daa4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ project(dfhack) # set up versioning. set(DF_VERSION "50.08") -set(DFHACK_RELEASE "r4rc1") -set(DFHACK_PRERELEASE TRUE) +set(DFHACK_RELEASE "r4") +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 3300bd0c1..7761ad8f7 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.08-r4 + ## New Plugins - `logistics`: automatically mark and route items or animals that come to monitored stockpiles. options are toggleable on an overlay that comes up when you have a stockpile selected. @@ -45,22 +63,14 @@ changelog.txt uses a syntax similar to RST, with a few special sequences: - `autonick`: additional nicknames based on burrowing animals, colours, gems, and minerals - `stockpiles`: added ``barrels``, ``organic``, ``artifacts``, and ``masterworks`` stockpile presets - `orders`: only display import/export/sort/clear panel on main orders screen +- `orders`: refine order conditions for library orders to reduce cancellation spam - Blueprint library: dreamfort: full rewrite and update for DF v50 - Blueprint library: pump_stack: updated walkthrough and separated dig and channel steps so boulders can be cleared - Blueprint library: aquifer_tap: updated walkthrough -- `orders`: better order conditions for the ``smelting`` library orders to reduce cancellation spam - `dig-now`: can now handle digging obsidian that has been formed from magma and water ## Documentation -- `blueprint-library-guide`: update Dreamfort screenshots, add ``aquifer_tap`` screenshot - -## API - -## Internals - -## Lua - -## Removed +- `blueprint-library-guide`: update Dreamfort screenshots and links, add ``aquifer_tap`` screenshot # 50.08-r3 diff --git a/library/xml b/library/xml index f42397811..916a49700 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit f423978117f5eba1d53d5d88937d85069a58382c +Subproject commit 916a497000651b64272dacda3a5005650d3c0c68 diff --git a/scripts b/scripts index 04a01e6d3..fcccedb91 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 04a01e6d35a467ee40d6b706ce92f1c43a1acfa2 +Subproject commit fcccedb91e48ebdbe151950c86689d52f0617ea9