Commit Graph

407 Commits (3e26618004294aa289eeff40702a8774318b6789)

Author SHA1 Message Date
lethosor 1295633722
Bump to 0.47.05-r3 2021-09-04 14:00:31 -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 42d3620ef6
update changelog 2021-09-01 13:04:13 -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 10db894d99
Merge remote-tracking branch 'myk002/myk_printall_nontable' into develop 2021-08-21 22:51:35 -04:00
myk002 4046e06056
update changelog 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
lethosor 77e0938dd1
Merge remote-tracking branch 'ab9rf/autogems-1263' into develop
Conflicts:
	docs/changelog.txt
2021-08-12 00:27:26 -04: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 9e8a35d263
update changelog 2021-07-30 13:09:14 -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
lethosor dde589967a
Bump to 0.47.05-r2, update changelog 2021-07-09 21:21:36 -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
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
lethosor 2fc5fbacb5
Merge remote-tracking branch 'myk002/myk_reveal_unhideFlood' into develop 2021-06-19 01:08:05 -04:00