Commit Graph

278 Commits (8540fd84a4924d132a40dcf7218e5b1cc00be466)

Author SHA1 Message Date
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
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 a2ee5e027b
Merge remote-tracking branch 'myk002/myk_help_i_am_my_own_grandpa' into develop 2021-01-26 23:53:39 -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 96dfea70c3
update changelog 2021-01-24 09:12:49 -08:00
myk002 03719f58df
avoid infinite parentage when linking rooms 2021-01-24 08:52:34 -08:00
lethosor 5ef7a81fd1
Merge remote-tracking branch 'myk002/myk_buildingplan_set_settings' into develop 2021-01-22 20:57:30 -05:00
lethosor ed3c48e64b
Update changelog and authors (#1755) 2021-01-21 23:55:01 -05:00
Susan b57286c59c update changelog 2021-01-17 17:32:31 +00:00
Myk 4300c185d7
Update docs/changelog.txt
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2021-01-12 22:46:18 -08:00
myk002 39059f2b12
update changelog 2021-01-11 15:14:24 -08:00
myk002 96b117d369
update plugin docs and changelog 2021-01-11 14:37:57 -08:00
myk002 4e1c70bc06
update changelog 2021-01-10 17:10:44 -08:00
PatrikLundell 58a4dbe15d corrected temperature calculation factor order 2020-12-27 11:25:04 +01:00
lethosor c6aac0d9d5
Bump changelog version and improve consistency 2020-12-24 13:29:50 -05:00
lethosor 8cace1eb06
probe: print more designation and occupancy-related flags
This was useful for testing #1729
2020-12-23 15:36:39 -05:00
lethosor 251511fcb5
Merge remote-tracking branch 'myk002/myk_extents' into develop 2020-12-23 11:57:33 -05:00
myk002 17f8048ab1
update changelog 2020-12-17 10:08:01 -08:00
myk002 dfbad3ec54
update changelog 2020-12-16 11:15:53 -08:00
lethosor cdfdfb0eb1
Update changelog 2020-12-14 00:16:28 -05:00
lethosor 9a6dcc3d36
Merge remote-tracking branch 'myk002/myk_alias_docs' into develop 2020-12-11 22:26:20 -05:00
myk002 ab815de38f
update changelog 2020-12-09 09:39:41 -08:00
lethosor 4e08357aaf
search: reset when screen is dismissed, even if it's still present under gview
Fixes #1725
2020-12-08 23:09:07 -05:00
lethosor db03f943c9
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop 2020-12-04 23:54:50 -05:00
PatrikLundell 9b53222932 river size determination change log 2020-12-03 15:48:28 +01:00
lethosor fb44b26b47
Make utils.addressof() work for raw userdata 2020-11-19 21:32:42 -05:00
lethosor 8548295fe5
Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop 2020-11-18 11:12:17 -05:00
lethosor e68d2f9e3d
Update changelog (#1712/#1711) 2020-11-17 23:42:59 -05:00
Nilsolm 1c5fcae5b1 update changelog 2020-11-18 02:48:19 +01:00
PatrikLundell edc84f8de9 2 spaces killed 2020-11-17 22:01:54 +01: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 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 d51b56c780 removed a blank 2020-11-13 20:28:22 +01:00
lethosor 8cb38ecf5b
Merge remote-tracking branch 'myk002/myk_metalhead_mario' into develop 2020-11-13 14:04:30 -05: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
lethosor a5e58b766b
Update scripts, changelog 2020-11-12 21:07:14 -05:00
lethosor 58079217d9
Merge remote-tracking branches 'myk002/myk_buildingplan_no_quality' and 'myk002/myk_buildingplan_pause' into develop 2020-11-03 00:09:03 -05:00
lethosor 7f68229d10
Merge remote-tracking branch 'myk002/quickfort_library' into develop
Conflicts:
	docs/changelog.txt
2020-11-02 13:21:11 -05:00
Myk Taylor f053ccf14b update changelog 2020-10-31 03:05:55 -07:00
Myk Taylor 8d1ba5a83a remove changelog line -- this is new functionality 2020-10-31 02:34:06 -07:00
Myk Taylor 5ac1df96db update changelog 2020-10-31 02:30:26 -07:00
lethosor 27e054c9a7
Merge remote-tracking branch 'myk002/quickfort_dreamfort_walkthrough' into develop
Conflicts:
	docs/changelog.txt
2020-10-30 23:53:25 -04:00
lethosor d508ad3c4b
Merge remote-tracking branch 'myk002/buildingplan_building_material_filters' into develop
Conflicts:
	docs/changelog.txt
2020-10-28 23:57:55 -04:00
Myk Taylor 5244ca106b attribute dreamfort updates to the quickfort script 2020-10-27 22:03:14 -07:00
Myk Taylor 556c935e2b update changelog 2020-10-27 22:01:27 -07:00