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
|
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
|
6eddbd1ecf
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-10 11:45:41 -04:00 |
|
embeddedt
|
6bda05a5fc
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-10 11:44:10 -04:00 |
|
embeddedt
|
1f16fc0204
|
Move iteration later in texture atlas patch
|
2023-05-10 11:42:16 -04:00 |
|
embeddedt
|
8c278d6555
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-10 09:56:43 -04:00 |
|
embeddedt
|
bc493d624f
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-10 09:56:23 -04:00 |
|
embeddedt
|
bcb33a1018
|
Shorten structure hashes to fix issues on Windows
|
2023-05-10 09:54:14 -04:00 |
|
embeddedt
|
03abdfdc49
|
Optimize server thread aliveness check
|
2023-05-09 16:52:10 -04:00 |
|
embeddedt
|
ed65d5da44
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 19:20:43 -04:00 |
|
embeddedt
|
b13d0a222b
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 19:20:00 -04:00 |
|
embeddedt
|
d33ebd69e8
|
Fix texture reload failing on second try
|
2023-05-08 19:17:00 -04:00 |
|
embeddedt
|
9879420d31
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 16:39:53 -04:00 |
|
embeddedt
|
1639f4297e
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 16:39:38 -04:00 |
|
embeddedt
|
9e44e00e70
|
Fix Continuity emissives
|
2023-05-08 16:39:01 -04:00 |
|
embeddedt
|
33f689ba9a
|
Make RenderType EqualsStrategy more predictable
|
2023-05-08 16:15:15 -04:00 |
|
embeddedt
|
fe7357bca2
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 15:50:11 -04:00 |
|
embeddedt
|
3e17d24250
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 15:50:02 -04:00 |
|
embeddedt
|
cd2f289ea8
|
Disable faster texture loading when Stitch is present
|
2023-05-08 15:49:47 -04:00 |
|
embeddedt
|
28bbb79e60
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 15:38:49 -04:00 |
|
embeddedt
|
6c896c36bf
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 15:38:30 -04:00 |
|
embeddedt
|
5ee4c636e7
|
Adjust faster texture loading for FAPI compat
|
2023-05-08 15:38:16 -04:00 |
|
embeddedt
|
c4ee1dd522
|
Update incompatible mod disabling list
|
2023-05-08 15:06:15 -04:00 |
|
embeddedt
|
985b5a68fe
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 14:24:27 -04:00 |
|
embeddedt
|
f6bcb8d1ab
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 14:24:22 -04:00 |
|
embeddedt
|
833fdc9ae5
|
Minor optimization when turning MRL into blockstate list
|
2023-05-08 14:22:50 -04:00 |
|
embeddedt
|
4a47ed7f43
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 14:11:15 -04:00 |
|
embeddedt
|
992269034d
|
Rewrite Fabric dynamic model loader to not load all models at startup
|
2023-05-08 14:10:54 -04:00 |
|
embeddedt
|
b89e7639cd
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 10:42:36 -04:00 |
|
embeddedt
|
c8c7d3ef2e
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 10:42:28 -04:00 |
|
embeddedt
|
9e7c82a303
|
Disable datapack_reload_exceptions if Cyanide is installed as it overlaps
|
2023-05-08 10:41:53 -04:00 |
|
embeddedt
|
1760041e56
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 10:18:59 -04:00 |
|
embeddedt
|
4239bb325d
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 10:18:33 -04:00 |
|
embeddedt
|
b955f17fbd
|
Do resource cache generation on-thread, but lazily
Apparently ForkJoinPools can deadlock even though they are not
supposed to
|
2023-05-08 10:17:24 -04:00 |
|
embeddedt
|
8e4bbeff28
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 09:59:20 -04:00 |
|
embeddedt
|
cc9e7289c6
|
Fix compile error
|
2023-05-08 09:59:05 -04:00 |
|
embeddedt
|
6a8c7c10a6
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 09:58:29 -04:00 |
|
embeddedt
|
2f8f47ae3e
|
Ensure the context class loader is set for the resource reload executors
|
2023-05-08 09:57:53 -04:00 |
|
embeddedt
|
60140bdc1e
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 09:25:55 -04:00 |
|
embeddedt
|
558ced7497
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 09:25:51 -04:00 |
|
embeddedt
|
d8d76c00c7
|
Hotfix for another potential race condition
|
2023-05-08 09:25:40 -04:00 |
|
embeddedt
|
403e820f55
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 09:05:14 -04:00 |
|
embeddedt
|
d681fbd507
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 09:05:00 -04:00 |
|
embeddedt
|
530fb5f796
|
Hotfix for potential resource reload race condition
|
2023-05-08 09:04:43 -04:00 |
|
embeddedt
|
bcb1f5db6c
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-07 21:45:23 -04:00 |
|
embeddedt
|
20b85f7567
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-07 21:45:18 -04:00 |
|
embeddedt
|
387e48cca8
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-07 21:44:31 -04:00 |
|
embeddedt
|
43c1ed7029
|
Disable faster item rendering by default until its tested more
|
2023-05-07 21:39:25 -04:00 |
|
embeddedt
|
ad0c6b7a55
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-07 21:15:35 -04:00 |
|
embeddedt
|
604c3687ef
|
Optimize block item rendering as well
|
2023-05-07 21:07:56 -04:00 |
|
embeddedt
|
b55129a8ca
|
Generate resource cache using resource reload workers
|
2023-05-07 18:08:00 -04:00 |
|
embeddedt
|
92c136d4c3
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-07 14:40:28 -04:00 |
|
embeddedt
|
321c676fd0
|
Disable dynamic entity renderers by default due to incompatible mods
|
2023-05-07 14:39:55 -04:00 |
|
embeddedt
|
1aa582383c
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-07 14:39:44 -04:00 |
|
embeddedt
|
65e12016b6
|
Add config for integrated server watchdog
|
2023-05-07 14:07:17 -04:00 |
|
embeddedt
|
3ba38b602a
|
Remove nonexistent mixin configs
|
2023-05-07 13:57:52 -04:00 |
|
embeddedt
|
a1cdf756ab
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-06 17:06:04 -04:00 |
|
embeddedt
|
c30574c3d0
|
Only apply item rendering optimization outside of level rendering
|
2023-05-06 16:40:49 -04:00 |
|
embeddedt
|
e84360efe9
|
Update item rendering patch for 1.19.2
|
2023-05-06 15:33:25 -04:00 |
|
embeddedt
|
44882e5418
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-06 15:27:22 -04:00 |
|
embeddedt
|
a2568c486e
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-06 15:22:06 -04:00 |
|
embeddedt
|
53cf31fe15
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-06 15:21:58 -04:00 |
|
embeddedt
|
deac0b43d1
|
Optimize rendering of simple items in GUIs
|
2023-05-06 15:20:40 -04:00 |
|
embeddedt
|
2e669761bd
|
Remove unnecessary injected field on BlockState
|
2023-05-06 12:57:15 -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
|
d4fec79e55
|
Change texture loading mixin priority to prevent FAPI conflicts
|
2023-05-06 11:43:11 -04:00 |
|
embeddedt
|
74c2c28a66
|
Avoid hard crash if AT fails to apply
|
2023-05-06 11:17:46 -04:00 |
|
embeddedt
|
10c95c68d8
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-05 12:04:43 -04:00 |
|
embeddedt
|
3b4354fbe5
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-05 12:03:15 -04:00 |
|
embeddedt
|
367cc372c2
|
Workaround for runtime resource packs that aren't thread safe
Related: https://github.com/Fuzss/diagonalfences/issues/38
|
2023-05-05 11:27:07 -04:00 |
|
embeddedt
|
b80afc2c79
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-05 10:47:15 -04:00 |
|
embeddedt
|
9455b5628e
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-05 10:46:47 -04:00 |
|
embeddedt
|
cc36e0c3f1
|
Ensure Lithium's cache fields get generated
Fixes #74
|
2023-05-05 10:45:59 -04:00 |
|
embeddedt
|
12623012ed
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-05 09:52:34 -04:00 |
|
embeddedt
|
3f82c7459a
|
Fix crash with Charm
|
2023-05-05 09:51:46 -04:00 |
|
embeddedt
|
385d12e159
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-05 09:44:15 -04:00 |
|
embeddedt
|
2cdc8b88a5
|
Make block model cache overridable for even more invasive mods
|
2023-05-05 09:38:36 -04:00 |
|
embeddedt
|
e6f30956db
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-04 22:01:11 -04:00 |
|
embeddedt
|
b744cc7452
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-04 21:55:48 -04:00 |
|
embeddedt
|
77e2175123
|
Fix material cache on Fabric
Fixes #72
|
2023-05-04 21:54:57 -04:00 |
|
embeddedt
|
85442810f3
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-04 19:56:21 -04:00 |
|
embeddedt
|
74007827f9
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-04 19:56:13 -04:00 |
|
embeddedt
|
8d7b351d53
|
Increase eviction time
|
2023-05-04 19:55:57 -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
|
0833d4dd56
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-04 17:06:34 -04:00 |
|
embeddedt
|
1fa039d331
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-04 17:05:47 -04:00 |
|
embeddedt
|
6c56096556
|
Emulate the vanilla block/item -> model maps for Fabric mods
|
2023-05-04 17:05:02 -04:00 |
|
embeddedt
|
50d02a8058
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-04 16:10:35 -04:00 |
|
embeddedt
|
05901b4514
|
Clearer message
|
2023-05-04 11:43:06 -04:00 |
|
embeddedt
|
270fec309e
|
Complain once per mod ID if an outdated structure is found
|
2023-05-04 11:42:25 -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 |
|