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
|
127a85ea89
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 20:17:29 -04:00 |
|
embeddedt
|
dc8c9832d2
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 20:16:44 -04:00 |
|
embeddedt
|
d70480eb17
|
More Fabric dynamic model loading improvements
|
2023-05-08 20:16:24 -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
|
dcd30d34da
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 18:05:08 -04:00 |
|
embeddedt
|
0a5ca4fcf4
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 18:04:44 -04:00 |
|
embeddedt
|
9d4d1cc9b4
|
Add more paths to texture search
|
2023-05-08 18:04:23 -04:00 |
|
embeddedt
|
fc9aff6217
|
Enable GitHub Gradle cache
|
2023-05-08 17:59:28 -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
|
78da1157ab
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-08 14:55:42 -04:00 |
|
embeddedt
|
21a9266c8f
|
Update patch for 1.19
|
2023-05-08 14:54:31 -04:00 |
|
embeddedt
|
e724cbfa63
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 14:53:38 -04:00 |
|
embeddedt
|
656f3924da
|
Avoid running Fabric loading hook except for extra models
|
2023-05-08 14:53:23 -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
|
41fa422160
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 14:15:33 -04:00 |
|
embeddedt
|
85025b77fb
|
Set the missing model early if needed
|
2023-05-08 14:15:22 -04:00 |
|
embeddedt
|
5b57b238c3
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-08 14:14:37 -04:00 |
|
embeddedt
|
c420c63ab1
|
Handle bakedTopLevelModels not being a dynamic provider yet
|
2023-05-08 14:14:20 -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 |
|