Commit Graph

1175 Commits (e3588cf49c83ecd2f99af0ef0bd05853e1ffb394)

Author SHA1 Message Date
myk002 6b0f2eace9 update changelog 2022-02-25 12:57:17 -08:00
myk002 eae90c9448 remove fortplan code; leave doc stub 2022-02-25 12:57:17 -08:00
myk002 91b55a648b update changelog 2022-02-19 17:54:01 -08:00
myk002 56e8de592c simplify dreamfort with new quickfort features
also:
- add in iron and flux indicators on the industry level
- fix out of date docs for professions
2022-02-19 17:54:01 -08:00
myk002 3dcc6fd899 update changelog 2022-02-18 15:47:33 -08:00
myk002 89038ffafa add pump stack blueprint to the libarary, add docs 2022-02-18 15:47:33 -08:00
myk002 0303e182a8 fix typo in shift syntax, explain why +y is down 2022-02-18 14:54:45 -08:00
myk002 f2865beb57 add docs for blueprint shifting and transformation 2022-02-18 14:54:45 -08:00
myk002 10d5f23400 add documentation for repeat() meta markers
and some overall editing updates (sorry for the clutter!)
2022-02-12 18:28:47 -08:00
myk002 e0ea113d88 add docs for extended syntax for z-level changes
in quickfort blueprints
2022-02-06 16:56:07 -08:00
Ryan Williams bc042bc7df
Use copyall instead of nesting pos2xyz and xyz2pos 2021-12-18 02:05:16 -08:00
myk002 5d6f88fa72 update changelog 2021-10-04 15:32:26 -07:00
myk002 dadb053d5f fix typo in hostpital supply config
powder -> plaster
2021-10-04 15:32:26 -07:00
myk002 86cd723162 update changelog 2021-10-04 12:53:31 -07:00
myk002 c292b14b3e add documentation for quickfort single-tile tracks 2021-10-04 11:02:18 -07:00
myk002 8245db8862 update changelog 2021-10-03 08:54:27 -07:00
myk002 438f030221 update changelog 2021-10-02 23:36:26 -07:00
myk002 d013b336ba update changelog 2021-10-02 12:50:47 -07:00
myk002 06916280f4 update changelog 2021-10-02 09:26:32 -07:00
myk002 850da0b5e4 move changelog entries to correct version 2021-10-02 09:25:19 -07:00
myk002 e3f723c6a2 update changelog 2021-10-02 09:25:19 -07:00
myk002 3c91f55612 update changelog 2021-09-25 22:00:49 -07:00
myk002 50a16ac147 update changelog 2021-09-22 10:30:41 -07:00
myk002 e6d93f4170 update docs for example orders and professions 2021-09-22 10:30:41 -07:00
myk002 e328609ac4 update changelog 2021-09-20 16:10:15 -07:00
myk002 596f72f06b implement --playback-start param and logic 2021-09-20 16:10:15 -07:00
myk002 53c1582080 update library guide 2021-09-20 13:01:07 -07:00
myk002 d5a9a9534e dreamfort improvements
- shift seventh dwarf from craftsdwarf to farmer
- give starting miners some skill in engraving to make smoothing the
  cistern go faster
- update embark suggestions and sample profile accordingly
- widen clearcutting area for surface fort so trees don't overhang the
  roof
- move wax from the cookables stockpile to the industry goods pile
- move coins from goods to metal
- move sheets from goods to textiles
2021-09-20 13:01:07 -07:00
myk002 413917e9c6 update docs 2021-09-17 10:57:26 -07:00
myk002 0410aaeaf0 update changelog 2021-09-10 11:11:44 -07:00
myk002 0747f872b0 add --splitby param to blueprint
--splitby=none is the new default, allowing all blueprint phases to be
written to a single file. old behavior of one phase per file is
supported via --splitby=phase.
2021-09-09 09:58:53 -07:00
myk002 3d1e3f0832 update changelog 2021-09-09 09:58:53 -07:00
myk002 9cdf3d9605 update changelog 2021-09-09 09:58:23 -07:00
myk002 8c0fccb406 update changlog 2021-09-09 00:35:15 -07:00
lethosor a083a7f670
tailor: fix operator precedence in command parsing
&& has a higher precendence than ||, so this could have resulted in a crash in
some cases. It also produced unintentional behavior where e.g. `tailor 1 foo`
would enable the plugin, unlike `tailor enable foo`.

