lethosor
90cf6e8587
Merge remote-tracking branch 'quietust/dwarfvet' into develop
2020-11-17 23:38:06 -05:00
lethosor
53916dbe6b
Use charToKey and clean up logic a bit
...
Ref #1714
2020-11-17 23:33:18 -05:00
lethosor
2d79052938
Merge remote-tracking branch 'Nilsolm/fix/buildingplan-handleinput' into develop
2020-11-17 23:22:18 -05:00
Nilsolm
1c5fcae5b1
update changelog
2020-11-18 02:48:19 +01:00
Nilsolm
4ac3e62e60
ignore input if selection is zero
2020-11-18 02:41:20 +01:00
David
0f849cf278
Merge pull request #1 from DFHack/develop
...
sync with upstream
2020-11-18 00:22:56 +01:00
PatrikLundell
edc84f8de9
2 spaces killed
2020-11-17 22:01:54 +01:00
PatrikLundell
1cd9babfb7
2 spaces killed
2020-11-17 21:10:40 +01:00
PatrikLundell
7944026742
fixed help screen misalignment
2020-11-17 20:55:14 +01:00
PatrikLundell
8f5d9fe1e9
Merge branch 'develop' of https://github.com/DFHack/dfhack into embark-assistant
2020-11-17 19:53:09 +01:00
PatrikLundell
ab617f67cc
corrected world tile level incursion calculations
2020-11-17 19:52:46 +01:00
Quietust
877fd42214
dwarfvet - initialize spot_index ( #1711 ), fix types in Patient
2020-11-17 09:13:03 -06:00
lethosor
ddbd22fcf4
Update scripts
2020-11-15 22:22:18 -05:00
lethosor
0b886399fe
zone: stop enumnick from taking priority over assign/unassign/slaughter
...
Fixes #1709
Ref #1652
2020-11-15 22:21:46 -05:00
lethosor
8319d71dff
Improve documentation of reqscript, dfhack_flags, etc.
2020-11-15 18:42:14 -05:00
lethosor
14eeeeedc0
Remove extra paragraph from generated changelogs, restore paragraph margins
...
The CSS (changed in bca76b8f
) was removing space between actual paragraphs in
lists. This was intended to address excess padding in changelogs, but that is
resolved here by removing blank lines surrounding nested lists. This still
displays properly on GitHub/Reddit and presumably other Markdown implementations
as well.
2020-11-15 17:39:34 -05:00
lethosor
85dfb67004
Move #1704's changelog entry to the correct release
2020-11-14 15:16:25 -05:00
lethosor
4921cb4ac7
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop
2020-11-14 15:08:22 -05:00
PatrikLundell
0ef56ba859
another space character met its demise
2020-11-14 14:53:54 +01:00
PatrikLundell
46835c9edd
reworked aquifer bit fiddling
2020-11-14 14:43:43 +01:00
lethosor
28d599ee36
Update scripts
2020-11-13 23:37:08 -05:00
lethosor
63bb1afcb6
Merge remote-tracking branch 'myk002/myk_resume' into develop
2020-11-13 23:36:46 -05:00
myk002
59e76ae407
detect buildingplan buildings in the resume plugin
2020-11-13 12:43:46 -08:00
PatrikLundell
d51b56c780
removed a blank
2020-11-13 20:28:22 +01:00
lethosor
bd278bbe68
Merge remote-tracking branch 'myk002/myk_quickfort_guide' into develop
2020-11-13 14:13:57 -05:00
PatrikLundell
6014a45235
Fixed bug missing world tiles lacking incurson supplied resources
2020-11-13 20:11:03 +01:00
lethosor
2e4f23d49f
Merge remote-tracking branch 'myk002/myk_isplannedbuilding' into develop
2020-11-13 14:09:36 -05:00
lethosor
170f4982b2
Update scripts
2020-11-13 14:05:48 -05:00
lethosor
8cb38ecf5b
Merge remote-tracking branch 'myk002/myk_metalhead_mario' into develop
2020-11-13 14:04:30 -05:00
myk002
76e8c495fe
revert skip_vector=true for now
2020-11-13 10:45:53 -08:00
myk002
efdba8b596
add buildingplan.isPlannedBuilding
2020-11-13 10:18:54 -08:00
myk002
4a9303ecb9
Merge branch 'myk_quickfort_guide' of github.com:myk002/dfhack into myk_quickfort_guide
2020-11-12 23:27:32 -08:00
myk002
d2472335fc
add names for quantums and zones
2020-11-12 23:23:04 -08:00
myk002
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
Myk Taylor
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
Myk Taylor
93c8de9b23
use numbered lists in meta blueprints section
2020-11-12 23:23:03 -08:00
Myk Taylor
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
myk002
625f003bc6
add names for quantums and zones
2020-11-12 23:20:53 -08:00
myk002
54eec5d47f
there is no job-module -- it's just an html anchor
2020-11-12 23:11:55 -08:00
myk002
93d9ac76be
update docs
2020-11-12 23:08:22 -08:00
myk002
fa126af1fd
undo unnecessary edits
2020-11-12 22:49:06 -08:00
myk002
10616a387f
cleaner mask-based implementation
2020-11-12 22:44:38 -08:00
myk002
6b14a92385
allow buildingplan to match metal bars
2020-11-12 19:54:00 -08:00
myk002
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
lethosor
fce10e598e
Merge branch 'cwd-handling' into develop
2020-11-12 21:13:07 -05:00
lethosor
a5e58b766b
Update scripts, changelog
2020-11-12 21:07:14 -05:00
lethosor
b55d844164
Add test for get_initial_cwd()
2020-11-12 21:03:05 -05:00
lethosor
913d860ae4
Use initial working directory as process path on Linux, and expose to Lua
2020-11-12 19:07:51 -05:00
lethosor
23b230495e
Merge branch 'develop' into cwd-handling
2020-11-12 18:44:05 -05:00
lethosor
7958c1f9e3
Merge remote-tracking branch 'myk002/myk_bad_bad_statics' into develop
2020-11-12 10:43:52 -05:00