embeddedt
|
00481145b6
|
Merge 1.19.4 into 1.20
|
2023-08-15 21:19:16 -04:00 |
|
embeddedt
|
a918c09543
|
Merge 1.19.2 into 1.19.4
|
2023-08-15 21:19:15 -04:00 |
|
embeddedt
|
a06fca791a
|
Fix Forge experimental world suppression not working on first reopen
|
2023-08-15 21:18:39 -04:00 |
|
embeddedt
|
5203985a25
|
Merge 1.19.4 into 1.20
|
2023-08-13 16:38:04 -04:00 |
|
embeddedt
|
351e4d3fc6
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-13 16:37:56 -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
|
2f92dbe12c
|
Update mixin
|
2023-08-12 12:13:31 -04:00 |
|
embeddedt
|
fab831f143
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-12 12:09:38 -04:00 |
|
embeddedt
|
073b8cb9de
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-12 12:09:21 -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
|
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
|
507cc7eb14
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-11 19:55:28 -04:00 |
|
embeddedt
|
dcad671568
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-11 19:48:12 -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
|
180ac925f7
|
Merge 1.19.4 into 1.20
|
2023-08-08 10:27:08 -04:00 |
|
embeddedt
|
bb115f1d2f
|
Merge 1.19.2 into 1.19.4
|
2023-08-08 10:27:08 -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
|
8f31048619
|
Merge 1.19.4 into 1.20
|
2023-08-07 21:53:31 -04:00 |
|
embeddedt
|
52b66db729
|
Merge 1.19.2 into 1.19.4
|
2023-08-07 21:53:30 -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
|
858551411b
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-07 11:22:35 -04:00 |
|
embeddedt
|
e0a170db92
|
Fix CTM block models not working (only item models worked)
|
2023-08-07 11:21:47 -04:00 |
|
embeddedt
|
fa17a5f745
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-07 10:47:02 -04:00 |
|
embeddedt
|
dc59c9bf0c
|
Update CTM integration for 1.19.4+
|
2023-08-07 10:46:19 -04:00 |
|
embeddedt
|
5165cf20c8
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-08-05 12:18:45 -04:00 |
|
embeddedt
|
2cb5acb9f9
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-05 12:17:50 -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 |
|
embeddedt
|
3df41090e4
|
Remove resource_key_equality patch as NeoForge fixes it in 1.20+
|
2023-08-04 10:05:55 -04:00 |
|
embeddedt
|
1b73ded110
|
Merge 1.19.4 into 1.20
|
2023-08-04 09:44:06 -04:00 |
|
embeddedt
|
6fe2674f5b
|
Merge 1.19.2 into 1.19.4
|
2023-08-04 09:44:05 -04:00 |
|
embeddedt
|
c3eb1369ac
|
Merge 1.18 into 1.19.2
|
2023-08-04 09:44:04 -04:00 |
|
embeddedt
|
9c380e52d1
|
Merge 1.16 into 1.18
|
2023-08-04 09:44:03 -04:00 |
|
embeddedt
|
e04b05dcc8
|
Don't return null for models we claim are in the faked model registry
|
2023-08-04 09:42:07 -04:00 |
|
embeddedt
|
c2695b1180
|
Merge 1.19.4 into 1.20
|
2023-08-03 20:04:49 -04:00 |
|
embeddedt
|
d3884d764d
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-03 20:02:55 -04:00 |
|
embeddedt
|
f05d33969f
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-03 20:02:15 -04:00 |
|
embeddedt
|
f225e6cf75
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-03 19:57:15 -04:00 |
|
embeddedt
|
14170ade1f
|
Implement /mfrc and /mfsrc commands to reload configs on client/server respectively
|
2023-08-03 19:45:37 -04:00 |
|