Commit Graph

5327 Commits (2e11c91a103c784e5e16d5e4295ac9fe7cedc7c3)

Author SHA1 Message Date
Myk Taylor e90de61cc1
remove the features feature; we can do it with quickfort properties 2023-06-12 10:59:13 -07:00
Myk Taylor 37b07bcee6
add skeleton for autotrain 2023-06-11 23:31:54 -07:00
Myk Taylor ff7a2945eb
finish merge 2023-06-11 23:15:03 -07:00
Myk Taylor eaf97c620a
fix merge error 2023-06-11 22:59:54 -07:00
Myk Taylor aa1c0f2071
redesign stockpiles overlay 2023-06-11 22:56:08 -07:00
Myk Taylor b7d4b8fed6
import and export logistics features 2023-06-11 22:56:07 -07:00
Myk Taylor 43fbd89c23
first step at saving features 2023-06-11 22:31:38 -07:00
Myk Taylor c8786b21a0
export dialog prototype 2023-06-11 22:28:03 -07:00
Myk Taylor 89dedd78ac
move minimize button to the bottom 2023-06-11 22:28:03 -07:00
Myk Taylor a481520efd
implement minimize button 2023-06-11 22:28:03 -07:00
Myk Taylor c6d9a426dd
wip 2023-06-11 22:28:03 -07:00
Myk Taylor 1231006f6c
start of minimize button 2023-06-11 22:28:03 -07:00
Myk Taylor 7beac6b4c2
add some hover action to the overlay 2023-06-11 22:28:03 -07:00
Myk Taylor 44f8f84bba
initial stockpiles overlay 2023-06-11 22:28:03 -07:00
Myk Taylor ecbc35b292
one line per stockpile 2023-06-11 22:28:03 -07:00
Myk Taylor 8ab9739cd6
case insensitive sorting 2023-06-11 22:28:03 -07:00
Myk Taylor 2b2d03b9b1
calculate and display global stats 2023-06-11 22:28:03 -07:00
Myk Taylor 8eb6226336
remove redundant 'virtual' attributes 2023-06-11 22:28:03 -07:00
Myk Taylor 5ffbb4d0ef
unify and update automelt/autotrade/autodump 2023-06-11 22:28:01 -07:00
plule c55ab745bb RemoteFortressReader: Fix a possible null pointer access on image descriptions 2023-06-10 22:05:14 +02:00
Myk Taylor efc4f277d9
clear item occupancy flags for channeled tiles 2023-06-06 08:06:56 -07:00
Myk Taylor 760cd0cbcb
implement tameable property filtering 2023-05-28 20:44:27 -07:00
Myk Taylor dbcba3d548
refactor to allow interacting with route stop settings 2023-05-28 02:26:06 -07:00
DFHack-Urist via GitHub Actions a9843912be Auto-update submodules
scripts: master
plugins/stonesense: master
2023-05-25 07:13:13 +00:00
DFHack-Urist via GitHub Actions 44340dfb75 Auto-update submodules
library/xml: master
scripts: master
plugins/stonesense: master
2023-05-24 07:12:57 +00:00
Myk Taylor d06118ad8e
support recording stockpiles in blueprints 2023-05-21 09:45:28 -07:00
Myk Taylor 3729d7daa4
encode transmitted names in utf-8 2023-05-19 19:51:51 -07:00
Myk 804a80ea98
Merge pull request #3396 from myk002/myk_autodump
[autodump] remove cursor guard so autodump destroy can work
2023-05-19 11:33:33 -07:00
Myk Taylor d4e8d3399b
remove cursor guard from autodump so autodump destroy can work 2023-05-18 16:56:22 -07:00
Myk d48f4844d6
Merge branch 'develop' into myk_title_launch 2023-05-18 16:38:19 -07:00
Myk Taylor d4f41141ef
fix game_extra reference 2023-05-17 16:45:35 -07:00
Myk Taylor 6aede45135
add links to quickstart-guide and gui/control-panel to the title screen 2023-05-17 11:56:49 -07:00
Myk c38e5e65e6
Merge pull request #3387 from myk002/myk_classic
Dynamically look up texture values instead of assuming they're constant
2023-05-17 11:52:41 -07:00
Myk 5268de8dd8
Merge branch 'develop' into myk_classic 2023-05-17 11:27:33 -07:00
Myk Taylor 9d8a825eb4
adjust usage to game structure reunification 2023-05-17 11:13:21 -07:00
Myk b787ee7aa5
Merge pull request #3379 from myk002/myk_rescan
[overlay] rename overlay.reload to overlay.rescan
2023-05-17 10:21:15 -07:00
Myk Taylor 11361975f9
look up texpos values instead of assuming they're constant 2023-05-16 17:14:36 -07:00
Myk Taylor a76bed0ed5
rename overlay.reload to overlay.rescan 2023-05-16 11:41:28 -07:00
Myk Taylor 910b7c2ae9
fix autolabor warning appearing on inappropriate screens 2023-05-15 17:52:20 -07:00
lethosor f9a946190d
Disable building title-folder again
Hangs when enabled in dfhack.init, at least under wine
2023-05-10 23:31:00 -04:00
lethosor cb2db50a64
Re-enable build of several plugins
Likely to still work, and were probably just disabled due to v50 changes:
- changeitem
- createitem
- deramp
- flows
- lair

