Commit Graph

1118 Commits (0eb9eee7738db2429a4b97edc09a7f6ea2dc9596)

Author SHA1 Message Date
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
lethosor bf56ac1af9
Merge remote-tracking branch 'myk002/myk_deprecate_fortplan' into develop
Conflicts:
	docs/changelog.txt
2021-02-20 00:54:18 -05:00
lethosor 1be75f269b
Merge remote-tracking branch 'myk002/myk_dreamfort' into develop
+typo fix in quickfort-alias-guide.rst
2021-02-20 00:47:59 -05:00
lethosor cc51835660
Merge remote-tracking branch 'myk002/myk_stockpile_containers_docs' into develop 2021-02-20 00:38:34 -05:00
myk002 3278519c98
document how to specify containers for stockpiles
that are not specified with expansion syntax
2021-02-19 11:43:10 -08:00
myk002 b3666da0a6
fix wheelbarrow UI change attribution 2021-02-18 23:11:09 -08:00
myk002 cf0506e650
add documentation for #aliases blueprints 2021-02-17 23:10:47 -08:00
myk002 9e17bc938c
only set labor validity for the player civ 2021-02-17 09:16:49 -08:00
lethosor e9afbd328e
Add some more client libraries to docs 2021-02-15 21:44:35 -05:00
myk002 09f0607db2
add deprecation warnings to fortplan 2021-02-13 11:07:14 -08:00
myk002 4790e23a5c
add more docs for quickfort orders 2021-02-13 07:46:45 -08:00
myk002 e87f27e1fd
Merge remote-tracking branch 'upstream/develop' into myk_stockpile_containers_docs 2021-02-13 07:17:15 -08:00
myk002 55743fc43f
Merge remote-tracking branch 'upstream/develop' into myk_manipulator 2021-02-13 07:16:58 -08:00
myk002 81d0a276b2
Merge branch 'develop' into myk_dreamfort 2021-02-13 07:15:11 -08:00
lethosor 49b6e814db
Bump to beta1, update submodules 2021-02-10 21:08:45 -05:00
lethosor ebbbfc0f8e
Merge remote-tracking branch 'myk002/myk_orders_crash' into develop
Conflicts:
	docs/changelog.txt
2021-02-10 00:10:53 -05:00
bseiller efe62b412c Update changelog 2021-02-09 08:48:43 +01:00
PatrikLundell 4660f52b36 improved pre embark mineral estimates 2021-02-08 14:45:49 +01:00
myk002 09d91dcae1
move alchemist-enabling logic to autohauler 2021-02-06 14:14:08 -08:00
myk002 13fae4628b
add docs for #place-generated manager orders 2021-02-05 17:05:34 -08:00
myk002 6819ee9928
make alchemist flag valid for controllable civs 2021-02-05 16:45:39 -08:00
myk002 4d57d27d4d
Revert "allow alchemist skill to be toggled in manipulator"
This reverts commit fa662cafbc.
2021-02-05 16:10:36 -08:00
myk002 330bde7660
add heavy feeder piles
and other minor fixes found during playtesting
refine the embark profile suggestions
2021-02-04 23:01:12 -08:00
myk002 6c6a9968ff
hauling aliases can take from multile stockpiles 2021-02-03 13:51:02 -08:00
myk002 1063497828
don't crash on malformed orders json 2021-02-02 10:50:21 -08:00
myk002 fa662cafbc
allow alchemist skill to be toggled in manipulator
since autohauler uses it as a flag
2021-02-02 08:28:48 -08:00
bseiller 76c9d7a678 Update changelog
- changelog.txt: changed description of fix to be more concise

