Merge branch 'develop' into myk_nestboxes_job

develop
Myk 2023-02-08 23:21:52 -08:00 committed by GitHub
commit dad05a9a9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions

@ -40,13 +40,13 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- Fix right click sometimes closing both a DFHack window and a vanilla panel - Fix right click sometimes closing both a DFHack window and a vanilla panel
- Fixed issue with scrollable lists having some data off-screen if they were scrolled before being made visible - Fixed issue with scrollable lists having some data off-screen if they were scrolled before being made visible
- `channel-safely`: fixed bug resulting in marker mode never being set for any designation - `channel-safely`: fixed bug resulting in marker mode never being set for any designation
- `automelt`: fixed bug related to lua stack smashing behavior in returned stockpile configs -@ `automelt`: fixed bug related to lua stack smashing behavior in returned stockpile configs
- `autochop`: fixed bug related to lua stack smashing behavior in returned stockpile configs -@ `autochop`: fixed bug related to lua stack smashing behavior in returned stockpile configs
- `nestboxes`: now cancels any in-progress hauling jobs when it protects a fertile egg - `nestboxes`: now cancels any in-progress hauling jobs when it protects a fertile egg
## Misc Improvements ## Misc Improvements
- `automelt`: is now more resistent to savegame corruption - `automelt`: is now more resistent to savegame corruption
- `hotkeys`: DFHack logo is now hidden on screens where it covers important information when in the default position (e.g. when choosing an embark site) -@ `hotkeys`: DFHack logo is now hidden on screens where it covers important information when in the default position (e.g. when choosing an embark site)
- `misery`: now persists state with the fort - `misery`: now persists state with the fort
- `autodump`: reinstate ``autodump-destroy-item``, hotkey: Ctrl-K - `autodump`: reinstate ``autodump-destroy-item``, hotkey: Ctrl-K
- `autodump`: new hotkey for ``autodump-destroy-here``: Ctrl-H - `autodump`: new hotkey for ``autodump-destroy-here``: Ctrl-H
@ -54,7 +54,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- `clean`: new hotkey for `spotclean`: Ctrl-C - `clean`: new hotkey for `spotclean`: Ctrl-C
- `autobutcher`: changed defaults from 5 females / 1 male to 4 females / 2 males so a single unfortunate accident doesn't leave players without a mating pair - `autobutcher`: changed defaults from 5 females / 1 male to 4 females / 2 males so a single unfortunate accident doesn't leave players without a mating pair
- `autobutcher`: now immediately loads races available at game start into the watchlist - `autobutcher`: now immediately loads races available at game start into the watchlist
- replaced DFHack logo used for the hover hotspot with a crisper image -@ replaced DFHack logo used for the hover hotspot with a crisper image
- `orders`: recipe for silver crossbows removed from ``library/military`` as it is not a vanilla recipe, but is available in ``library/military_include_artifact_materials`` - `orders`: recipe for silver crossbows removed from ``library/military`` as it is not a vanilla recipe, but is available in ``library/military_include_artifact_materials``
## Documentation ## Documentation
@ -73,7 +73,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
# 50.05-alpha3.1 # 50.05-alpha3.1
## Fixes ## Fixes
- `seedwatch`: fix parameter parsing when setting targets -@ `seedwatch`: fix parameter parsing when setting targets
# 50.05-alpha3 # 50.05-alpha3

@ -1 +1 @@
Subproject commit eff493010d11358fc8243239dbf8d07024eedb0c Subproject commit 06b0ed2e996860ac29419405b6668f1cb4fd3b97

@ -1 +1 @@
Subproject commit 8807e7a7845611b2cc613fb3903f6f8763e91300 Subproject commit 95a159d2af2038243776f5f8b6e5de1b77d52543