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
embeddedt
c8749940f7
Show log message after reloads are processed
2023-08-03 18:09:57 -04:00
embeddedt
dbff17a1ff
Better fix for config corruption
...
Defer posting of all config reload events to the main thread, and
don't process any until after the launch finishes. This should
hopefully fix some synchronization issues
2023-08-03 18:08:46 -04:00
embeddedt
1989f122c6
Remove locking system for Night Config files
...
This can cause deadlocks if mods themselves are also using their
own internal locks (Sophisticated Backpacks does this on 1.16 by
using a CHM)
This system will be replaced by a command/keybind to manually reload
configs
2023-08-03 17:54:30 -04:00
embeddedt
4972081d8a
Forcefully inject access transformers from mods even if a load error occurs
...
Related: https://github.com/neoforged/NeoForge/issues/43
2023-08-03 17:04:41 -04:00
embeddedt
331ad00758
Merge 1.19.4 into 1.20
2023-08-03 17:01:14 -04:00
embeddedt
b64fefa73c
Merge 1.19.2 into 1.19.4
2023-08-03 17:01:13 -04:00
embeddedt
c5f73c5e26
Merge 1.18 into 1.19.2
2023-08-03 17:01:12 -04:00
embeddedt
eac9edb13a
Fix Forge overriding ResourceKey.equals() with a slower implementation
2023-08-03 16:29:13 -04:00
embeddedt
19593b5574
Merge 1.19.4 into 1.20
2023-08-03 11:27:54 -04:00
embeddedt
89abcdb17c
Merge 1.19.2 into 1.19.4
2023-08-03 11:27:53 -04:00
embeddedt
89c7e58101
Merge 1.18 into 1.19.2
2023-08-03 11:27:52 -04:00
embeddedt
6d53262a9f
Merge 1.16 into 1.18
2023-08-03 11:27:51 -04:00
embeddedt
24792b96cc
Move ModernFix branding to right side of screen
2023-08-03 11:27:32 -04:00
embeddedt
02fd57f9a4
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-08-02 16:31:51 -04:00
embeddedt
f76ca049cc
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-08-02 16:31:07 -04:00
embeddedt
d77946a5ab
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-02 16:23:22 -04:00
embeddedt
0d190a4c80
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-02 16:17:45 -04:00
embeddedt
201db412a4
Rewrite tracking code for game load/world join timing
2023-08-02 16:08:36 -04:00
embeddedt
1d1e7b640a
Call Item.fillItemCategory() on all items when removing creative search trees
...
This fixes obscure issues caused by mods that accidentally rely on that
method to initialize other classes
Resolves https://github.com/Shadows-of-Fire/GatewaysToEternity/issues/29
2023-08-02 09:33:05 -04:00
embeddedt
858325e40d
Merge 1.19.4 into 1.20
2023-07-31 15:34:04 -04:00
embeddedt
c7604672fc
Merge 1.19.2 into 1.19.4
2023-07-31 15:34:03 -04:00
embeddedt
49f9644714
Merge 1.18 into 1.19.2
2023-07-31 15:34:02 -04:00
embeddedt
2bc5b39895
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-31 13:14:25 -04:00
embeddedt
3e4f1ab23a
Improve registry performance with large entry counts
2023-07-31 13:13:39 -04:00
embeddedt
ec2f6e8490
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-07-31 11:21:39 -04:00
embeddedt
472531d1b6
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-31 11:17:33 -04:00
embeddedt
4fe235cdbd
Workaround for mods instantiating PathResourcePack incorrectly
2023-07-31 11:14:38 -04:00
embeddedt
84bd756cdf
Merge 1.19.4 into 1.20
2023-07-30 13:11:12 -04:00
embeddedt
1a2981e5f1
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-07-30 13:09:42 -04:00
embeddedt
cedd9ac79b
Fix merge error
2023-07-30 13:09:32 -04:00
embeddedt
94f7b9295d
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-07-30 12:59:23 -04:00
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
embeddedt
a01cc836c1
Use correct platform name
2023-06-26 14:22:34 -04:00
embeddedt
012ed17208
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-06-26 14:21:19 -04:00
embeddedt
4943702061
Add platform name to hooks
2023-06-26 14:21:07 -04:00
embeddedt
33c0cf33d9
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-06-26 14:14:35 -04:00
embeddedt
60525ad594
Add option to profile launch using Spark
2023-06-26 13:58:12 -04:00
embeddedt
565dfb4b81
Merge 1.19.4 into 1.20
2023-06-22 13:45:27 -04:00
embeddedt
24f31dd92a
Initial version of resource pack caching for 1.19.4+
2023-06-22 13:45:13 -04:00
embeddedt
9bc6b7b0f7
Merge 1.19.4 into 1.20
2023-06-20 14:43:13 -04:00
embeddedt
49bc941dd7
Merge 1.19.2 into 1.19.4
2023-06-20 14:43:12 -04:00
embeddedt
4037124c57
Merge 1.18 into 1.19.2
2023-06-20 14:43:11 -04:00
embeddedt
fc908bb92c
Update config fixer for 1.18
2023-06-20 14:40:49 -04:00
embeddedt
c1c0010126
Merge 1.19.4 into 1.20
2023-06-20 14:34:54 -04:00
embeddedt
9cdeeb4c94
Merge 1.19.2 into 1.19.4
2023-06-20 14:34:53 -04:00
embeddedt
a84fa8ac0c
Merge 1.18 into 1.19.2
2023-06-20 14:34:37 -04:00
embeddedt
6a7d62b38d
Merge 1.16 into 1.18
2023-06-20 14:34:36 -04:00
embeddedt
40be7c9fc1
Add a few missing ClientOnlyMixin annotations
...
Related: #137
2023-06-20 10:43:17 -04:00
embeddedt
c1acdf1bb4
Make config wrapping possible to disable
2023-06-20 09:42:44 -04:00
embeddedt
41b71c5e59
Attempt fix for Engineer's Decor and related crashes
2023-06-19 21:49:45 -04:00
embeddedt
6006026deb
Merge 1.19.4 into 1.20
2023-06-19 20:58:13 -04:00
embeddedt
00b6261a1c
Merge 1.19.2 into 1.19.4
2023-06-19 20:58:13 -04:00
embeddedt
ce9d5f78e2
Merge 1.16 into 1.18
2023-06-19 20:58:11 -04:00
embeddedt
e75aca9236
Merge 1.18 into 1.19.2
2023-06-19 20:58:11 -04:00
embeddedt
aa3fa93a9f
Add framework to load specific mod classes sequentially, preventing deadlocks
2023-06-19 20:57:07 -04:00
embeddedt
683f9fd13b
1.20.1
2023-06-19 20:38:33 -04:00
embeddedt
5d2310bda4
Fix incorrect classname in Valhelsia Structures patch
...
Looks like this was broken during the multiloader refactor
Related: #135
2023-06-19 18:54:26 -04:00
embeddedt
18e1cec611
Merge 1.19.4 into 1.20
2023-06-15 22:14:57 -04:00
embeddedt
4d47ca26db
Fix miscopied patch from Fabric to Forge
2023-06-15 22:14:39 -04:00
embeddedt
42d41eb0f7
Merge 1.19.4 into 1.20
2023-06-14 22:14:23 -04:00
embeddedt
f7037e3ecb
Change cancellation strategy for bakeModels, fixes Balm issues
2023-06-14 22:14:13 -04:00
embeddedt
79c4b1cb27
Re-add Forge support for 1.20
2023-06-08 09:34:41 -04:00
embeddedt
702fe0ba24
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-06-07 11:47:12 -04:00
embeddedt
755bc35d09
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-06-07 11:45:27 -04:00
embeddedt
313981f30e
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-06-06 11:49:01 -04:00
embeddedt
5de87576ca
Ensure CTM's metadataCache is thread-safe
2023-06-06 11:35:02 -04:00
embeddedt
444f5ad446
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-06-02 20:10:53 -04:00
embeddedt
32aa4794d0
Merge remote-tracking branch 'origin/main' into 1.18
2023-06-02 20:09:12 -04:00
embeddedt
db223b62a0
Advancement recursion speedup on Forge, based off Advancements Debug
2023-06-02 12:06:34 -04:00
embeddedt
4a9cd78d1d
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-29 20:39:14 -04:00
embeddedt
d51de3fa55
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-29 10:19:21 -04:00
embeddedt
f1811bbbc6
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-29 10:17:59 -04:00
embeddedt
a7d894cbc2
Disable cache invalidation outside dev
...
Not needed as mod contents shouldn't change (right...)
2023-05-29 10:16:54 -04:00
embeddedt
04f34a00fa
Fix resource pack cache not working as well as it could
2023-05-29 10:15:18 -04:00
embeddedt
f4b2db89ec
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-27 10:28:35 -04:00
embeddedt
5a09f27c6a
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-27 10:28:00 -04:00
embeddedt
74eb8a0619
Split unbaked model load event into load and pre-bake stages
...
Allows mods like Continuity to wrap the model being baked
separately from the model in the cache
2023-05-23 18:50:49 -04:00
embeddedt
bd94b5dd2e
Spotless
2023-05-22 14:40:26 -04:00
embeddedt
31feef398f
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-22 14:24:27 -04:00
embeddedt
d428f9c4c0
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-21 20:57:15 -04:00
embeddedt
f48ed1212b
Move AE2 dynamic resources compat to common module
2023-05-21 20:17:38 -04:00
embeddedt
fc65975252
Fix AE2 mod id
2023-05-21 20:08:17 -04:00
embeddedt
7517c36b36
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-21 19:17:39 -04:00
embeddedt
c2f09fb998
Merge branch 'mod-api'
2023-05-21 15:24:46 -04:00
embeddedt
0d901c6281
Only preserve window position if a non-default width/height was given
...
Fixes #103 (in next release)
2023-05-20 16:35:56 -04:00
embeddedt
119f9ec6dd
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-16 11:11:00 -04:00
embeddedt
3a24d094c9
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-16 11:01:46 -04:00
embeddedt
dba6e1210e
Fix classloading hack not working anymore
2023-05-16 10:17:12 -04:00
embeddedt
98def7b879
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-15 21:23:01 -04:00
embeddedt
6f8815200e
Move search tree replacement to common module
2023-05-15 21:05:01 -04:00
embeddedt
4a0b633970
Fix workaround message printing twice
2023-05-15 21:04:01 -04:00
embeddedt
32c1baf887
Move search tree replacement to common, support both modloaders
2023-05-15 20:23:37 -04:00
embeddedt
d2d5f81782
Bump required Forge version, drop datapack reload patch
...
https://github.com/MinecraftForge/MinecraftForge/pull/9454 has been
merged upstream
2023-05-15 19:43:31 -04:00
embeddedt
04c89a26ed
Workaround for Forge issue #9505
2023-05-15 13:28:40 -04:00
embeddedt
b1fb365f22
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-15 11:14:20 -04:00
embeddedt
ee3f29c569
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-15 11:09:39 -04:00
embeddedt
f599acda6b
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-15 11:07:31 -04:00
embeddedt
c1c9c02ff4
Remove blockstate compression
2023-05-14 20:27:37 -04:00
embeddedt
b4ffe68adb
Replace Forge dynamic model bake event with modloader-independent custom solution
2023-05-13 16:37:20 -04:00
embeddedt
ec10f36839
Fix compile errors
2023-05-11 11:27:10 -04:00
embeddedt
9c421218b8
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-11 10:51:34 -04:00
embeddedt
2de8f02814
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-11 10:39:33 -04:00
embeddedt
9efbc47f78
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-11 10:37:59 -04:00
embeddedt
d427c5e050
Invalidate pack caches directly instead of iterating resource manager pack list
2023-05-10 18:12:32 -04:00
embeddedt
dffb89390e
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-10 18:07:50 -04:00
embeddedt
d97da8fe4c
Fix resource pack cache not invalidating on F3+T
2023-05-10 17:02:15 -04:00
embeddedt
74dae9316e
Update patch for 1.19
2023-05-10 15:41:38 -04:00
embeddedt
acdd18f8df
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-10 15:39:22 -04:00
embeddedt
14b4ea7eb1
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-10 15:39:11 -04:00
embeddedt
b5c08b996f
Add button to title screen for datagenning inside runClient
2023-05-10 15:29:46 -04:00
embeddedt
c63252946a
Fix JEI creative search tree replacement not working
...
Fixes #86
2023-05-08 09:44:44 -04:00
embeddedt
7eb702545b
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-06 11:46:15 -04:00
embeddedt
a139b273c9
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-06 11:45:06 -04:00
embeddedt
48f9ad86f0
Prevent immediate crash when TextureAtlasSprite constructor throws
...
Fixes #79
2023-05-06 11:21:08 -04:00
embeddedt
8996d4e09b
Remove entity renderer mixin as it's not needed on 1.18
2023-05-05 12:03:22 -04:00
embeddedt
3b4354fbe5
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-05 12:03:15 -04:00
embeddedt
9677eb6c02
Provide more debug information if entity renderer is missing
2023-05-05 12:02:52 -04:00
embeddedt
95ee0c60ca
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-05 10:53:30 -04:00
embeddedt
85442810f3
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-04 19:56:21 -04:00
embeddedt
da100bea60
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-04 19:54:35 -04:00
embeddedt
b077b53132
Bump maximum models in memory from 1k to 10k
2023-05-04 19:53:39 -04:00
embeddedt
170da33755
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-04 11:47:58 -04:00
embeddedt
912a8f9f2c
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-04 11:17:44 -04:00
embeddedt
7e7f336ccb
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-04 11:17:23 -04:00
embeddedt
4796af2094
Fix DFU blaster making DFU too slow
2023-05-04 11:16:16 -04:00
embeddedt
74cf6ef598
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-02 22:02:41 -04:00
embeddedt
3ad3da3680
Fix resource cache not being generated on Forge
2023-05-02 21:03:40 -04:00
embeddedt
2aacadaa82
Fix incorrectly mapped mixin
2023-05-02 20:58:52 -04:00
embeddedt
ae33070507
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-02 20:24:48 -04:00
embeddedt
e1b29f2985
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-02 20:20:12 -04:00
embeddedt
215e8da87d
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-02 20:10:46 -04:00
embeddedt
2772351a3d
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-02 20:10:40 -04:00
embeddedt
243bf03440
Fix spotless
2023-05-02 20:09:07 -04:00
embeddedt
6a85047132
Add structure upgrading command
2023-05-02 20:04:54 -04:00
