diff --git a/CMakeLists.txt b/CMakeLists.txt index e9f526f0e2..31f068c900 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_policy(SET CMP0074 NEW) # set up versioning. set(DF_VERSION "50.15") -set(DFHACK_RELEASE "r1.2") +set(DFHACK_RELEASE "r2") set(DFHACK_PRERELEASE FALSE) set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") diff --git a/docs/changelog.txt b/docs/changelog.txt index 2e1973a02c..b12dbc724d 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -53,6 +53,22 @@ Template for new versions: ## New Tools +## New Features + +## Fixes + +## Misc Improvements + +## Documentation + +## API + +## Lua + +## Removed + +# 50.15-r2 + ## New Features - `stockpiles`: add simple import/export dialogs to stockpile overlay panel - `orders`: add transparent overlays to the manager orders screen that allow right clicks to cancel edit of quantities or condition details instead of exiting to the main screen diff --git a/library/xml b/library/xml index 8344013c02..c6c8f15afe 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 8344013c02e119297bad688057d882a0fc34cd14 +Subproject commit c6c8f15afec05d457813c003a869509901993af4 diff --git a/plugins/stonesense b/plugins/stonesense index e90d8ec340..e1e5b95675 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit e90d8ec3405cb8f3a6990b0efd9e13614975e7f8 +Subproject commit e1e5b95675f8ed3b9462db5a8be882c07acec748 diff --git a/scripts b/scripts index 99d714e135..fbcb217a53 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 99d714e135758bda076dca871c6b3d85229b6e33 +Subproject commit fbcb217a533a7fb08532f6f000a5acb719feee5f