Co-Authored-By: PatrikLundell <22739822+PatrikLundell@users.noreply.github.com>
2021-02-02 00:32:30 +01:00
bseiller 84151ccbf9 Update changelog
- changelog.txt: added entry for bug fix
2021-02-01 23:52:51 +01:00
myk002 824beb0253
documentation for bin/barrel/wb feature 2021-02-01 02:22:04 -08:00
myk002 4c7e25739f
more dreamfort refinements (details on forum) 2021-01-31 19:36:05 -08:00
myk002 94a46a66c6
update changelog 2021-01-31 08:38:50 -08:00
myk002 fb143516cd
refresh the dreamfort case study 2021-01-30 19:32:41 -08:00
myk002 0c165e020c
fix formatting error 2021-01-30 18:47:34 -08:00
myk002 32d4eb001a
update dreamfort case study according to changes 2021-01-30 18:43:39 -08:00
lethosor d2f3ec6076
Bump to 0.47.04-r5, adjust changelog 2021-01-30 21:23:44 -05:00
lethosor 9c65c1f7c7
Merge remote-tracking branch 'myk002/myk_stockpiles_stockflow_conflict' into develop
Conflicts:
	docs/changelog.txt
2021-01-30 21:11:58 -05:00
lethosor 472f19e82a
Merge remote-tracking branch 'myk002/myk_alias_fix' into develop
Conflicts:
	docs/changelog.txt
2021-01-30 20:58:36 -05:00
lethosor 7e12f3fd3d
Fix off-by-one, adjust changelog, move scroll keys to consistent place
Ref #1748
2021-01-30 19:40:15 -05:00
lethosor 8967e98a33
Merge remote-tracking branch 'myk002/myk_scrollable_labels' into develop 2021-01-30 19:33:04 -05:00
lethosor 6c379752fe
Update changelog, authors
Ref #1752, #1753
2021-01-30 18:11:39 -05:00
lethosor 62870e9aee
Remove extra log statement, reorder changelog
ref #1753
2021-01-30 18:08:17 -05:00
lethosor 9d0eacadbf
Merge remote-tracking branch 'Moth-Tolias/seedwatch' into develop 2021-01-30 17:56:16 -05:00
myk002 8e53fb450c
use normal title replacement for search-plugin 2021-01-30 00:56:36 -08:00
lethosor c6da99e5ce
Merge remote-tracking branch 'myk002/myk_stockflow_steals_input' into develop
Conflicts:
	docs/changelog.txt
2021-01-30 01:59:44 -05:00
lethosor 6db851a2ad
Update changelog (#1717) 2021-01-29 20:32:33 -05:00
lethosor 4126585573
Merge remote-tracking branch 'lethosor/lua-runcommand' into develop 2021-01-29 20:27:38 -05:00
lethosor 845993ba59
Merge remote-tracking branch 'lethosor/fix-k-search-crash' into develop 2021-01-29 20:08:08 -05:00
myk002 4bad609e33
use the search plugin for tallow aliases
and document the dependency
2021-01-29 12:20:25 -08:00
Su 545fcf6745
Merge branch 'develop' into seedwatch 2021-01-29 11:34:57 +00:00
lethosor 5c14f619c8
Merge remote-tracking branch 'myk002/myk_buildingplan_enable_all' into develop 2021-01-29 00:59:33 -05:00
myk002 7f62c12a83
document all_enabled setting 2021-01-28 21:50:43 -08:00
lethosor 865484f678
Merge branch 'develop' into fix-k-search-crash
Conflicts:
	docs/changelog.txt
2021-01-29 00:16:13 -05:00
lethosor de6f9183fd
Fix changelog, replace a couple qerror calls with error
Ref #1746
2021-01-29 00:04:10 -05:00
lethosor d4aef78b26
Merge remote-tracking branch 'myk002/myk_getopt' into develop 2021-01-28 23:58:45 -05:00
myk002 8a728c5170
fix tallow alias 2021-01-28 12:17:26 -08:00
myk002 aeb911878b
document new aliases 2021-01-27 14:57:03 -08:00
myk002 42ae0727fe
resolve hotkey help text conflict
between stockflow and stockpiles

I removed stockpiles's dynamic placement code as well. it attempted to
move the hotkey help text down if it covered any stockpile links, but
this will no longer work since other hotkey text already takes up all
the lines below stockpiles' hotkey text.
2021-01-27 08:37:12 -08:00
myk002 ff69665815
keep stockflow from stealing input during rename 2021-01-27 08:25:21 -08:00