embeddedt
|
59235e6a21
|
Fix spotless
|
2023-10-29 11:44:25 -04:00 |
|
embeddedt
|
09490df85d
|
Fix compile errors
|
2023-10-29 11:41:35 -04:00 |
|
embeddedt
|
a677f6d571
|
Merge 1.19.2 into 1.20
|
2023-10-29 11:37:49 -04:00 |
|
embeddedt
|
d4f09f6ff9
|
Merge 1.18 into 1.19.2
|
2023-10-29 11:36:16 -04:00 |
|
embeddedt
|
fccbae33db
|
Merge 1.16 into 1.18
|
2023-10-29 11:36:15 -04:00 |
|
embeddedt
|
621ecf6b3e
|
Use copy-on-write map for permanent overrides
|
2023-10-29 11:35:46 -04:00 |
|
embeddedt
|
7054c16f6c
|
Merge 1.19.2 into 1.20
|
2023-10-25 17:18:45 -04:00 |
|
embeddedt
|
b7b510f807
|
Merge 1.18 into 1.19.2
|
2023-10-25 17:18:43 -04:00 |
|
embeddedt
|
4054bd8a23
|
Merge 1.16 into 1.18
|
2023-10-25 17:18:42 -04:00 |
|
embeddedt
|
89dab59980
|
Revert "Change permanentOverrides to ConcurrentHashMap"
This reverts commit a5b5733965.
We require the ability to store null values in the map for now
|
2023-10-25 17:17:52 -04:00 |
|
embeddedt
|
735a626cf3
|
Merge 1.19.2 into 1.20
|
2023-10-24 12:45:39 -04:00 |
|
embeddedt
|
54c7dbd16e
|
Merge 1.18 into 1.19.2
|
2023-10-24 12:45:37 -04:00 |
|
embeddedt
|
c5a5b01bfb
|
Merge 1.16 into 1.18
|
2023-10-24 12:45:35 -04:00 |
|
embeddedt
|
a5b5733965
|
Change permanentOverrides to ConcurrentHashMap
Should help address thread contention noted while profiling
|
2023-10-14 13:24:26 -04:00 |
|
embeddedt
|
e537cbe29a
|
Merge 1.19.2 into 1.20
|
2023-10-07 18:47:10 -04:00 |
|
embeddedt
|
b1e91686da
|
Merge 1.18 into 1.19.2
|
2023-10-07 18:47:09 -04:00 |
|
embeddedt
|
5007c5e286
|
Merge 1.16 into 1.18
|
2023-10-07 18:47:08 -04:00 |
|
embeddedt
|
bf6979e45b
|
Cleanup dynamic sounds patch, bump eviction time to 5 minutes
|
2023-10-07 18:44:33 -04:00 |
|
Phoenix-Starlight
|
803aaba204
|
Dynamic sound unloading (#234)
|
2023-10-07 18:41:52 -04:00 |
|
embeddedt
|
7faa29e84b
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-08-18 14:17:00 -04:00 |
|
embeddedt
|
3acaa1dd49
|
Merge 1.18 into 1.19.2
|
2023-08-16 08:54:15 -04:00 |
|
embeddedt
|
2e8b11de93
|
Merge 1.16 into 1.18
|
2023-08-16 08:54:14 -04:00 |
|
embeddedt
|
2629cd484a
|
Add runes/ to legacy texture folder list
|
2023-08-16 08:48:30 -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
|
1e77cccf5a
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-08-11 17:00:38 -04:00 |
|
embeddedt
|
d92e48e1aa
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-08-11 16:53:00 -04:00 |
|
embeddedt
|
0c82223248
|
Fix Custom Machinery models
|
2023-08-11 16:44:51 -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
|
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
|
371e5119f1
|
Never return a non-null model if it was top level in vanilla
|
2023-08-05 12:07:21 -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
|
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
|
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
|
d1a1fce7e1
|
Improve reliability of ItemOverrideBakedModel if not replaced
|
2023-07-19 17:08:23 -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
|
12ec9b08bf
|
Update ItemOverrideBakedModel for 1.19
|
2023-07-19 12:15:29 -04:00 |
|
embeddedt
|
3fed2ef08d
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-19 12:09:39 -04:00 |
|
embeddedt
|
6fda7393b3
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-19 11:51:00 -04:00 |
|