embeddedt
|
32e246885b
|
Merge 1.19.4 into 1.20
|
2023-08-08 18:17:36 -04:00 |
|
embeddedt
|
824deddb46
|
Merge 1.19.2 into 1.19.4
|
2023-08-08 18:17:35 -04:00 |
|
embeddedt
|
866fcebf2e
|
Merge 1.18 into 1.19.2
|
2023-08-08 18:17:33 -04:00 |
|
embeddedt
|
27c7400f34
|
Merge 1.16 into 1.18
|
2023-08-08 18:17:32 -04:00 |
|
embeddedt
|
c1182944f3
|
Redirect fetchChoiceType directly in vanilla code instead of fully disabling it
Should address #204
|
2023-08-08 18:17:01 -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
|
4ed5e8a434
|
Update CTM version
|
2023-08-07 11:22:29 -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
|
823fa259e9
|
Merge 1.19.4 into 1.20
|
2023-08-05 19:43:20 -04:00 |
|
embeddedt
|
47491fe749
|
Merge 1.18 into 1.19.2
|
2023-08-05 19:43:19 -04:00 |
|
embeddedt
|
c81327fdb5
|
Merge 1.19.2 into 1.19.4
|
2023-08-05 19:43:19 -04:00 |
|
embeddedt
|
a82b728d98
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-05 19:43:11 -04:00 |
|
embeddedt
|
795aca19e0
|
Don't enable blast_search_trees with REI present on 1.16
|
2023-08-05 19:42:34 -04:00 |
|
embeddedt
|
ec5b92dd7a
|
Don't trigger full blockstate cache rebuilds when requesting fluid
This causes mods to prematurely rebuild the whole cache, which
is not what we want
|
2023-08-05 19:38:45 -04:00 |
|
embeddedt
|
8a0ff999bd
|
Merge 1.19.4 into 1.20
|
2023-08-05 12:52:06 -04:00 |
|
embeddedt
|
7b18bcafd6
|
Merge 1.19.2 into 1.19.4
|
2023-08-05 12:52:05 -04:00 |
|
embeddedt
|
1931101545
|
Merge 1.18 into 1.19.2
|
2023-08-05 12:52:04 -04:00 |
|
embeddedt
|
ae3eab8320
|
Merge 1.16 into 1.18
|
2023-08-05 12:52:03 -04:00 |
|
embeddedt
|
abb8cbd23f
|
Make sure missing model never becomes null
|
2023-08-05 12:26:18 -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
|
605058522e
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-05 12:11:30 -04:00 |
|
embeddedt
|
431231c4ee
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-05 12:10:53 -04:00 |
|
embeddedt
|
41ca9fc251
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-05 12:07:53 -04:00 |
|
embeddedt
|
371e5119f1
|
Never return a non-null model if it was top level in vanilla
|
2023-08-05 12:07:21 -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 |
|