Commit Graph

271 Commits

Author SHA1 Message Date
embeddedt
17e3b40bf9 Merge 1.18 into 1.19.2 2023-09-20 17:58:52 -04:00
embeddedt
0aabad688b Merge 1.16 into 1.18 2023-09-20 17:58:50 -04:00
embeddedt
7ff300d8df Add Vampirism to mods requiring fallback model iterator
Related: #242
2023-09-20 17:58:25 -04:00
embeddedt
375c978eb4
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-31 11:30:51 -04:00
embeddedt
3beef4df08
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-31 11:24:08 -04:00
embeddedt
dc42bda09d
Move shared build code out of rootProject build.gradle 2023-08-31 11:09:56 -04:00
embeddedt
fcde6104eb
Possible NPE fixes for KubeJS 2023-08-30 19:39:41 -04:00
embeddedt
eac4ddac4c
Merge 1.18 into 1.19.2 2023-08-29 15:17:04 -04:00
embeddedt
987c5dc321
Change mixin priority 2023-08-29 15:16:54 -04:00
embeddedt
ec99687702
Fix Canary compat 2023-08-29 15:08:50 -04:00
embeddedt
11f1be0d2c Merge 1.18 into 1.19.2 2023-08-24 21:47:02 -04:00
embeddedt
4418dd2eab Fix misapplied Forge patch that no longer checks currently loading chunk 2023-08-24 21:46:23 -04:00
embeddedt
9390f7fca9
Merge 1.18 into 1.19.2 2023-08-18 15:16:53 -04:00
embeddedt
7490809a42
Merge 1.16 into 1.18 2023-08-18 15:16:52 -04:00
embeddedt
45f92f7fce
Disable config reload message for now
There isn't a good way to print this in a way that will catch the
modification in all scenarios, and that doesn't annoy the user
2023-08-18 15:16:20 -04:00
embeddedt
7552199f5e
Merge 1.18 into 1.19.2 2023-08-18 14:39:24 -04:00
embeddedt
73c80d0603
Merge 1.16 into 1.18 2023-08-18 14:39:24 -04:00
embeddedt
fa9103fb06
Convert milliseconds to nanoseconds correctly 2023-08-18 14:39:07 -04:00
embeddedt
da944c330b
Merge 1.18 into 1.19.2 2023-08-18 14:35:24 -04:00
embeddedt
6b1f5232fa
Merge 1.16 into 1.18 2023-08-18 14:35:23 -04:00
embeddedt
672ca92aab
Show time to bootstrap stage on Forge 2023-08-18 14:35:15 -04:00
embeddedt
a06fca791a
Fix Forge experimental world suppression not working on first reopen 2023-08-15 21:18:39 -04:00
embeddedt
5079ce65ba
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-13 16:36:02 -04:00
embeddedt
47a04c66f1
Fix chunk future chain not being bypassed during entity load
Backport of https://github.com/neoforged/NeoForge/pull/99
2023-08-13 16:34:23 -04:00
embeddedt
53cc4584f4
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-13 16:15:02 -04:00
embeddedt
3492f9a4ee
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-13 16:12:32 -04:00
embeddedt
d9184833ec
Introduce MixinExtras 2023-08-13 15:53:20 -04:00
embeddedt
4399eeb67f
Merge 1.16 into 1.18 2023-08-12 12:13:44 -04:00
embeddedt
dd4d316a66
Merge 1.18 into 1.19.2 2023-08-12 12:13:44 -04:00
embeddedt
b776587f2d
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-12 12:02:43 -04:00
embeddedt
70a2a2194f
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-12 11:54:31 -04:00
embeddedt
b87c615e5d
Adjust mixin config 2023-08-12 11:51:28 -04:00
embeddedt
d1c9be8900
Clean up warnings 2023-08-12 11:41:04 -04:00
embeddedt
df8da0823a
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-12 11:31:45 -04:00
embeddedt
21ee0dc1cf
Add warning for Connectedness and dynamic resources 2023-08-12 11:28:07 -04:00
embeddedt
0a18e9c1dc
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-11 19:45:31 -04:00
embeddedt
e949ed67ef
Merge 1.16 into 1.18 2023-08-11 19:44:22 -04:00
embeddedt
a51b1563b1
Try to make config reload message appear less often
Related: #210
2023-08-11 19:31:36 -04:00
embeddedt
1e77cccf5a
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-11 17:00:38 -04:00
embeddedt
d92e48e1aa
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-11 16:53:00 -04:00
embeddedt
7645a43538
Add hacky solution for "runtime" remapping in dev 2023-08-11 16:47:38 -04:00
embeddedt
6c465c7182
Update use of Component 2023-08-08 10:26:57 -04:00
embeddedt
46be9a801c
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-08 10:26:30 -04:00
embeddedt
b8d0e5fee2
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-08 10:26:09 -04:00
embeddedt
e2aa482187
Try to provide more guidance to users when reloading configs 2023-08-08 10:24:48 -04:00
embeddedt
39e8e4a2ae
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-07 21:53:21 -04:00
embeddedt
8875710f3d
Use client commands on 1.18+ for /mfrc 2023-08-07 21:51:54 -04:00
embeddedt
41ca9fc251
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-05 12:07:53 -04:00
embeddedt
1a25984e88
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-05 11:46:24 -04:00
embeddedt
c1277a2bf5
Make a copy of the top-level model list when collecting materials
This should prevent CMEs if material collection triggers a model
load
2023-08-05 11:42:44 -04:00