Merge branch 'develop' into automelt

develop
Eamon Bode 2023-01-21 02:11:05 -05:00 committed by GitHub
commit 8e9ae9eab6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 7 deletions

@ -190,7 +190,7 @@ endif()
# set up versioning.
set(DF_VERSION "50.05")
set(DFHACK_RELEASE "alpha1")
set(DFHACK_RELEASE "alpha2")
set(DFHACK_PRERELEASE TRUE)
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

@ -36,9 +36,6 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## New Plugins
## Fixes
- `autofarm`: don't duplicate status line entries for crops with no current supply
- `orders`: allow the orders library to be listed and imported properly (if you previously copied the orders library into your ``dfhack-config/orders`` directory to work around this bug, you can remove those files now)
- `tailor`: now respects the setting of the "used dyed clothing" standing order toggle
## Misc Improvements
@ -50,6 +47,13 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## Removed
# 50.05-alpha2
## Fixes
- `autofarm`: don't duplicate status line entries for crops with no current supply
- `orders`: allow the orders library to be listed and imported properly (if you previously copied the orders library into your ``dfhack-config/orders`` directory to work around this bug, you can remove those files now)
- `tailor`: now respects the setting of the "used dyed clothing" standing order toggle
# 50.05-alpha1
## Fixes

@ -3,7 +3,7 @@ autoclothing
.. dfhack-tool::
:summary: Automatically manage clothing work orders.
:tags: untested fort auto workorders
:tags: fort auto workorders
This command allows you to set how many of each clothing type every citizen
should have.

@ -1 +1 @@
Subproject commit 7c396a2e9df433bb4904e7d7eb0f46c80b48c721
Subproject commit 65c61135e05a8fe380e8216534615cb96b26c1ed

@ -1 +1 @@
Subproject commit b6e894ced9f185e6400ec19415458931480cb799
Subproject commit 4e97b809511660f7b5fc98e82f7d1cfff49395ee