From #1920
2021-09-06 22:35:38 -04:00
myk002 4a593a489c add reference to dffd file in dreamfort help 2021-09-05 23:54:48 -07:00
myk002 695106afae add a link to the fully built dreamfort on dffd 2021-09-05 23:54:48 -07:00
lethosor 1295633722
Bump to 0.47.05-r3 2021-09-04 14:00:31 -04:00
myk002 f8d041b9aa dreamfort and supporting files update
- merge otherstock into basic (safe now that we have orders sort)
- don't overproduce weapons and armor
- update dreamfort help and examples guide
2021-09-03 00:31:42 -07:00
lethosor 7c572ceec3
Make changelog "invalid line" errors include filename and location
e.g. for merge conflicts
2021-09-01 23:35:57 -04:00
lethosor 0d14a2ccef
Merge remote-tracking branch 'ab9rf/tailor-v2' into develop
Conflicts: docs/changelog.txt
2021-09-01 23:34:30 -04:00
myk002 2249b42506
update examples docs 2021-09-01 13:06:07 -07:00
myk002 f21ba5c8aa
implement orders sort, document, and add to init 2021-09-01 13:04:23 -07:00
myk002 42d3620ef6
update changelog 2021-09-01 13:04:13 -07:00
myk002 b1632c0413 alphabetize professions list; add Migrant 2021-08-30 23:52:52 -07:00
myk002 3a8f815f98 fix doc link typo 2021-08-30 23:10:28 -07:00
myk002 62bbfb1296 update examples documentation 2021-08-30 23:10:28 -07:00
myk002 65e5b89d4c add goblet-related aliases 2021-08-30 23:10:28 -07:00
myk002 c25d50217c fix doc typo 2021-08-30 23:10:28 -07:00
myk002 4b9df5c2db minor adjustments to professions; more to come 2021-08-30 23:10:28 -07:00
lethosor 687b84378d
Merge remote-tracking branch 'ab9rf/autofarm-berry-fix' into develop 2021-08-31 00:52:18 -04:00
lethosor dc86460238
Fix dashes in changelog 2021-08-31 00:28:04 -04:00
lethosor e5ca5e48e9
Merge remote-tracking branch 'lethosor/fix-compile-macos-m1-gcc' into develop 2021-08-28 17:05:51 -04:00
lethosor 10db894d99
Merge remote-tracking branch 'myk002/myk_printall_nontable' into develop 2021-08-21 22:51:35 -04:00
lethosor 39c650de13
Fix compilation error on macOS with GCC 11
This should make `-fpermissive` (from #1924) unnecessary, so I also removed
those instructions.
2021-08-21 12:58:17 -04:00
lethosor fb2d453b8b
Merge remote-tracking branch 'chrismdp/apple-m1-docs' into develop 2021-08-21 12:53:57 -04:00
myk002 4046e06056
update changelog 2021-08-19 21:58:26 -07:00
myk002 c8d329e334
add documentation for examples files 2021-08-19 21:58:26 -07:00
myk002 51cc8df40c
update changelog 2021-08-19 21:57:14 -07:00
myk002 d3fdb5a6e0
update changelog 2021-08-19 17:44:06 -07:00
lethosor 6b83a39f52
Merge remote-tracking branch 'myk002/myk_orders_reactions' into develop 2021-08-17 00:26:02 -04:00
Kelly Kinkade 22bcbf9877
Merge branch 'develop' into autofarm-berry-fix 2021-08-16 07:22:11 -05:00
Kelly Kinkade 92f258bdbf
Merge branch 'develop' into tailor-v2 2021-08-16 07:17:53 -05:00
myk002 e1f0e94f0f fix changelog 2021-08-14 21:38:00 -07:00
myk002 1e2732aee5 update changelog 2021-08-14 21:38:00 -07:00
myk002 00adb1b720
update changelog 2021-08-14 16:36:09 -07:00
myk002 2bd43f6e76
update changelog 2021-08-14 16:35:34 -07:00
Chris Parsons 71ac76761a
Add underscores as suggested
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2021-08-14 18:15:06 +01:00
lethosor 77e0938dd1
Merge remote-tracking branch 'ab9rf/autogems-1263' into develop
Conflicts:
	docs/changelog.txt
2021-08-12 00:27:26 -04:00
lethosor 46984c9d03
Split docs conventions into subsections, add links to documentation on links 2021-08-11 19:14:36 -04:00
Chris Parsons 4841c338fd Compilation updates for Apple Silicon 2021-08-11 22:26:19 +01:00
Kelly Kinkade aec9649c4e
Update changelog.txt 2021-08-11 13:04:55 -05:00
Kelly Kinkade 8254b96498
update changelog 2021-08-11 13:03:28 -05:00
Kelly Kinkade 1e44f61060
update changelog 2021-08-11 13:01:52 -05:00
lethosor 0aeb107844
Update changelog (#1923) 2021-08-11 11:21:41 -04:00
lethosor 0140ace317
Merge remote-tracking branch 'myk002/myk_buildingplan_attached' into develop 2021-08-10 01:07:35 -04:00
myk002 063c512389
update changelog 2021-08-06 07:10:22 -07:00
myk002 8fb456313f
allow only one positional param to be specified 2021-07-30 13:09:20 -07:00
myk002 7f0c3cc7e4
document dig-now lua api 2021-07-30 13:09:19 -07:00
myk002 aa1cbc95db
skip marker mode dig designations 2021-07-30 13:09:18 -07:00
myk002 89210a503e
add global anchor for dig-now 2021-07-30 13:09:17 -07:00
myk002 92656fc5c0
update plugin docs
since surface tiles are now handled
2021-07-30 13:09:17 -07:00
myk002 9e8a35d263
update changelog 2021-07-30 13:09:14 -07:00
myk002 c645cd5454
move units and items to ground when it disappears 2021-07-30 13:09:14 -07:00
myk002 71c605afd4
make options configurable and document 2021-07-30 13:09:13 -07:00
myk002 a5c329cfb2 add plumbing example and center images 2021-07-30 07:16:03 -07:00
myk002 b8ccd6e40b add dreamfort screenshots to library guide 2021-07-30 07:16:03 -07:00
myk002 17017bb526 update changelog 2021-07-30 07:16:03 -07:00
myk002 fca8bffaa4
update changelog 2021-07-21 21:58:06 -07:00
myk002 d12e6fc91e
update changelog 2021-07-09 22:01:47 -07:00
myk002 9deb4cd3e1
update changelog 2021-07-09 21:58:32 -07:00
myk002 a09f4d9b63
add --cursor and --quiet options to tiletypes-here 2021-07-09 21:58:32 -07:00
lethosor dde589967a
Bump to 0.47.05-r2, update changelog 2021-07-09 21:21:36 -04:00
lethosor f1ec222d9a
Update authors (#1883) 2021-07-05 15:57:09 -04:00
lethosor 8689a019f5
Merge remote-tracking branch 'arzyu/patch-1' into develop 2021-07-05 15:56:37 -04:00
lethosor f33db33c8f
Merge remote-tracking branch 'myk002/myk_force_extents' into develop + add extra changelog note
Conflicts:
	docs/changelog.txt
2021-07-05 15:52:03 -04:00
lethosor 9b58fa45ff
Update changelog (#1881) 2021-07-05 15:42:19 -04:00
lethosor 3e6cecbbc6
Merge remote-tracking branch 'myk002/myk_argparse' into develop 2021-07-05 15:21:59 -04:00
lethosor 887362a6ec
Update changelog (#1877) 2021-07-05 11:45:02 -04:00
lethosor 8da31dbbdc
Reword changelog (#1870) 2021-07-04 21:21:17 -04:00
lethosor ed03df7dfb
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop 2021-07-04 21:20:09 -04:00
myk002 b6e6f2d2fe
update changelog 2021-07-03 16:47:49 -07:00
myk002 e1c8bdafba
fix typo in changelog 2021-07-03 11:55:54 -07:00
myk002 37e8dd4a10
update changelog 2021-07-02 23:26:43 -07:00
myk002 db0614d85b
update changelog 2021-06-30 15:00:45 -07:00
myk002 a6a9704631
update changelog 2021-06-29 12:25:21 -07:00
lethosor e070f4d9d8
Merge remote-tracking branch 'myk002/myk_sidebar' into develop 2021-06-28 01:03:13 -04:00
lethosor 96dd249be0
getAnyPlant: use Maps::getPlantAtTile
Followup to #1882
2021-06-25 01:08:58 -04:00
Ryan Williams 35d32645fc
Added getPlantAtTile to Lua API 2021-06-23 23:12:53 -07:00
Ryan Williams 5807d6fbfa
Merge branch 'DFHack:develop' into patch-1 2021-06-23 23:08:01 -07:00
Ryan Williams a67a5d8283
Rename getPlantAtCoords to getPlantAtTile 2021-06-23 22:58:24 -07:00
lethosor e6729894ab
Merge remote-tracking branch 'myk002/myk_delay_until' into develop 2021-06-24 01:05:41 -04:00
myk002 7793adb888
update changelog 2021-06-23 14:55:42 -07:00
myk002 3ca80c271d
update changelog 2021-06-23 14:01:23 -07:00
myk002 d1796effd6
update changelog 2021-06-23 12:32:25 -07:00
arzyu c36441142a update changelog 2021-06-23 23:53:06 +08:00
Ryan Williams 7f61c24181
Authors.rst: Bumber -> Ryan Williams 2021-06-22 20:13:35 -07:00
Ryan Williams 60fe864426
Update Lua API.rst 2021-06-22 20:10:25 -07:00
lethosor 2fc5fbacb5
Merge remote-tracking branch 'myk002/myk_reveal_unhideFlood' into develop 2021-06-19 01:08:05 -04:00
lethosor db7eb9a736
Update scripts, move changelog entry 2021-06-18 18:22:53 -04:00
lethosor a300c5592d
Merge remote-tracking branch 'myk002/myk_teleport' into develop 2021-06-18 18:21:49 -04:00
lethosor 293b6e880f
Merge remote-tracking branch 'myk002/myk_plugin_doc' into develop 2021-06-17 22:09:41 -04:00
Josh C 662ba00dd1
Update Dev-intro.rst 2021-06-15 18:18:48 -07:00
lethosor a938aa14a5
Merge branch 'master' into develop
Conflicts:
	docs/Introduction.rst - GitHub mention added manually to Support.rst
2021-06-15 00:40:42 -04:00
lethosor 5d397ad0b0
[cherry-pick] Fix invalid role name
Cherry-pick of 001e608aa7

Conflicts (used version from master):
	docs/changelog.txt
2021-06-15 00:19:40 -04:00
lethosor 102f0437a4
Move support channels to a separate page and update
Removing freenode due to takeover, etc.
2021-06-15 00:03:24 -04:00
PatrikLundell ba5915b866 embark-assistant early waterfall quit removed 2021-06-13 17:47:15 +02:00
myk002 473b8245b2
update changelog 2021-06-07 07:04:23 -07:00
lethosor e90e3ae55b
Update changelog
Ref dfhack/stonesense#76, dfhack/stonesense#78
2021-06-06 23:33:20 -04:00
myk002 95ce44ab79
remove outdated info from plant plugin docs 2021-06-06 09:07:36 -07:00
myk002 34aa62d675
update changelog 2021-06-06 08:50:28 -07:00
myk002 fc860478e4
move fastdwarf's teleport code to Units module
and expose in Lua API
2021-06-06 08:48:32 -07:00
lethosor bce6432ea6
Merge remote-tracking branch 'bseiller/ea_improve_survey_performance_by_changing_inorgancs_to_vector_int' into develop 2021-06-04 00:21:34 -04:00
myk002 0c44e7da67
update changelog 2021-06-02 14:52:33 -07:00
myk002 fb8d6614c7
expose core flood unhide logic to Lua
refactor is a straight copy-paste. this code could really stand some
cleanup (unused vars, unnecessary use of the MapCache layer, forced
allocation of all blocks even if they are not being unhidden, etc.), but
that can come in a later PR.
2021-06-02 14:49:19 -07:00
myk002 b021edda0f
update changelog 2021-06-01 04:45:22 -07:00
lethosor 4f976a5909
Merge remote-tracking branch 'myk002/myk_blueprint' into develop 2021-05-24 23:48:21 -04:00
bseiller 838285e925 Improve performance of surveying => faster search
- def.h: changed vectors for inorganics to contain uint8_t instead of bool which improves the performance when using std::fill and std::memset to batch-set the whole array
- survey.cpp: using std::memset instead of direct assignment to reset the inorganic vectors, also using the actual size of each vector for the call
- changelog.txt: add note concerning the changes
2021-05-23 11:28:48 +02:00
myk002 b0dba22e72
standardize formatting in docs 2021-05-14 22:51:42 -07:00
lethosor aa1c9e37fd
Revert "Force maximum of Sphinx 3 for now"
This reverts commit 82ca4c35a5.
2021-05-11 19:49:13 -04:00
lethosor 001e608aa7
Fix invalid role name
Resolves #1851

See https://github.com/sphinx-doc/sphinx/pull/8345 for details
2021-05-11 19:46:01 -04:00
myk002 aba40b6c44
update changelog 2021-05-10 21:11:13 -07:00
myk002 265f17a53f
update blueprint docs 2021-05-10 21:11:13 -07:00
Myk 654b3e9c56
Merge branch 'develop' into myk_negative_number_params 2021-05-09 21:46:07 -07:00
lethosor 82ca4c35a5
Force maximum of Sphinx 3 for now
See #1851
2021-05-10 00:36:03 -04:00
lethosor c07ca1f324
Update changelog (#1826, #1824) 2021-05-10 00:27:21 -04:00
lethosor dc1cfb32b9
Adjust changelog 2021-05-10 00:15:41 -04:00
lethosor 57f26b6f21
Merge remote-tracking branch 'myk002/myk_buildingplan_enable_check' into develop 2021-05-10 00:11:36 -04:00
myk002 26b1489235
make isPlanModeEnabled() consider enable_all 2021-05-08 07:41:08 -07:00
myk002 59b08e99f6
fix -- handling and required arg detection 2021-05-07 15:21:45 -07:00
myk002 fd735d4b42
treat negative numbers as non-options in getopt 2021-05-07 15:21:45 -07:00
myk002 7060c297a8
disable fortress mode tests in CI for now
until we get a reuable fortress save set up
2021-05-07 15:19:10 -07:00
myk002 f8baba2cfd
update changelog 2021-05-07 15:19:09 -07:00
lethosor d902a59541
Move changelog entry to right section and remove link
Ref #1839: https://github.com/DFHack/dfhack/pull/1839/files#r615517105
2021-04-18 23:43:36 -04:00
myk002 a76c89f198
fix quickfortress stockpiles 2021-04-17 14:14:35 -07:00
lethosor a2f6bab0e6
Update scripts, authors
Ref dfhack/scripts#267
2021-04-15 22:29:53 -04:00
lethosor e2d56b9b8f
Merge remote-tracking branch 'lethosor/tweak-hide-priority-improvements' into develop 2021-04-08 23:43:14 -04:00
lethosor 761cf19e99
tweak hide-priority: make toggle state persist across designation menu uses
To reproduce:
1. Enter the `d`esignation menu
2. Press `-+` to change priorities
3. Create a designation
4. Press `Alt-p` to hide priorities
5. Exit and re-enter the designation menu (`Esc`, `d`)

Previously, priorities would be visible again after step 5. With this change, they are not visible until you press `Alt-p` again.

Fixes #1068. Note that this is a relatively unobtrusive fix: selecting a priority with `+-` will still result in priorities being shown again. This is native DF behavior that I am reluctant to override because users of designation priorities likely want to see them.
2021-04-05 21:58:51 -04:00
myk002 81bfdf4182
update changelog 2021-04-04 17:40:59 -07:00
lethosor ea1bc9e01b
Add GitHub issues/discussions to troubleshooting section 2021-04-03 00:24:58 -04:00
lethosor 8b38bf0e28
Move contribution-related information from Compile.rst to Contributing.rst 2021-04-03 00:20:15 -04:00
lethosor cb2d8e0903
Compile.rst: remove old git note and rearrange
Very unlikely that this affects anyone now
2021-04-02 23:52:32 -04:00
lethosor dfb52a2aba
Merge remote-tracking branch 'lethosor/command-prompt-fix-gui-scripts' into develop
Conflicts:
	docs/changelog.txt
2021-04-02 21:53:14 -04:00
lethosor 257f8dbe00
buildingplan: fix size calculation for constructions
Planning a 4x2 construction with DF's `umkh` keys (i.e. not automaterial's box-select) would previously produce a 5x3 construction instead, for example.
2021-04-01 00:16:54 -04:00
lethosor 2332009825
Merge remote-tracking branch 'myk002/myk_enable_luacov' into develop 2021-03-28 00:38:36 -04:00
lethosor 5e09fd882d
Fix Painter:viewport()
This works because Painter inherits from ViewRect. Unsure how this went unnoticed.
2021-03-27 16:55:48 -04:00
lethosor d61c4aa234
Merge remote-tracking branch 'myk002/myk_xlsxreader_classes' into develop 2021-03-27 00:10:03 -04:00
lethosor ceae4723cd
Update scripts, authors (dfhack/scripts#264) 2021-03-26 00:37:28 -04:00
myk002 222feff342
expand docs for open and close functions 2021-03-22 10:44:32 -07:00
myk002 4ef0ff2a24
fix formatting errors 2021-03-22 10:40:29 -07:00
myk002 5f00183177
move test harness out of test dir
and install to test.lua in top-level scripts directory instead of test/main.lua
2021-03-22 10:15:32 -07:00
myk002 aac958aa50
add open() wrapper fn and document class methods 2021-03-22 09:38:20 -07:00
lethosor 59b023c71d
Ensure that command-prompt is dismissed after a command creates a new screen
Fixes #1803

Running a command that created a new screen would previously result in a screen
order that looked like this, due to how `Screen::Hide` works:

- DF screen
  - `command-prompt` screen (dismissed)
    - New screen

The `command-prompt` screen remained on the stack until the new screen was
dismissed, so it would intercept viewscreen vmethod calls intended for the
DF screen.

This change adds a new behavior to `Screen::Hide` that results in this screen
order after running a command:

- DF screen
  - New screen
    - `command-prompt` screen (dismissed) - DF removes this screen immediately
2021-03-21 20:42:50 -04:00
lethosor fcb17da223
Update authors (#1801), xml 2021-03-20 19:21:39 -04:00
lethosor 3926482047
Merge remote-tracking branch 'gaberau/patch-1' into develop 2021-03-20 19:15:25 -04:00
Gabe Rau 81b6d93701 Minor grammer fixes. 2021-03-20 15:51:35 -06:00
Gabe Rau cc376eeb55 Fixed a number of spelling and grammatical errors. Should be set now. Added better examples and removed redundant words. 2021-03-20 15:49:53 -06:00
Gabe Rau 374fc763eb Fixed whitespace issues that cause a failed build on lint. 2021-03-20 01:55:45 -06:00
Gabe Rau e6639180db Fixed merge conflicts, expanded upon provided examples, added more detail. 2021-03-20 01:47:36 -06:00
Gabe Rau 5aa3c6bfc6 Revised Lua API.rst to better explain command. Added proper examples and explantion of difference between run_command and run_script. 2021-03-19 21:58:24 -06:00
Gabe Rau a77353b2e6
Update Lua API.rst
Corrected the dfhack.run_script documentation and added an example.
2021-03-17 23:17:01 -06:00
lethosor ab2c51d19c
Remove changelog entry from #1792
Only applied to files in scripts/test, which didn't exist in previous versions
2021-03-10 00:45:58 -05:00
myk002 f3bef8c34e
update changelog 2021-03-08 15:06:27 -08:00
myk002 69a2f44020
Lua class wrappers for the xlsxreader plugin API 2021-03-08 15:04:50 -08:00
myk002 81e62b8cfc
update changelog 2021-03-07 08:53:42 -08:00
myk002 ed21ed8593
update changelog 2021-03-07 08:51:33 -08:00
myk002 49b34b52f5
update docs 2021-03-07 08:16:25 -08:00
myk002 dc58d39c36
document DFHACK_ENABLE_LUACOV env var 2021-03-07 08:16:24 -08:00
lethosor 6d1bd62af9
Add a Java client lib and update the name of the Python one 2021-03-06 17:31:27 -05:00
lethosor 032cd64c10
Bump to r1, update submodules and changelog 2021-03-06 13:30:16 -05:00
lethosor 2bb4dbccc6
Replace installed hack/changelog.txt with stub
This was incomplete, but people were still referencing it.

Closes #1775
2021-03-06 12:43:31 -05:00
lethosor 9df06564a0
Merge remote-tracking branch 'PatrikLundell/Prospector' into develop
Conflicts:
	docs/changelog.txt
2021-03-03 23:56:06 -05:00
lethosor 1b2eed7c5e
confirm convict: use visible name to avoid exposing alternate identities
Ref #1593
See also:
https://www.reddit.com/r/dwarffortress/comments/ltzu82/if_i_wasnt_sure_i_found_the_vampire_before/
http://www.bay12forums.com/smf/index.php?topic=164123.msg8253738#msg8253738
2021-02-28 01:01:47 -05:00
lethosor 6acece1536
Merge remote-tracking branch 'myk002/myk_dreamfort' into develop 2021-02-25 22:25:42 -05:00
myk002 5a6263f72c
fix indentation 2021-02-24 21:56:40 -08:00
lethosor 4a7fcc6118
Fix plugin name in error, add link in docs
Ref #1769
2021-02-25 00:41:13 -05:00
lethosor cb9ed4ff0c
Merge remote-tracking branch 'myk002/myk_manipulator' into develop
Conflicts:
	docs/changelog.txt
2021-02-25 00:39:01 -05:00
myk002 23461e17c2
separate sand bags into their own stockpile
since quantum stockpiling them dumps out their contents
2021-02-24 19:50:29 -08:00
lethosor 96e91fa5e2
Merge remote-tracking branch 'myk002/myk_aliases_docs' into develop 2021-02-24 13:53:22 -05:00
lethosor af34b5d614
Merge remote-tracking branch 'bseiller/ea_improve_survey_performance_keep_mlts_on_heap' into develop 2021-02-23 00:22:22 -05:00