embeddedt
|
78ff767b9e
|
Merge 1.18 into 1.19.2
|
2023-07-30 12:57:40 -04:00 |
|
embeddedt
|
762728c0a6
|
Merge 1.16 into 1.18
|
2023-07-30 12:57:39 -04:00 |
|
embeddedt
|
377f59847e
|
Skip dynamic resources single blockstate optimization when outside world
This should improve performance of model baking events during launch
|
2023-07-30 12:57:11 -04:00 |
|
embeddedt
|
92a204c253
|
Make FlagManager patch handle both impls of CoFH Core
|
2023-07-30 12:57:11 -04:00 |
|
embeddedt
|
4e3dc99479
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-07-27 16:49:05 -04:00 |
|
embeddedt
|
e45acac6b6
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-27 16:48:48 -04:00 |
|
embeddedt
|
3456b8cf23
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-27 16:41:07 -04:00 |
|
embeddedt
|
f3f66e1873
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-27 16:35:06 -04:00 |
|
embeddedt
|
13cc103be2
|
Switch to compile-only Arch Transformer
|
2023-07-27 16:26:16 -04:00 |
|
embeddedt
|
2663f5e3f4
|
Use Forge resource finder for directories instead of MF finder
|
2023-07-27 13:59:13 -04:00 |
|
embeddedt
|
7a648f0c5e
|
Merge 1.19.4 into 1.20
|
2023-07-26 22:03:11 -04:00 |
|
embeddedt
|
f1fa3a4c9c
|
Merge 1.19.2 into 1.19.4
|
2023-07-26 22:03:10 -04:00 |
|
embeddedt
|
213bcd1b2a
|
Fix getResource("") failing to return valid resource
Fixes #187
|
2023-07-26 22:02:21 -04:00 |
|
embeddedt
|
33e437f865
|
Hotfix for CoFH crash
Apparently BooleanSupplier is *not* used
|
2023-07-26 21:29:33 -04:00 |
|
embeddedt
|
c41728b97c
|
Merge 1.19.4 into 1.20
|
2023-07-24 16:05:01 -04:00 |
|
embeddedt
|
512ed02db2
|
Merge 1.19.2 into 1.19.4
|
2023-07-24 16:05:00 -04:00 |
|
embeddedt
|
5babe993df
|
Merge 1.18 into 1.19.2
|
2023-07-24 16:04:32 -04:00 |
|
embeddedt
|
6ae1992329
|
Merge 1.16 into 1.18
|
2023-07-24 16:04:31 -04:00 |
|
embeddedt
|
7f44701670
|
Display ModernFix version in early part of log
|
2023-07-24 16:03:29 -04:00 |
|
embeddedt
|
5338cca79b
|
Adjust patch for 1.18 FlagManager
|
2023-07-24 14:23:28 -04:00 |
|
embeddedt
|
bb5e71c651
|
Remove second config warning, now redundant
|
2023-07-23 20:37:57 -04:00 |
|
embeddedt
|
437eb9f793
|
Merge 1.19.4 into 1.20
|
2023-07-23 19:29:31 -04:00 |
|
embeddedt
|
23f5af93ce
|
Merge 1.19.2 into 1.19.4
|
2023-07-23 19:29:30 -04:00 |
|
embeddedt
|
55f6e86a56
|
Merge 1.18 into 1.19.2
|
2023-07-23 19:29:29 -04:00 |
|
embeddedt
|
aa50c4466e
|
Fix memory leak in Blueprint
Implements https://github.com/team-abnormals/blueprint/pull/195, which
is still not released on 1.19.2, and may never be released on 1.18.2
|
2023-07-23 19:28:16 -04:00 |
|
embeddedt
|
1889ef2d8c
|
Merge 1.19.4 into 1.20
|
2023-07-23 19:23:27 -04:00 |
|
embeddedt
|
3a96f63798
|
Merge 1.19.2 into 1.19.4
|
2023-07-23 19:23:26 -04:00 |
|
embeddedt
|
18db311712
|
Merge 1.18 into 1.19.2
|
2023-07-23 19:23:26 -04:00 |
|
embeddedt
|
000e9746ba
|
Merge 1.16 into 1.18
|
2023-07-23 19:23:25 -04:00 |
|
embeddedt
|
7fa6c45f07
|
Fix dragging in ModLoader too early
|
2023-07-23 19:21:00 -04:00 |
|
embeddedt
|
90f6f6d68d
|
Merge 1.19.4 into 1.20
|
2023-07-23 18:33:34 -04:00 |
|
embeddedt
|
b24f82d257
|
Merge 1.19.2 into 1.19.4
|
2023-07-23 18:33:33 -04:00 |
|
embeddedt
|
bbcc58f103
|
Merge 1.18 into 1.19.2
|
2023-07-23 18:33:26 -04:00 |
|
embeddedt
|
0c3cade976
|
Merge 1.16 into 1.18
|
2023-07-23 18:33:25 -04:00 |
|
embeddedt
|
2246b79a85
|
Fix mod mixins not being disabled if there is an early load error
|
2023-07-23 18:32:50 -04:00 |
|
embeddedt
|
4cdf5e6b3d
|
Fix missing ClientOnly annotations
|
2023-07-22 15:35:36 -04:00 |
|
embeddedt
|
821f87b880
|
Merge 1.19.4 into 1.20
|
2023-07-22 11:22:05 -04:00 |
|
embeddedt
|
ecbcc6dcaa
|
Merge 1.19.2 into 1.19.4
|
2023-07-22 11:22:04 -04:00 |
|
embeddedt
|
cd9adbdf7e
|
Merge 1.18 into 1.19.2
|
2023-07-22 11:22:03 -04:00 |
|
embeddedt
|
6efa7f3c5b
|
Merge 1.16 into 1.18
|
2023-07-22 11:22:02 -04:00 |
|
embeddedt
|
48409fc572
|
Fix concurrency issue in CoFH FlagManager
Related: #173
|
2023-07-22 11:19:20 -04:00 |
|
embeddedt
|
373a10f12c
|
Fix crash with dynamic resources if mods depend on themselves
|
2023-07-22 11:06:11 -04:00 |
|
embeddedt
|
18cec4f88d
|
Fix NPE from config fixers
Related: #174
|
2023-07-22 09:56:25 -04:00 |
|
embeddedt
|
4031b65099
|
Merge 1.19.4 into 1.20
|
2023-07-21 11:15:22 -04:00 |
|
embeddedt
|
bc09210ada
|
Merge 1.19.2 into 1.19.4
|
2023-07-21 11:15:22 -04:00 |
|
embeddedt
|
affb24fc11
|
Merge 1.18 into 1.19.2
|
2023-07-21 11:15:21 -04:00 |
|
embeddedt
|
b5870b3ae4
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-21 11:15:11 -04:00 |
|
embeddedt
|
edb3da4f74
|
Fix deadlock with the config fixers by moving all locking to one object
|
2023-07-21 11:13:56 -04:00 |
|
embeddedt
|
c6eb703648
|
Merge 1.19.4 into 1.20
|
2023-07-20 21:35:15 -04:00 |
|
embeddedt
|
24598ac463
|
Merge 1.19.2 into 1.19.4
|
2023-07-20 21:35:14 -04:00 |
|
embeddedt
|
b98377d5cb
|
Merge 1.16 into 1.18
|
2023-07-20 21:35:13 -04:00 |
|
embeddedt
|
08bf8ecc89
|
Merge 1.18 into 1.19.2
|
2023-07-20 21:35:13 -04:00 |
|
embeddedt
|
7dbb926787
|
Forceload RenderType/RenderStateShard on the main thread during startup
Fixes launch deadlock with Registrate/Quark
|
2023-07-20 21:34:04 -04:00 |
|
embeddedt
|
b7a1f16a9d
|
Merge 1.19.4 into 1.20
|
2023-07-19 17:34:39 -04:00 |
|
embeddedt
|
5994edcf17
|
Merge 1.19.2 into 1.19.4
|
2023-07-19 17:34:38 -04:00 |
|
embeddedt
|
754e7741c7
|
Merge 1.18 into 1.19.2
|
2023-07-19 17:32:36 -04:00 |
|
embeddedt
|
4f428b0e5d
|
Merge 1.16 into 1.18
|
2023-07-19 17:32:18 -04:00 |
|
embeddedt
|
ad60b1dec6
|
Fix timing of dynamic baked model registry handoff
|
2023-07-19 17:31:24 -04:00 |
|
embeddedt
|
9eed139cc9
|
Merge 1.19.4 into 1.20
|
2023-07-19 12:32:40 -04:00 |
|
embeddedt
|
ab55dde534
|
Merge 1.19.2 into 1.19.4
|
2023-07-19 12:32:39 -04:00 |
|
embeddedt
|
0bc372bf86
|
Merge 1.18 into 1.19.2
|
2023-07-19 12:32:38 -04:00 |
|
embeddedt
|
4c737e315e
|
Merge 1.16 into 1.18
|
2023-07-19 12:32:37 -04:00 |
|
embeddedt
|
d8e515272a
|
Even more resilient Night Config fix
|
2023-07-19 12:32:26 -04:00 |
|
embeddedt
|
30f483245c
|
Merge 1.19.4 into 1.20
|
2023-07-19 12:20:52 -04:00 |
|
embeddedt
|
8527594b3b
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-19 12:17:13 -04:00 |
|
embeddedt
|
3fed2ef08d
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-19 12:09:39 -04:00 |
|
embeddedt
|
d9b9586af3
|
Update item override patch to 1.18
|
2023-07-19 12:08:15 -04:00 |
|
embeddedt
|
5b716dcdf2
|
Merge 1.19.4 into 1.20
|
2023-07-18 13:57:31 -04:00 |
|
embeddedt
|
e88d8bb7b7
|
Merge 1.19.2 into 1.19.4
|
2023-07-18 13:57:30 -04:00 |
|
embeddedt
|
94433b0107
|
Merge 1.18 into 1.19.2
|
2023-07-18 13:57:29 -04:00 |
|
embeddedt
|
8ac43d5617
|
Fix incorrect import
|
2023-07-18 13:51:21 -04:00 |
|
embeddedt
|
90e63341bd
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-18 13:48:50 -04:00 |
|
embeddedt
|
36eb73b28e
|
Generify config patch to also work with Night Config Fixes mod
|
2023-07-18 13:48:20 -04:00 |
|
embeddedt
|
b499a054b9
|
Possible fix for the elusive Forge config corruption bug
Block file watcher from proceeding until config is done saving
Related: https://github.com/MinecraftForge/MinecraftForge/issues/9122
|
2023-07-18 12:44:11 -04:00 |
|
embeddedt
|
e34beb5775
|
Merge 1.19.4 into 1.20
|
2023-07-17 16:09:27 -04:00 |
|
embeddedt
|
95c3044a40
|
Merge 1.19.2 into 1.19.4
|
2023-07-17 16:09:26 -04:00 |
|
embeddedt
|
ab7c982589
|
Merge 1.18 into 1.19.2
|
2023-07-17 16:08:28 -04:00 |
|
embeddedt
|
92643a244e
|
Merge 1.16 into 1.18
|
2023-07-17 16:08:27 -04:00 |
|
embeddedt
|
c3e3dff805
|
Return all possible states for model if given location is not an MRL
|
2023-07-17 16:07:51 -04:00 |
|
embeddedt
|
5ec070843d
|
Use CachedResourcePath in resource finder
Reduces memory usage by ~50%
|
2023-07-17 13:42:50 -04:00 |
|
embeddedt
|
9fbb97d0fa
|
Use Guava multimap for resource finder instead of custom "multi"map
|
2023-07-17 13:20:46 -04:00 |
|
embeddedt
|
9a966cfad9
|
Merge 1.19.4 into 1.20
|
2023-07-10 20:28:31 -04:00 |
|
embeddedt
|
e235e07bb2
|
Merge 1.19.2 into 1.19.4
|
2023-07-10 20:28:30 -04:00 |
|
embeddedt
|
1ba2a1fae0
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-10 20:28:20 -04:00 |
|
embeddedt
|
e87c85b75c
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-10 20:24:38 -04:00 |
|
embeddedt
|
bd351197b2
|
Backport https://github.com/MinecraftForge/MinecraftForge/pull/8959 to 1.18
|
2023-07-10 20:23:54 -04:00 |
|
embeddedt
|
4ea7b864a8
|
Add facility to hide mixin options outside dev
|
2023-07-10 19:00:37 -04:00 |
|
embeddedt
|
b3f00a0681
|
Merge 1.19.4 into 1.20
|
2023-07-09 20:41:08 -04:00 |
|
embeddedt
|
8cc5785e86
|
Port dynres change to 1.19.4+
|
2023-07-09 20:38:35 -04:00 |
|
embeddedt
|
827d09289d
|
Merge 1.19.4 into 1.20
|
2023-07-09 20:37:25 -04:00 |
|
embeddedt
|
0ce00531a6
|
Merge 1.19.2 into 1.19.4
|
2023-07-09 20:37:24 -04:00 |
|
embeddedt
|
4962d855af
|
Merge 1.18 into 1.19.2
|
2023-07-09 20:37:23 -04:00 |
|
embeddedt
|
ef47883262
|
Merge 1.16 into 1.18
|
2023-07-09 20:37:22 -04:00 |
|
embeddedt
|
dfdbf8544a
|
Guard against early parent resolution failing
|
2023-07-09 20:36:57 -04:00 |
|
embeddedt
|
7e25e31d33
|
Merge 1.19.4 into 1.20
|
2023-07-09 20:35:41 -04:00 |
|
embeddedt
|
a1d56e2921
|
Merge 1.19.2 into 1.19.4
|
2023-07-09 20:35:41 -04:00 |
|
embeddedt
|
a34ac84e00
|
Merge 1.18 into 1.19.2
|
2023-07-09 20:35:40 -04:00 |
|
embeddedt
|
e248e2966a
|
Merge 1.16 into 1.18
|
2023-07-09 20:35:39 -04:00 |
|
embeddedt
|
49b31c347b
|
Resolve parents in getModel rather than at bake time
Fixes EBE chests
|
2023-07-09 20:35:31 -04:00 |
|
embeddedt
|
98663fa416
|
Never replace search tree on 1.16 with REI present
|
2023-07-07 12:39:26 -04:00 |
|
embeddedt
|
79219d286f
|
Fix issue with anonymous classes in mixin
Related: #151
|
2023-07-07 12:34:36 -04:00 |
|
embeddedt
|
e65727937c
|
Merge 1.19.4 into 1.20
|
2023-07-06 22:10:26 -04:00 |
|
embeddedt
|
a1f3cb9270
|
Merge 1.19.2 into 1.19.4
|
2023-07-06 22:10:25 -04:00 |
|
embeddedt
|
3b85b20020
|
Merge 1.18 into 1.19.2
|
2023-07-06 22:10:24 -04:00 |
|
embeddedt
|
36a1b6bb93
|
Merge 1.16 into 1.18
|
2023-07-06 22:10:24 -04:00 |
|
embeddedt
|
8f896f065c
|
Limit registry wrapping to known bad mods to avoid performance issues
|
2023-07-06 22:05:27 -04:00 |
|
embeddedt
|
5e7421ab24
|
Merge 1.19.4 into 1.20
|
2023-07-06 21:29:26 -04:00 |
|
embeddedt
|
9b93a28ddb
|
Merge 1.18 into 1.19.2
|
2023-07-06 21:28:56 -04:00 |
|
embeddedt
|
ad798850c6
|
Merge 1.16 into 1.18
|
2023-07-06 21:28:55 -04:00 |
|
embeddedt
|
8bc0946977
|
Fix remapping issue on newer MC versions
|
2023-07-06 21:28:41 -04:00 |
|
embeddedt
|
92264ed37e
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-06 21:27:43 -04:00 |
|
embeddedt
|
9ce029b35d
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-06 21:24:11 -04:00 |
|
embeddedt
|
127f091728
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-06 21:14:44 -04:00 |
|
embeddedt
|
16d317af97
|
Only provide each mod its own model list in ModelBakeEvent
|
2023-07-06 21:12:59 -04:00 |
|
embeddedt
|
1b6880ed9f
|
Make modelRegistry.keySet() more accurate on Forge when dynamic resources is on
|
2023-07-06 20:43:35 -04:00 |
|
embeddedt
|
ba7bda0b04
|
Remove LazyDFU change for 1.20
|
2023-07-05 15:08:31 -04:00 |
|
embeddedt
|
c7787d1390
|
Merge 1.19.2 into 1.19.4
|
2023-07-05 15:04:49 -04:00 |
|
embeddedt
|
a7d0d4892f
|
Merge 1.19.4 into 1.20
|
2023-07-05 15:04:49 -04:00 |
|
embeddedt
|
463f1c540e
|
Make sure LazyDFU warning is not shown if FML disables DFU already
|
2023-07-05 15:04:29 -04:00 |
|
embeddedt
|
079c348948
|
Merge 1.19.4 into 1.20
|
2023-07-05 14:52:56 -04:00 |
|
embeddedt
|
c50388a358
|
Merge 1.19.2 into 1.19.4
|
2023-07-05 14:52:55 -04:00 |
|
embeddedt
|
b637d79c50
|
Merge 1.18 into 1.19.2
|
2023-07-05 14:52:54 -04:00 |
|
embeddedt
|
5a6ab4f781
|
Fix missed import during merge
|
2023-07-05 14:51:16 -04:00 |
|
embeddedt
|
2a16229056
|
Merge 1.19.4 into 1.20
|
2023-07-05 14:50:28 -04:00 |
|
embeddedt
|
7652a1dbc5
|
Merge 1.19.2 into 1.19.4
|
2023-07-05 14:50:07 -04:00 |
|
embeddedt
|
6d4071f42c
|
Merge 1.18 into 1.19.2
|
2023-07-05 14:50:05 -04:00 |
|
embeddedt
|
6cd49334d7
|
Merge 1.16 into 1.18
|
2023-07-05 14:47:30 -04:00 |
|
embeddedt
|
095b9c3277
|
Revamp mod warning system, also warn about FerriteCore missing
|
2023-07-05 14:47:17 -04:00 |
|
embeddedt
|
7632647e1d
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-07-05 12:45:02 -04:00 |
|
embeddedt
|
41a56fba20
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-05 12:35:41 -04:00 |
|
embeddedt
|
1600dc4f84
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-05 12:26:14 -04:00 |
|
embeddedt
|
46cff62796
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-05 12:18:00 -04:00 |
|
embeddedt
|
0a2601257c
|
Fix dynamic resources losing nested model loads sometimes
|
2023-07-05 12:04:10 -04:00 |
|
embeddedt
|
c73cb8115e
|
Fix mixin crash outside dev
|
2023-07-05 11:24:04 -04:00 |
|
embeddedt
|
3237de7e33
|
Merge 1.19.4 into 1.20
|
2023-07-03 14:59:21 -04:00 |
|
embeddedt
|
37d6f477c4
|
Merge 1.19.2 into 1.19.4
|
2023-07-03 14:58:45 -04:00 |
|
embeddedt
|
0f90f53f53
|
Merge 1.18 into 1.19.2
|
2023-07-03 14:58:44 -04:00 |
|
embeddedt
|
9d5953c9f5
|
Merge 1.16 into 1.18
|
2023-07-03 14:58:06 -04:00 |
|
embeddedt
|
3541019ee0
|
Modify entity loading semantics on Forge to allow EntityJoinWorldEvent handlers to load chunks
|
2023-07-03 12:26:57 -04:00 |
|
embeddedt
|
ace3975156
|
Make datapack reload exception silencers not required
|
2023-07-02 22:14:32 -04:00 |
|
embeddedt
|
90adb1c627
|
Reduce Twilight Forest structure lag
Related: #147
|
2023-07-01 19:01:10 -04:00 |
|
embeddedt
|
922d0f26e1
|
Use same merge mode as default Spark
|
2023-06-27 11:01:17 -04:00 |
|
embeddedt
|
54f55ee257
|
Merge 1.19.4 into 1.20
|
2023-06-26 21:26:28 -04:00 |
|
embeddedt
|
84b08ef64a
|
Merge 1.19.2 into 1.19.4
|
2023-06-26 21:26:27 -04:00 |
|
embeddedt
|
bd3a9eb345
|
Merge 1.18 into 1.19.2
|
2023-06-26 21:26:26 -04:00 |
|
embeddedt
|
a937ccb07c
|
Merge 1.16 into 1.18
|
2023-06-26 21:26:01 -04:00 |
|
embeddedt
|
58eaf44d89
|
Make mixin info clearing work on Fabric
|
2023-06-26 21:15:19 -04:00 |
|
embeddedt
|
8e467e8239
|
Merge remote-tracking branch 'origin/1.19.4' into 1.20
|
2023-06-26 14:33:26 -04:00 |
|
embeddedt
|
04c6ea2e66
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-06-26 14:33:12 -04:00 |
|
embeddedt
|
b6182b4913
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-06-26 14:30:23 -04:00 |
|