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
fd7c3fc4aa
Prevent stockpiles hotkey label from overlapping with autodump
...
stockflow moved to last slot because it isn't enabled in dfhack.init-example
Ref #1764
2021-01-30 21:14:45 -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
eed1f2db6a
Update scripts
2021-01-30 21:03:05 -05:00
lethosor
d80867d6eb
Update scripts
2021-01-30 20:58:44 -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
c78866aba7
Merge remote-tracking branch 'abstern/autofarm-fallow-if-no-eligible-plants' into develop
2021-01-30 18:09:12 -05:00
lethosor
813a353ec2
Update xml
2021-01-30 18:08:32 -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
Susan
8540fd84a4
move world loaded check and message printing to plugin_enable()
2021-01-30 15:14:46 +00: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
Susan
33342404bc
Merge branch 'seedwatch' of github.com:Moth-Tolias/dfhack into seedwatch
2021-01-29 11:27:34 +00:00
Susan
a3b0cda069
don't enable if no world is loaded
2021-01-29 11:26:46 +00:00
lethosor
c5ab6e6ed4
Update scripts
...
dfhack/scripts#246
2021-01-29 01:00:37 -05: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
4fbd763c1a
Also cancel 'k' search when hotkeys (F1 - Shift-F8) are pressed
2021-01-29 00:28:32 -05:00
lethosor
865484f678
Merge branch 'develop' into fix-k-search-crash
...
Conflicts:
docs/changelog.txt
2021-01-29 00:16:13 -05:00
lethosor
810d2858bb
Update scripts
...
dfhack/scripts#238
2021-01-29 00:04:24 -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
lethosor
e4041495c4
Merge remote-tracking branch 'bseiller/ea_incursion_struct' into develop
2021-01-28 23:19:11 -05:00
myk002
8a728c5170
fix tallow alias
2021-01-28 12:17:26 -08:00
Su
98f3142c92
change deactivation message to be more accurate
...
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2021-01-28 18:00:34 +00:00
myk002
aeb911878b
document new aliases
2021-01-27 14:57:03 -08:00
myk002
bd75c4293f
add forbidcrafts alias
2021-01-27 13:23:17 -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
myk002
b7c598bb07
update changelog
2021-01-27 08:21:34 -08:00
myk002
a0151cc157
add 'crafts' alias
2021-01-27 08:20:00 -08:00
lethosor
a2ee5e027b
Merge remote-tracking branch 'myk002/myk_help_i_am_my_own_grandpa' into develop
2021-01-26 23:53:39 -05:00
bseiller
1f7cae17ef
Merge branch 'develop' into ea_incursion_struct
2021-01-26 23:22:59 +01:00
lethosor
2d5eb9c29d
Merge remote-tracking branch 'bseiller/prevent_repeated_survey_mlt_calls' into develop
2021-01-26 00:50:58 -05:00
lethosor
07c9cab969
Add comma
2021-01-26 00:45:30 -05:00
lethosor
58244ee574
Merge remote-tracking branch 'myk002/myk_dreamfort' into develop
2021-01-26 00:45:05 -05:00
myk002
a32a905708
fix typo
2021-01-25 14:53:10 -08:00
myk002
3372099f96
add aliases for bronze armor too
2021-01-24 17:11:17 -08:00
myk002
99fa1916f8
update changelog
2021-01-24 17:03:13 -08:00
myk002
cf8f9386f4
add alias for bronze weapons
2021-01-24 17:02:26 -08:00