ab74cf0af3
tombstone combine-drinks and combine-plants
2023-02-19 13:31:33 +11:00
3ad66d5c2f
Merge branch 'develop' into develop
2023-02-16 15:05:23 +11:00
648af1c81c
Buildings::StockpileIterator operator change added to FIxes.
2023-02-16 15:03:09 +11:00
80972466a4
Revert "Buildings::StockpileIterator operator change added to FIxes."
...
This reverts commit 8f190247e9
2023-02-16 15:01:11 +11:00
8f190247e9
Buildings::StockpileIterator operator change added to FIxes.
2023-02-16 14:55:00 +11:00
82cc486442
correct autolabor for structure update
...
df-structures#561 changed def'n of `activity_info` which autolabor used
2023-02-15 06:49:00 -06:00
39f13b642f
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-15 07:15:04 +00:00
d8afb6c682
Update Buildings.cpp
...
Changed the StockpileIterator::operator++ to checks block based on <= 16 rather than <16. Previously it was not returning items at stockpile tiles at the block boundary. Identified as part of combine.lua changes.
2023-02-15 15:31:50 +11:00
805d68017f
Merge pull request #2905 from myk002/myk_mouse
...
prevent mouse clicks from bleeding through when a window is dismissed
2023-02-14 06:46:43 -08:00
66229bb669
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-14 07:15:30 +00:00
bc76fd02e2
prevent mouse clicks from bleeding through when a window is dismissed
2023-02-13 17:35:02 -08:00
c1f62f4985
Merge pull request #2859 from kelvie/getSelectedCivZone
...
Add getSelectedCivZone to dfhack.gui
2023-02-13 16:21:24 -08:00
f8d94afb7d
Add getSelectedCivZone to dfhack.gui
...
Mostly helpful for my own automation in my custom lua scripts.
Tested it with barracks, meeting areas, and pastures.
2023-02-13 15:22:33 -08:00
6202b29c56
adapt autolabor to new split game structure
2023-02-13 13:39:28 -08:00
2fe0d8932e
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-13 21:29:24 +00:00
f22856bdda
Merge pull request #2900 from myk002/myk_zscreen
...
refine ZScreen behavior around pausing, update docs
2023-02-13 13:14:17 -08:00
14e303d2c3
Merge branch 'develop' into myk_zscreen
2023-02-13 13:14:00 -08:00
9c58b22913
Merge pull request #2894 from myk002/myk_autochop
...
generate names for nameless burrows; check for nil
2023-02-13 13:13:34 -08:00
fbabe5cdb0
Merge pull request #2898 from myk002/myk_showmood
...
[showmood] show more understandable units for bars and cloths
2023-02-13 13:13:24 -08:00
fc7e9885f0
Merge pull request #2899 from myk002/myk_strangemood
...
get strangemood compiling and running
2023-02-13 13:12:59 -08:00
e5072a4f64
check for settings in the ATTRS, not the args
2023-02-13 09:28:14 -08:00
853859e119
refine ZScreen behavior around pausing, update docs
2023-02-13 09:09:39 -08:00
2b3dcee4b0
get strangemood compiling and running
2023-02-13 01:18:45 -08:00
68d314c9c0
show more understandable units for bars and cloths
2023-02-13 01:17:57 -08:00
8dd938c5a6
Merge pull request #2891 from robob27/filteredlist-on-change
...
Add edit_on_change to FilteredList
2023-02-12 18:41:41 -08:00
766738e102
generate names for nameless burrows; check for nil
2023-02-12 15:21:10 -08:00
8d63757eea
Update docs/changelog.txt
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-02-12 18:01:35 -05:00
d49898d7bf
Merge pull request #2885 from myk002/myk_seedwatch
...
properly store the id of seed targets in persisted state
2023-02-12 14:53:40 -08:00
4bc6e1bec0
Merge branch 'develop' into myk_seedwatch
2023-02-12 14:48:40 -08:00
2a04abb1cb
Auto-update submodules
...
library/xml: master
scripts: master
2023-02-12 22:47:20 +00:00
7651f6a91e
Add edit_on_change to FilteredList
2023-02-12 17:44:19 -05:00
769d30064b
Merge pull request #2890 from hobotron-df/issue2888-autodump-flags
...
[issue-2888] Don't change dump and forbid flags on failed autodump
2023-02-12 14:30:46 -08:00
1b8565544e
Update docs/changelog.txt
2023-02-12 14:28:37 -08:00
5c457fc96f
[issue-2888] autodump now conditionally removes an item's dump flag and
...
sets forbid flag IFF the item is successfully dumped. Otherwise, the
item's original flags are kept intact. This avoids impacting any tasks
associated with the item.
2023-02-12 15:49:40 -06:00
0c989634ab
properly store the id of seed targets in persisted state
2023-02-12 03:19:31 -08:00
50e9ad93f3
Merge pull request #2869 from robob27/moar-units-checks
...
Add isGeldable, isMarkedForGelding and isPet
2023-02-12 01:27:37 -08:00
53f394ce73
Merge pull request #2872 from dawnmist/bugfix/issue-2871
...
Autobutcher check for nickname field being set - fix for #2871
2023-02-12 01:25:34 -08:00
4b5836b996
Fix for #2871
...
* Add check for unit->name.nickname field is not an empty string
* Refactor repeated checks for inappropriate and protected units
2023-02-12 16:43:33 +11:00
6b4c1e7787
Auto-update submodules
...
library/xml: master
2023-02-12 01:53:03 +00:00
65f38ec75c
Add isGeldable, isMarkedForGelding, isPet
2023-02-11 05:44:45 -05:00
3756d59919
copy edit overlay dev guide and update examples
2023-02-11 01:20:35 -08:00
3fb172f2e7
Auto-update submodules
...
scripts: master
2023-02-11 07:13:47 +00:00
c89b61a3d5
Merge remote-tracking branch 'lethosor/nestboxes-fix-forbid' into develop
2023-02-10 23:30:55 -05:00
de1a4fb5be
Update changelog
2023-02-10 23:30:35 -05:00
1390e724b6
nestboxes: avoid forbidding non-eggs
...
The rewrite in #2773 introduced a bug (identified by KMFrench on Discord) where
nestboxes themselves would be forbidden, which prevents egglaying citizens from
using them since the nestboxes would be claimed before use. The previous version
of the plugin handled this by skipping the first item in `contained_items`,
which is the building material (in this case, the nestbox).
This fix limits the `forbid` flag manipulation to egg items only, which should
be a reasonable limitation that still allows the plugin to serve its purpose.
2023-02-10 22:52:01 -05:00
9434cd3d64
Fix and detect duplicates in Authors.rst
2023-02-10 15:58:18 -05:00
ecce87ed50
Update authors (changes since 50.05-alpha0)
2023-02-10 15:29:51 -05:00
ad78427130
mark autolabor as tested and update scripts
2023-02-10 11:35:34 -08:00
5100a7ea40
bump to 50.07-alpha1
2023-02-10 10:26:37 -08:00
616d8d1bfc
Auto-update submodules
...
scripts: master
2023-02-10 18:09:10 +00:00
silverflyone
Kelly Kinkade
DFHack-Urist via GitHub Actions
Myk
Myk Taylor
Kelvie Wong
Rob Goodberry
Batt Mush
Janeene Beeforth
lethosor