0f849cf278
Merge pull request #1 from DFHack/develop
...
sync with upstream
2020-11-18 00:22:56 +01:00
ddbd22fcf4
Update scripts
2020-11-15 22:22:18 -05:00
0b886399fe
zone: stop enumnick from taking priority over assign/unassign/slaughter
...
Fixes #1709
Ref #1652
2020-11-15 22:21:46 -05:00
8319d71dff
Improve documentation of reqscript, dfhack_flags, etc.
2020-11-15 18:42:14 -05:00
14eeeeedc0
Remove extra paragraph from generated changelogs, restore paragraph margins
...
The CSS (changed in bca76b8f
2020-11-15 17:39:34 -05:00
85dfb67004
Move #1704's changelog entry to the correct release
2020-11-14 15:16:25 -05:00
4921cb4ac7
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-11-14 15:08:22 -05:00
0ef56ba859
another space character met its demise
2020-11-14 14:53:54 +01:00
46835c9edd
reworked aquifer bit fiddling
2020-11-14 14:43:43 +01:00
28d599ee36
Update scripts
2020-11-13 23:37:08 -05:00
63bb1afcb6
Merge remote-tracking branch 'myk002/myk_resume' into develop
2020-11-13 23:36:46 -05:00
59e76ae407
detect buildingplan buildings in the resume plugin
2020-11-13 12:43:46 -08:00
d51b56c780
removed a blank
2020-11-13 20:28:22 +01:00
bd278bbe68
Merge remote-tracking branch 'myk002/myk_quickfort_guide' into develop
2020-11-13 14:13:57 -05:00
6014a45235
Fixed bug missing world tiles lacking incurson supplied resources
2020-11-13 20:11:03 +01:00
2e4f23d49f
Merge remote-tracking branch 'myk002/myk_isplannedbuilding' into develop
2020-11-13 14:09:36 -05:00
170f4982b2
Update scripts
2020-11-13 14:05:48 -05:00
8cb38ecf5b
Merge remote-tracking branch 'myk002/myk_metalhead_mario' into develop
2020-11-13 14:04:30 -05:00
76e8c495fe
revert skip_vector=true for now
2020-11-13 10:45:53 -08:00
efdba8b596
add buildingplan.isPlannedBuilding
2020-11-13 10:18:54 -08:00
4a9303ecb9
Merge branch 'myk_quickfort_guide' of github.com:myk002/dfhack into myk_quickfort_guide
2020-11-12 23:27:32 -08:00
d2472335fc
add names for quantums and zones
2020-11-12 23:23:04 -08:00
01741ce6c6
update quickfort guide and aliases
...
- move bit of alias documentation from aliases-common to aliases.txt
- document new behavior for 'c'ustom stockpiles
2020-11-12 23:23:03 -08:00
76759184d3
reinforce that meta blueprints can't cross files
...
they must refer to labels that are within the same .xlsx or .csv file
2020-11-12 23:23:03 -08:00
93c8de9b23
use numbered lists in meta blueprints section
2020-11-12 23:23:03 -08:00
647093f5c8
quickfort guide: 'c' stockpiles don't make sense
...
explain why "custom" stockpiles aren't meaningful to create in a
blueprint and what the user should do instead
2020-11-12 23:23:03 -08:00
625f003bc6
add names for quantums and zones
2020-11-12 23:20:53 -08:00
54eec5d47f
there is no job-module -- it's just an html anchor
2020-11-12 23:11:55 -08:00
93d9ac76be
update docs
2020-11-12 23:08:22 -08:00
fa126af1fd
undo unnecessary edits
2020-11-12 22:49:06 -08:00
10616a387f
cleaner mask-based implementation
2020-11-12 22:44:38 -08:00
6b14a92385
allow buildingplan to match metal bars
2020-11-12 19:54:00 -08:00
02a86d761a
identify bars as non_economic items
...
allows Job::isSuitableMaterial() to match metal bars as a building
material
2020-11-12 19:10:06 -08:00
fce10e598e
Merge branch 'cwd-handling' into develop
2020-11-12 21:13:07 -05:00
a5e58b766b
Update scripts, changelog
2020-11-12 21:07:14 -05:00
b55d844164
Add test for get_initial_cwd()
2020-11-12 21:03:05 -05:00
913d860ae4
Use initial working directory as process path on Linux, and expose to Lua
2020-11-12 19:07:51 -05:00
23b230495e
Merge branch 'develop' into cwd-handling
2020-11-12 18:44:05 -05:00
7958c1f9e3
Merge remote-tracking branch 'myk002/myk_bad_bad_statics' into develop
2020-11-12 10:43:52 -05:00
36110902fa
don't use cached iterators across map reloads
2020-11-12 00:11:13 -08:00
923b1b14f3
Merge remote-tracking branch 'myk002/buildingplan_persist_global_settings' into develop
2020-11-11 23:59:09 -05:00
9c13b497bf
Merge remote-tracking branch 'myk002/myk_automaterial_buildingplan_fix' into develop
2020-11-11 23:36:42 -05:00
41f5aa8d55
Merge remote-tracking branch 'myk002/myk_no_eat_rename' into develop
2020-11-11 20:20:16 -05:00
54702085d5
don't eat keys while building is being renamed
...
allows buildingplan to prevent unsuspension of planned buildings without
also eating the 's' key when the user is trying to use it to give the
building a custom name.
2020-11-11 17:12:56 -08:00
2ec8dd1225
update quickfort guide and aliases
...
- move bit of alias documentation from aliases-common to aliases.txt
- document new behavior for 'c'ustom stockpiles
2020-11-11 16:53:29 -08:00
421844dcb8
Update xml
2020-11-11 16:05:24 -05:00
c87d5260d3
buildingplan: make hotkeys added to existing menus red
...
For clarity (per Lua API.rst guidelines)
2020-11-11 16:04:40 -05:00
0958fdbf4b
Document script paths
...
Ref #1690
2020-11-10 00:48:27 -05:00
17432072f2
Also apply to xlsxio_write
2020-11-09 23:48:57 -05:00
eee33822e7
Update submodules
2020-11-09 23:41:53 -05:00
David
lethosor
PatrikLundell
myk002
Myk Taylor