872c5162ec
add libexpat, libzip, and xlsxio to LICENSE.rst
2020-11-18 19:04:56 -08:00
8548295fe5
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-11-18 11:12:17 -05:00
afe99b83c2
corrected orientation bug
2020-11-18 10:43:15 +01:00
c28bbe26c2
Update scripts
2020-11-18 00:02:21 -05:00
e68d2f9e3d
Update changelog (#1712/#1711)
2020-11-17 23:42:59 -05:00
90cf6e8587
Merge remote-tracking branch 'quietust/dwarfvet' into develop
2020-11-17 23:38:06 -05:00
53916dbe6b
Use charToKey and clean up logic a bit
...
Ref #1714
2020-11-17 23:33:18 -05:00
2d79052938
Merge remote-tracking branch 'Nilsolm/fix/buildingplan-handleinput' into develop
2020-11-17 23:22:18 -05:00
1c5fcae5b1
update changelog
2020-11-18 02:48:19 +01:00
4ac3e62e60
ignore input if selection is zero
2020-11-18 02:41:20 +01:00
0f849cf278
Merge pull request #1 from DFHack/develop
...
sync with upstream
2020-11-18 00:22:56 +01:00
edc84f8de9
2 spaces killed
2020-11-17 22:01:54 +01:00
1cd9babfb7
2 spaces killed
2020-11-17 21:10:40 +01:00
7944026742
fixed help screen misalignment
2020-11-17 20:55:14 +01:00
8f5d9fe1e9
Merge branch 'develop' of https://github.com/DFHack/dfhack into embark-assistant
2020-11-17 19:53:09 +01:00
ab617f67cc
corrected world tile level incursion calculations
2020-11-17 19:52:46 +01:00
877fd42214
dwarfvet - initialize spot_index ( #1711 ), fix types in Patient
2020-11-17 09:13:03 -06: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
myk002
lethosor
PatrikLundell
Nilsolm
Quietust
Myk Taylor