49b6e814db
Bump to beta1, update submodules
2021-02-10 21:08:45 -05:00
ebbbfc0f8e
Merge remote-tracking branch 'myk002/myk_orders_crash' into develop
...
Conflicts:
docs/changelog.txt
2021-02-10 00:10:53 -05:00
1063497828
don't crash on malformed orders json
2021-02-02 10:50:21 -08:00
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
84151ccbf9
Update changelog
...
- changelog.txt: added entry for bug fix
2021-02-01 23:52:51 +01:00
d2f3ec6076
Bump to 0.47.04-r5, adjust changelog
2021-01-30 21:23:44 -05:00
9c65c1f7c7
Merge remote-tracking branch 'myk002/myk_stockpiles_stockflow_conflict' into develop
...
Conflicts:
docs/changelog.txt
2021-01-30 21:11:58 -05:00
472f19e82a
Merge remote-tracking branch 'myk002/myk_alias_fix' into develop
...
Conflicts:
docs/changelog.txt
2021-01-30 20:58:36 -05:00
7e12f3fd3d
Fix off-by-one, adjust changelog, move scroll keys to consistent place
...
Ref #1748
2021-01-30 19:40:15 -05:00
8967e98a33
Merge remote-tracking branch 'myk002/myk_scrollable_labels' into develop
2021-01-30 19:33:04 -05:00
6c379752fe
Update changelog, authors
...
Ref #1752 , #1753
2021-01-30 18:11:39 -05:00
62870e9aee
Remove extra log statement, reorder changelog
...
ref #1753
2021-01-30 18:08:17 -05:00
9d0eacadbf
Merge remote-tracking branch 'Moth-Tolias/seedwatch' into develop
2021-01-30 17:56:16 -05:00
c6da99e5ce
Merge remote-tracking branch 'myk002/myk_stockflow_steals_input' into develop
...
Conflicts:
docs/changelog.txt
2021-01-30 01:59:44 -05:00
6db851a2ad
Update changelog ( #1717 )
2021-01-29 20:32:33 -05:00
845993ba59
Merge remote-tracking branch 'lethosor/fix-k-search-crash' into develop
2021-01-29 20:08:08 -05:00
545fcf6745
Merge branch 'develop' into seedwatch
2021-01-29 11:34:57 +00:00
5c14f619c8
Merge remote-tracking branch 'myk002/myk_buildingplan_enable_all' into develop
2021-01-29 00:59:33 -05:00
865484f678
Merge branch 'develop' into fix-k-search-crash
...
Conflicts:
docs/changelog.txt
2021-01-29 00:16:13 -05:00
de6f9183fd
Fix changelog, replace a couple qerror calls with error
...
Ref #1746
2021-01-29 00:04:10 -05:00
d4aef78b26
Merge remote-tracking branch 'myk002/myk_getopt' into develop
2021-01-28 23:58:45 -05:00
8a728c5170
fix tallow alias
2021-01-28 12:17:26 -08:00
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
ff69665815
keep stockflow from stealing input during rename
2021-01-27 08:25:21 -08:00
b7c598bb07
update changelog
2021-01-27 08:21:34 -08:00
a2ee5e027b
Merge remote-tracking branch 'myk002/myk_help_i_am_my_own_grandpa' into develop
2021-01-26 23:53:39 -05:00
07c9cab969
Add comma
2021-01-26 00:45:30 -05:00
58244ee574
Merge remote-tracking branch 'myk002/myk_dreamfort' into develop
2021-01-26 00:45:05 -05:00
3372099f96
add aliases for bronze armor too
2021-01-24 17:11:17 -08:00
99fa1916f8
update changelog
2021-01-24 17:03:13 -08:00
96dfea70c3
update changelog
2021-01-24 09:12:49 -08:00
cd476a943c
fix quickfort library aliases for weapons
2021-01-24 09:00:38 -08:00
03719f58df
avoid infinite parentage when linking rooms
2021-01-24 08:52:34 -08:00
5ef7a81fd1
Merge remote-tracking branch 'myk002/myk_buildingplan_set_settings' into develop
2021-01-22 20:57:30 -05:00
ed3c48e64b
Update changelog and authors ( #1755 )
2021-01-21 23:55:01 -05:00
b57286c59c
update changelog
2021-01-17 17:32:31 +00:00
4300c185d7
Update docs/changelog.txt
...
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2021-01-12 22:46:18 -08:00
39059f2b12
update changelog
2021-01-11 15:14:24 -08:00
97309e45f5
update changelog
2021-01-11 15:02:58 -08:00
96b117d369
update plugin docs and changelog
2021-01-11 14:37:57 -08:00
4e1c70bc06
update changelog
2021-01-10 17:10:44 -08:00
936a13181a
Update changelog
2020-12-30 15:08:20 -05:00
58a4dbe15d
corrected temperature calculation factor order
2020-12-27 11:25:04 +01:00
c6aac0d9d5
Bump changelog version and improve consistency
2020-12-24 13:29:50 -05:00
8cace1eb06
probe: print more designation and occupancy-related flags
...
This was useful for testing #1729
2020-12-23 15:36:39 -05:00
251511fcb5
Merge remote-tracking branch 'myk002/myk_extents' into develop
2020-12-23 11:57:33 -05:00
17f8048ab1
update changelog
2020-12-17 10:08:01 -08:00
dfbad3ec54
update changelog
2020-12-16 11:15:53 -08:00
cdfdfb0eb1
Update changelog
2020-12-14 00:16:28 -05:00
9a6dcc3d36
Merge remote-tracking branch 'myk002/myk_alias_docs' into develop
2020-12-11 22:26:20 -05:00
lethosor
myk002
bseiller
Su
Susan
PatrikLundell