and a couple that don't access DF data at all:
- luasocket
- title-folder
2023-05-09 22:13:49 -04:00
John Cosker 58e11b01cb Comments 2023-05-03 19:37:44 -04:00
John Cosker 611e6d3a12
Merge branch 'develop' into design-refactor 2023-05-03 19:05:15 -04:00
Myk 2e64cf4373
Merge branch 'develop' into myk_add_spatter 2023-05-02 17:10:43 -07:00
Myk c91268e50f
Merge branch 'develop' into myk_worknow 2023-05-02 16:35:26 -07:00
John Cosker be6f52c052 Merge branch 'design-refactor' of https://github.com/johncosker/dfhack into design-refactor 2023-05-01 14:24:40 -04:00
John Cosker 528dc466e2 address review comments 2023-05-01 14:20:53 -04:00
Myk Taylor 0d6c5869f4
fix logo disappearing when hovered on title screen 2023-04-30 16:40:03 -07:00
Myk 898a54e72f
Merge pull request #3330 from DFHack/5008-beta1
merge 5008 work into develop
2023-04-29 18:42:25 -07:00
John Cosker 065323ef74
Merge branch 'develop' into design-refactor 2023-04-28 11:17:39 -04:00
John Cosker 6b7c90b676 Working C++ and refactors 2023-04-27 22:37:56 -04:00
Myk Taylor 83fa87b492
add work-now to the build 2023-04-27 14:22:45 -07:00
Myk Taylor ef140b0dd6
rename and enable plugin 2023-04-27 13:20:25 -07:00
Myk Taylor fab05ca887
fix position of title overlay; force refresh on resize 2023-04-27 12:59:06 -07:00
Myk Taylor 1b8fc20ad5
check items for accessibility for dialogs
before we only checked when doing the cycle, so if an inaccessible item
were manually selected, we'd never be able to build
2023-04-26 21:01:21 -07:00
Myk b1ae39764b
Merge branch '5008-beta1' into myk_nosdlreal 2023-04-26 15:48:13 -07:00
Myk Taylor 9c447e8d45
re-add add-spatter plugin (minimal changes) 2023-04-26 14:47:24 -07:00
Myk Taylor 6c88fa6440
don't output git hash on release builds 2023-04-24 16:12:37 -07:00
Myk 359df08803
Merge branch 'develop' into myk_autoclothing 2023-04-24 14:16:42 -07:00
Myk d5e302bc0d
Merge pull request #3296 from myk002/myk_dig_now
[dig-now] fix smoothing job detection
2023-04-24 14:16:19 -07:00
Myk 2a410f7570
Merge pull request #3294 from myk002/myk_title_version
add DFHack title version overlay
2023-04-24 14:13:53 -07:00
Myk 99b6aa0f90
Merge branch 'develop' into myk_dig_now 2023-04-24 14:13:25 -07:00
Myk Taylor 2686c8f084
move DFHack version next to logo
and only display on the base title screen
2023-04-24 08:04:08 -07:00
Myk Taylor 65da8ef3c9
only display dfhack logo on base title screen
to avoid overlapping important widgets on subscreens
2023-04-24 08:03:31 -07:00
Myk Taylor ab047af163
demote chatty WARN messages to DEBUG 2023-04-24 00:31:20 -07:00
Myk Taylor 31401b2e19
fixed size limit calculations for rollers 2023-04-23 23:48:10 -07:00
Myk Taylor 74e1aa70d9
fix smoothing job detection 2023-04-23 23:28:50 -07:00
Myk f009ca907e
Merge pull request #3271 from TaxiService/bplan_slidertowidgets
move Slider class from filterselection.lua into widgets.lua
2023-04-23 18:44:58 -07:00
Myk Taylor b5459faffe
format version string in help the same way 2023-04-23 18:20:50 -07:00
Myk Taylor b59bf72cd2
turn down the title-version plugin 2023-04-23 17:32:30 -07:00
Myk Taylor 33142a5dfc
add DFHack title version overlay 2023-04-23 17:26:45 -07:00
Myk 7e9936f856
Merge branch 'develop' into myk_troll_Fur 2023-04-21 13:49:27 -07:00
Myk Taylor 6d9a07355b
allow filtering by yarn 2023-04-21 11:54:38 -07:00
Myk Taylor 6b86f7c691
planner panel is minimized by default
and minimized state is now persisted across reloads
2023-04-21 11:20:28 -07:00
Taxi Service 8371aa0b8b renamed Slider to RangeSlider, and added draft of Lua API.rst entry 2023-04-20 13:24:47 +02:00
Taxi Service ae2bdfad5f moved Slider class from filterselection.lua to widgets.lua 2023-04-19 11:28:57 +02:00
Myk Taylor 250f05667b
add a warning when DT appears to be running 2023-04-18 15:50:59 -07:00
Myk Taylor f6031e6a79
refactor existing logic to use new function 2023-04-17 13:04:42 -07:00
Myk Taylor e9f6695ace
infrastructure for hiding armok tools 2023-04-17 09:39:15 -07:00
Myk Taylor 77c2458900
filter by gems (for windows) 2023-04-17 01:05:25 -07:00
Myk 85c767f0ca
Merge pull request #3236 from myk002/myk_stay_minimized
[buildingplan] don't reset planner panel minimized state
2023-04-16 10:31:42 -07:00
Myk 490de6bd39
Merge pull request #3184 from cvuchener/external-proto
Include proto directory from current source directory
2023-04-15 17:04:08 -07:00
Myk Taylor ef380e9e1c
don't reset planner panel minimized state 2023-04-15 15:49:36 -07:00
Myk Taylor 21784568bd
migrate from SDL interposing to the hooks API 2023-04-12 21:34:16 -07:00
DFHack-Urist via GitHub Actions 766ec620b5 Auto-update submodules
library/xml: master
plugins/stonesense: master
2023-04-11 19:06:51 +00:00
Myk 887e587e48
Merge pull request #3214 from myk002/myk_tree_root
adjust to tree root changes
2023-04-11 12:04:26 -07:00
Myk 09d32d3cdf
Merge pull request #3213 from myk002/myk_clothsilk
[buildingplan] add ability to filter by cloth and silk
2023-04-11 10:31:33 -07:00
Myk Taylor f813e6fa93
update stonesense head 2023-04-11 10:23:29 -07:00
Myk Taylor 460b1e8eaf
adjust code to new tree root type 2023-04-11 10:14:28 -07:00
Myk Taylor 20bea5fa21
add ability to filter by cloth and silk 2023-04-11 03:49:28 -07:00
Myk Taylor cbf1e23672
fix designation of non-fruit trees 2023-04-11 02:34:45 -07:00
Myk Taylor 956918ff21
add debug logging 2023-04-11 00:58:40 -07:00
Myk Taylor c5ff1622cd
reformat code and clean up headers 2023-04-11 00:39:22 -07:00
Myk Taylor 51047367f4
fix index out of bounds error when reading gems 2023-04-10 23:28:00 -07:00
Myk Taylor 04c16186de
hide planner overlay during the tutorial 2023-04-10 04:24:00 -07:00
Myk Taylor 661ddbd256
automelt doesn't need to disable itself 2023-04-10 03:37:22 -07:00
Kelly Kinkade ef53a243e6 prospector redux
this is arguably a better approach for dealing with the change in elevation display in v50
2023-04-09 13:47:45 -05:00
Kelly Kinkade 95fb4e7eaa add raw/cooked z level output to prospector
toady shifted displayed z levels by 100 for v50
2023-04-09 12:57:11 -05:00
Clément Vuchener 5aa246f6b0 plugins: include proto directory from current source directory
Updated remotefortressreader for the new behavior.
2023-04-08 12:43:30 +02:00
Myk Taylor 36db68deed
user longer text for weapon label 2023-04-07 02:17:22 -07:00
Myk Taylor 54c62a7307
tidy up 2023-04-07 02:08:47 -07:00
Myk Taylor 9e5728244e
don't error out when buildingplan is loaded at DF start 2023-04-07 02:07:45 -07:00
Myk ec114bea7c
Merge branch 'develop' into bplan_planneroverlay 2023-04-07 01:14:06 -07:00
Myk cd209d2f54
Merge branch 'develop' into bplan_itemselection 2023-04-07 01:06:38 -07:00
pre-commit-ci[bot] 93962df3de [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-04-07 01:57:12 +00:00
Quietust 8d40ca8be6 Add "faststart" plugin to make DF start faster
In particular, it makes the game's "Loading..." screen animate
as quickly as possible, shortening it from around 10 seconds to
slightly more than 1 second.

A conditional build setting makes it skip the animation as well,
making it slightly faster yet.

Ideally, this should become part of the Tweak plugin, but we're
not building that right now.
2023-04-06 19:47:21 -06:00
Taxi Service 6347e11751 moved prev/next on top, made set/edit filter button, more tweaks 2023-04-07 00:46:32 +02:00
Taxi Service f66c60ee65 removed some trailing whitespace... 2023-04-06 16:22:07 +02:00
Taxi Service 70b8c83178 highlight selected item, + various tweaks 2023-04-06 16:08:09 +02:00
TaxiService c490a9ebc2
updated comments in the footer area 2023-04-05 15:55:47 +02:00
Taxi Service 0c91644c5e various tweaks and fixes 2023-04-04 22:34:47 +02:00
TaxiService 59b7947230
removed trailing whitespace... 2023-04-04 18:31:04 +02:00
Taxi Service eda88a87ef Merge branch 'bplan_itemselection' of https://github.com/TaxiService/dfhack into bplan_itemselection 2023-04-04 18:27:15 +02:00
TaxiService e8e77e9ec2
Merge branch 'DFHack:develop' into bplan_itemselection 2023-04-04 18:25:54 +02:00
Taxi Service aa8870fcad custom EditField & reorganized panels 2023-04-04 17:38:38 +02:00
Taxi Service 8860ddf982 planneroverlay: initial rework commit 2023-04-03 22:46:31 +02:00
Taxi Service ea9f3ef9d1 restored pens.lua (has nothing to do with itemselection) 2023-04-03 22:27:50 +02:00
Taxi Service 07a4da6573 reworked itemselection ui & added vertical divider pens 2023-04-03 22:23:32 +02:00
Taxi Service d04780ee86 tweaked some item names shown on buildingplan uis 2023-04-03 20:38:57 +02:00
Taxi Service 935bc235b6 fixed vertical divider characters in ascii mode 2023-04-03 20:37:45 +02:00
Myk Taylor 55f7643381
use the defined constant instead of a magic number 2023-04-01 23:52:20 -07:00
Myk Taylor 9461e609a0
adjust text margin in hotkey menu for wide scrollbar 2023-04-01 22:53:35 -07:00
Myk Taylor d13dfd7d49
interpret shrubbery as floor instead of wall 2023-03-31 19:29:01 -07:00
Myk Taylor 99e2e596c0
use normalized specials vector 2023-03-31 04:47:54 -07:00
Myk Taylor 44adae24ab
fix items not being filtered correctly in item selection screen 2023-03-31 04:45:59 -07:00
John Cosker 7ff9d73a4c Technically drawing works 2023-03-30 15:17:08 -04:00
Myk Taylor 0db93762cf
bounds check the choice data
old forts that persisted data before this attribute existed will have an
invalid value
2023-03-29 15:09:18 -07:00
Myk Taylor f2958a5529
implement automaterial selection for buildingplan 2023-03-28 23:51:52 -07:00
Myk 921e08e97a
Merge branch 'develop' into myk_buildingplan_suspendmanager 2023-03-28 06:52:42 -07:00
Myk Taylor 02b52fcb3d
confirm for removing burrows via the repaint menu 2023-03-27 16:11:21 -07:00
Myk Taylor b515b337ea
silence noisy buildingplan warning
about itemless buildings not having items
2023-03-27 08:38:18 -07:00
Myk Taylor 0ed311c108
allow exported orders files to be deleted from the import dialog 2023-03-27 03:52:12 -07:00
Myk Taylor 8da7e216a4
buildingplan - suspendmanager integration 2023-03-27 02:24:56 -07:00
Kelly Kinkade f3862e3eec tailor: gatekeep debugging code 2023-03-27 00:44:20 -05:00
Kelly Kinkade 0f5456c45b tidy up after self
remove a couple of no-longer-used variables that i missed last time
2023-03-27 00:31:47 -05:00
Kelly Kinkade 4a173aac99 tailor: fix #3093, #3103
I significantly restructured the assignment algorithm to eliminate the overproduction issues in #3093

#3103 is addressed by excluding units that don't have the caste-level EQUIPS flag

closes #3093
closes #3103
2023-03-27 00:07:40 -05:00
Myk 4090a66eb2
Merge pull request #3094 from ab9rf/autoclothing
autoclothing: support disable
2023-03-25 15:02:12 -07:00
Myk 4108c57c0d
Merge pull request #3091 from ab9rf/getplants
reenable getplants
2023-03-25 13:11:04 -07:00
Myk 2538324008
Merge pull request #3096 from ab9rf/5007-tailor
tailor: add inventory sanity check debug mode
2023-03-25 13:04:47 -07:00
Myk Taylor 42b18d001b
refresh overlay and helpdb on new world to pick up mod content 2023-03-25 12:56:54 -07:00
Kelly Kinkade c8c0040678 tailor: add inventory sanity check debug mode
enable with "tailor debugging on" disable with "tailor debugging off"

this setting is not persisted
2023-03-25 14:56:04 -05:00
Myk 8b7223d1e2
Merge pull request #3086 from myk002/myk_buildingplan_no_filter_items
[buildingplan] allow player to choose any item when choosing items manually
2023-03-25 12:55:37 -07:00
Kelly Kinkade 1c25c9b80c autoclothing: support disable
this also includes some minor refactorings:
* some debug messages have been "tagged" so it's obvious they're from autoclothing
* a serialized list of flag checks has been replaced with a maskcheck
* partial lua api added, currently only supports enable/disable
2023-03-25 12:42:30 -05:00
Kelly Kinkade df286ab71e reenable getplants 2023-03-25 10:18:06 -05:00
Myk Taylor a8822bdefa
take carved stairs into account when auto building stairs 2023-03-24 15:43:02 -07:00
Myk Taylor 58eaf33b08
normalize stairs so they all use the same filter 2023-03-24 15:26:17 -07:00
Myk Taylor c8f590cbac
allow player to choose any item when choosing items manually
that is, ignore the global and building-specific filters
2023-03-24 14:36:06 -07:00
Myk Taylor 99d050d0a8
respect building size limits 2023-03-24 14:06:39 -07:00
Myk Taylor 013c6fe02a
don't render footprint if we're minmized 2023-03-23 17:30:18 -07:00
Myk da2ef0365d
Merge branch 'develop' into myk_the_case_of_the_missing_mask 2023-03-23 15:48:53 -07:00
Kelly Kinkade 95f6e6e5be tailor: fix material overrun issue
properly track materials required for already-queued jobs

fixes #3056
2023-03-23 16:23:06 -05:00
Myk Taylor 873e94ea5d
actually record the deserialized material mask val 2023-03-23 10:48:33 -07:00
Myk 4d540ba8ab
Merge pull request #3078 from myk002/myk_orders
add minimize button to orders overlay panel
2023-03-23 03:24:30 -07:00
Myk Taylor 9154a52d0a
remove spaces and dashes from allowed filename chars
since this will likely make it more difficult to represent stockpile
filenames in quickfort's stockpile configuration language
2023-03-23 02:26:37 -07:00
Myk Taylor b95d923b32
finalize docs, clear flags 2023-03-23 02:26:37 -07:00
Myk Taylor b5d4f04d2f
differentiate fish 2023-03-23 02:26:37 -07:00
Myk Taylor 876425fbc8
allow multiple filters 2023-03-23 02:26:37 -07:00
Myk Taylor 581c7370ca
prepend searchable prefix 2023-03-23 02:26:37 -07:00
Myk Taylor 0f5d3fd4a6
spacing 2023-03-23 02:26:37 -07:00
Myk Taylor fde51e5948
fix some debug strings 2023-03-23 02:26:37 -07:00
Myk Taylor f13df882b6
properly filter when setting gems 2023-03-23 02:26:37 -07:00
Myk Taylor a545bc8120
it compiles! 2023-03-23 02:26:37 -07:00
Myk Taylor 0a9e81418e
port two helper functions 2023-03-23 02:26:37 -07:00
Myk Taylor 06fa43932c
animals works 2023-03-23 02:26:37 -07:00
Myk Taylor 1c527ab3d8
rejiggered 2023-03-23 02:26:37 -07:00
Myk Taylor 5a317820f9
new logic for deserialization 2023-03-23 02:26:37 -07:00
Myk Taylor e21c55d6ff
update stockpiles command and use new data paths 2023-03-23 02:26:37 -07:00
Myk Taylor 90aed848bb
add minimize button to orders overlay panel 2023-03-23 02:26:00 -07:00
Myk Taylor 0b72b42b7e
allow metal chests to be melted 2023-03-23 00:59:05 -07:00
Kelly Kinkade 959b4b3171 update tailor
`tailor` now properly discriminates between dyed and undyed cloth and no longer defaults to using adamantine
2023-03-22 18:29:47 -05:00
Kelly Kinkade 42e21bf946 reenable prospector in fort mode
fort mode prospect works. embark mode prospect doesn't crash but generates nonsense data, so that code has been disabled for now
2023-03-20 11:00:25 -05:00
Myk b03a35ba8d
Merge pull request #3040 from myk002/myk_revflood
[reveal] anchor revflood at a unit's position
2023-03-19 14:37:29 -07:00
Myk Taylor 1984cf4469
remove unnecessary reload 2023-03-17 21:07:38 -07:00
Myk Taylor b55a19f859
make the planner panel un-minimizable again 2023-03-17 21:07:25 -07:00
Myk Taylor 4a3363da9c
anchor revflood at a unit's position
makes it more user friendly and reduces chance of mishap by placing the
cursor in an unforgiving location (like in a closed cavity)
2023-03-17 17:43:58 -07:00
Myk Taylor 181b930070
allow inputs to pass through when minimized 2023-03-17 14:59:39 -07:00
Myk Taylor 79dd5a313f
rename Build button to Confirm and update docs 2023-03-17 09:58:20 -07:00
Myk Taylor a9e853188c
better minimize widget for the planner panel 2023-03-17 08:33:55 -07:00
Myk Taylor 52dec0114f
properly count required bars/cloth and don't output confusing total quantities 2023-03-16 23:45:22 -07:00
Myk Taylor e95b6805d0
comment out heat safety feature 2023-03-16 19:55:12 -07:00
Myk Taylor b0f9ad6449
add buildingplan reset for resetting all filters 2023-03-15 14:02:59 -07:00
Myk Taylor 73e65f2d94
use proper widgets for the minimize button 2023-03-15 13:40:34 -07:00
Myk Taylor a4365f47f5
don't pick up empty specials 2023-03-15 13:40:08 -07:00
Myk Taylor 208a3e4ae8
add minimize/restore button 2023-03-15 01:19:34 -07:00
Myk Taylor 4be5ca4e81
filter by whether a slab is engraved
this actually adds an entirely new "specials" filter system that can be
extended later for other types
2023-03-15 00:29:27 -07:00
Myk 7edc686753
Merge pull request #3020 from myk002/myk_save_choice
[buildingplan] remember "choose items" choice per building type
2023-03-15 00:27:20 -07:00
Myk Taylor 306d300edf
persist choose items choice per building type 2023-03-14 22:26:56 -07:00
Myk Taylor 4d8580d9e7
remember "choose items" choice per building type 2023-03-14 21:55:43 -07:00
Myk Taylor 039171e01d
support multiple upright spikes in a spike trap 2023-03-14 21:36:41 -07:00
Myk Taylor 543f9ade0d
account for reverse ordering in job_items vector 2023-03-13 13:35:12 -07:00
Myk 63a7811ba5
Merge branch 'develop' into myk_buildingplan_clay 2023-03-12 15:59:48 -07:00
Myk Taylor c48c9c77c0
use new data directories for blueprints 2023-03-12 15:43:32 -07:00
Myk Taylor 3798a7cb5e
allow clay to be chosen as a filter material 2023-03-12 15:13:57 -07:00
Myk Taylor 468b3b54d4
fix buildingplan typo 2023-03-11 15:36:47 -08:00
Myk Taylor c56e248034
cleanup stockpiles plugin and don't bork on empty type vectors 2023-03-10 14:28:24 -08:00
Myk Taylor 6ad2922aca
filter displayed materials if building heat safety is set 2023-03-10 02:34:05 -08:00
Myk Taylor 43b423cd31
make number of weapons in trap configurable 2023-03-10 01:44:33 -08:00
Myk Taylor b884fab7b6
fix freeze when printing status and there are defunct planned buildings 2023-03-10 01:04:23 -08:00
Myk a37d2c09bf
Merge pull request #3001 from myk002/myk_buildingplan_pressure_plates
[buildingplan] fix handling of pressure plates
2023-03-10 00:17:57 -08:00
Myk Taylor a3f8be3c01
fix pens reference 2023-03-10 00:12:56 -08:00