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
|
08bf8ecc89
|
Merge 1.18 into 1.19.2
|
2023-07-20 21:35:13 -04:00 |
|
embeddedt
|
b98377d5cb
|
Merge 1.16 into 1.18
|
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 |
|