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 |
|