Commit Graph

3176 Commits

Author SHA1 Message Date
ZacSharp 4a042510d8
Merge branch '1.17.1' into 1.18.2 2022-06-03 22:26:24 +02:00
Leijurv f3c93855bb
Merge pull request #3363 from stackmagic/build-fix-1.17
Build fix 1.17
2022-03-31 14:01:26 -07:00
Patrick Huber 599aa42cd8 Build: set rootProject.name again (already present up until 1.16 and went missing afterwards) 2022-03-26 18:59:13 +01:00
Patrick Huber 95afaf3eac Build: print more details on error 2022-03-26 18:49:06 +01:00
Leijurv 384dfb5f46
Merge pull request #3325 from wagyourtail/1.17.1
move death event to work with `doImmediateRespawn` gamerule
2022-03-15 19:07:11 -07:00
Wagyourtail 89bd2a4a07
move death event to work with `doImmediateRespawn` gamerule 2022-03-15 18:44:39 -07:00
Leijurv 477e3a706b
Merge pull request #3308 from wagyourtail/1.17.1
fix `<parameter1> is null`
2022-03-08 17:01:51 -08:00
Wagyourtail 9ba8949a2e
fix `<parameter1> is null` (and sneak in some other changes) 2022-03-08 17:28:56 -07:00
Wagyourtail 9b7d3af03d
remove duplicate 2022-03-08 17:28:56 -07:00
Leijurv 8a0771e5f4
v1.8.3 2022-03-08 14:50:04 -08:00
Leijurv 9c6c977314
Merge pull request #3292 from wagyourtail/1.18.2
1.18.2
2022-03-08 14:47:42 -08:00
Wagyourtail 38c5388e00
forge updated (finally) 2022-03-01 16:36:09 -07:00
Wagyourtail 519a76a171
fix for 1.18.2 2022-02-28 15:29:37 -07:00
Leijurv eefc98a68e
Merge pull request #3269 from wagyourtail/1.17.1
fix amethyst bud stuck
2022-02-14 14:38:07 -08:00
Wagyourtail d0dc8cf726
fix amethyst bud stuck 2022-02-14 15:35:34 -07:00
Leijurv 267961434c
Merge pull request #3254 from wagyourtail/1.17.1
fix an array oob with dynamic worldheight
2022-02-08 10:46:01 -08:00
Leijurv 0bfe98d306
Merge pull request #3255 from wagyourtail/replaymod-newfix
replaymod replay crash fix 1.17+
2022-02-08 10:45:39 -08:00
Wagyourtail bfa644e7a7
oops 2022-02-08 11:41:45 -07:00
Wagyourtail 0ef1558803
fix this in a "better" way 2022-02-08 02:09:29 -07:00
Wagyourtail 9dad1af960
move up null check to fix new data-driven caused crash with replaymod 2022-02-08 01:57:56 -07:00
Wagyourtail 407f4dbbae
fix an array oob with dynamic worldheight 2022-02-08 01:36:32 -07:00
Leijurv af240d38e0
Merge pull request #3242 from wagyourtail/1.17.1
fix getting stuck in powdered snow
2022-02-02 21:10:14 -08:00
Wagyourtail a3dbec62dc
fix getting stuck in powdered snow 2022-02-02 21:47:45 -07:00
Leijurv b6cc15e9ab
v1.8.2 2022-02-02 15:55:22 -08:00
Leijurv fe26168a07
v1.7.2 2022-02-02 15:54:39 -08:00
Leijurv ebb9dd1aaf
Merge branch '1.17.1' into 1.18.1 2022-02-02 15:47:50 -08:00
Leijurv d4c4441cb6
Merge pull request #3238 from wagyourtail/1.17.1
Merge master into 1.17
2022-02-02 15:47:20 -08:00
Wagyourtail 91bfab30e0
fix tabbing 2022-02-02 14:10:20 -07:00
Wagyourtail a32811942e
merge master in 2022-02-02 11:17:02 -07:00
Leijurv 0908e509a1
simplify a bit more 2022-02-02 00:51:24 -08:00
Leijurv ad14226c5c
lets not keep updating this 2022-02-02 00:50:48 -08:00
Leijurv 3fcc032547
readme updates for new release 2022-02-02 00:50:12 -08:00
Leijurv e077995332
v1.8.1 2022-02-02 00:38:06 -08:00
Leijurv 71e17d6c29
v1.7.1 2022-02-02 00:35:37 -08:00
Leijurv c9ebc0191d
Merge branch '1.17.1' into 1.18.1 2022-02-02 00:30:29 -08:00
Leijurv 2f7f15da77
gitignore vscode file 2022-02-02 00:30:25 -08:00
Leijurv fa3f5ae521
rm vscode stuff 2022-02-02 00:30:12 -08:00
Leijurv db0ebeebee
Merge branch '1.17.1' into 1.18.1 2022-02-02 00:29:26 -08:00
Leijurv dc4913d98d
oopsie 2 2022-02-02 00:29:15 -08:00
Leijurv 70dc2a3009
Merge branch '1.17.1' into 1.18.1 2022-02-02 00:25:13 -08:00
Leijurv 33943dc473
oopsie 2022-02-02 00:24:32 -08:00
Leijurv 21022f30b6
Merge commit 'd4ae351065889bfe37f5a51f123d5cd9a3e173e0' into 1.17.1 2022-02-02 00:20:23 -08:00
Leijurv d4ae351065
Merge branch '1.16.4' into 1.16.5 2022-02-02 00:19:06 -08:00
Leijurv 2b75241338
Merge branch '1.16.4' into 1.17.1 2022-02-02 00:17:09 -08:00
Leijurv b52de9b197
Merge pull request #2621 from wagyourtail/replaymodfix-master
fix replaymod crash (on newer versions)
2022-02-02 00:15:50 -08:00
Leijurv 3de7fc81fb
Merge branch '1.15.2' into 1.16.4 2022-02-02 00:15:04 -08:00
Leijurv 34501f5af3
Merge branch '1.14.4' into 1.15.2 2022-02-02 00:14:38 -08:00
Leijurv 696ec6756d
Merge pull request #3077 from wagyourtail/1.18
1.18 support
2022-02-02 00:00:05 -08:00
Leijurv 6e03e6859c
Merge pull request #3194 from wagyourtail/1.17.1
fix dripleaf and azalea behavior
2022-02-01 23:57:54 -08:00
Leijurv c2de6e3f3d
Merge pull request #3173 from scorbett123/patch-4
Add unpause as an alias for resume
2022-02-01 23:57:21 -08:00