embeddedt
|
80617c24f1
|
Work around KeyMapping names being retrieved off-thread
|
2023-05-22 13:25:14 -04:00 |
|
embeddedt
|
d428f9c4c0
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-21 20:57:15 -04:00 |
|
embeddedt
|
f48ed1212b
|
Move AE2 dynamic resources compat to common module
|
2023-05-21 20:17:38 -04:00 |
|
embeddedt
|
117febba6d
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-21 20:08:28 -04:00 |
|
embeddedt
|
7517c36b36
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-21 19:17:39 -04:00 |
|
embeddedt
|
0a035b6e0d
|
Back client integration list with COW arraylist
|
2023-05-21 17:11:51 -04:00 |
|
embeddedt
|
c2f09fb998
|
Merge branch 'mod-api'
|
2023-05-21 15:24:46 -04:00 |
|
embeddedt
|
bb6d498d58
|
Disable faster_texture_loading and faster_texture_stitching when Opticrash is present
Fixes #91
|
2023-05-21 14:11:05 -04:00 |
|
embeddedt
|
d5bd392cff
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-20 12:37:04 -04:00 |
|
embeddedt
|
962b843199
|
Avoid exposing mods to exceptions when baking models
|
2023-05-20 12:35:33 -04:00 |
|
embeddedt
|
bd1182ab39
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-17 17:45:49 -04:00 |
|
embeddedt
|
a25252714d
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-17 17:12:19 -04:00 |
|
embeddedt
|
c51d7ae641
|
Use half fix for packet leak
|
2023-05-17 16:51:56 -04:00 |
|
embeddedt
|
0d4a12eafe
|
Revert "Hopefully more stable version of the original packet fix"
This reverts commit b21ee9a7e7.
|
2023-05-17 16:51:25 -04:00 |
|
embeddedt
|
f67fa07546
|
Synchronize LivingEntityRenderer layer list
Related: #102
|
2023-05-17 16:50:08 -04:00 |
|
embeddedt
|
3a24d094c9
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-16 11:01:46 -04:00 |
|
embeddedt
|
b25234e431
|
Fix search tree provider crash
|
2023-05-16 10:16:32 -04:00 |
|
embeddedt
|
f633d9b3bf
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-15 22:21:02 -04:00 |
|
embeddedt
|
4fa0602af9
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-15 22:20:25 -04:00 |
|
embeddedt
|
f22dbf5df1
|
Use less invasive mixin on Blocks.rebuildCache()
Related: #99
|
2023-05-15 22:19:54 -04:00 |
|
embeddedt
|
98def7b879
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-15 21:23:01 -04:00 |
|
embeddedt
|
6f8815200e
|
Move search tree replacement to common module
|
2023-05-15 21:05:01 -04:00 |
|
embeddedt
|
32c1baf887
|
Move search tree replacement to common, support both modloaders
|
2023-05-15 20:23:37 -04:00 |
|
embeddedt
|
ee3f29c569
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-15 11:09:39 -04:00 |
|
embeddedt
|
f599acda6b
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-15 11:07:31 -04:00 |
|
embeddedt
|
c1c9c02ff4
|
Remove blockstate compression
|
2023-05-14 20:27:37 -04:00 |
|
embeddedt
|
b21ee9a7e7
|
Hopefully more stable version of the original packet fix
|
2023-05-14 19:59:39 -04:00 |
|
embeddedt
|
0f2764b79d
|
Revert "Fix incorrect logic in packet leak patch"
This reverts commit 45d308c6a4.
|
2023-05-14 19:48:57 -04:00 |
|
embeddedt
|
8510d648aa
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-14 19:34:32 -04:00 |
|
embeddedt
|
9ca4961841
|
Merge remote-tracking branch 'origin/main' into 1.18
|
2023-05-14 19:25:48 -04:00 |
|
embeddedt
|
eb925bc3ba
|
Fix performance issue when loading large NBT maps
Array map was not being changed to hash map until AFTER the insertions,
which is bad
|
2023-05-14 19:24:56 -04:00 |
|
embeddedt
|
a7e64f2947
|
Fix performance issue when loading large NBT maps
Array map was not being changed to hash map until AFTER the insertions,
which is bad
|
2023-05-14 19:23:36 -04:00 |
|
embeddedt
|
b4ffe68adb
|
Replace Forge dynamic model bake event with modloader-independent custom solution
|
2023-05-13 16:37:20 -04:00 |
|
embeddedt
|
45d308c6a4
|
Fix incorrect logic in packet leak patch
Related: #97
|
2023-05-13 09:36:34 -04:00 |
|
embeddedt
|
2de8f02814
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-05-11 10:39:33 -04:00 |
|
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
|
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 |
|