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
4cdf5e6b3d
Fix missing ClientOnly annotations
2023-07-22 15:35:36 -04:00
embeddedt
4c80deae25
Backport Diagonal Fences fix to 1.19.2
...
Related: #171
2023-07-21 10:47:50 -04:00
embeddedt
a5fb8575a6
Merge 1.19.4 into 1.20
2023-07-20 20:18:46 -04:00
embeddedt
f9315a127f
Merge 1.19.2 into 1.19.4
2023-07-20 20:18:45 -04:00
embeddedt
22d0d55d79
Merge 1.18 into 1.19.2
2023-07-20 20:18:44 -04:00
embeddedt
50ab84af42
Merge 1.16 into 1.18
2023-07-20 20:18:43 -04:00
embeddedt
4397f274a5
Prevent CME from thread dumper
2023-07-20 20:18:34 -04:00
embeddedt
374aac7ff5
Merge 1.19.4 into 1.20
2023-07-20 10:57:47 -04:00
embeddedt
e8aa88b317
Fix Diagonal Fences breaking after resource reload
2023-07-20 10:57:29 -04:00
embeddedt
b7a1f16a9d
Merge 1.19.4 into 1.20
2023-07-19 17:34:39 -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
3162a531b7
Merge 1.19.4 into 1.20
2023-07-19 16:46:15 -04:00
embeddedt
02f6431109
Merge 1.19.2 into 1.19.4
2023-07-19 16:46:14 -04:00
embeddedt
af5ece3fe9
Merge 1.18 into 1.19.2
2023-07-19 16:46:13 -04:00
embeddedt
91980319d2
Merge 1.16 into 1.18
2023-07-19 16:46:13 -04:00
embeddedt
8383053b5c
Fix wall block deduplication crashing when invasive mods replace vanilla walls
...
Related: #168
2023-07-19 16:45:32 -04:00
embeddedt
30f483245c
Merge 1.19.4 into 1.20
2023-07-19 12:20:52 -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
d9b9586af3
Update item override patch to 1.18
2023-07-19 12:08:15 -04:00
embeddedt
6fda7393b3
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-19 11:51:00 -04:00
embeddedt
ac436db456
Add support to dynamic resources for item overrides
2023-07-19 11:50:16 -04:00
embeddedt
e65f8fbb32
Add option to override overrides
...
Absolutely no support is guaranteed when this is used
2023-07-19 10:05:09 -04:00
embeddedt
e34beb5775
Merge 1.19.4 into 1.20
2023-07-17 16:09:27 -04:00
embeddedt
95c3044a40
Merge 1.19.2 into 1.19.4
2023-07-17 16:09:26 -04:00
embeddedt
ab7c982589
Merge 1.18 into 1.19.2
2023-07-17 16:08:28 -04:00
embeddedt
92643a244e
Merge 1.16 into 1.18
2023-07-17 16:08:27 -04:00
embeddedt
5ec070843d
Use CachedResourcePath in resource finder
...
Reduces memory usage by ~50%
2023-07-17 13:42:50 -04:00
embeddedt
c51b0585a2
Merge 1.19.4 into 1.20
2023-07-16 20:00:08 -04:00
embeddedt
2f7bd0e083
Merge 1.19.2 into 1.19.4
2023-07-16 20:00:07 -04:00
embeddedt
594c47f08b
Merge 1.18 into 1.19.2
2023-07-16 20:00:06 -04:00
embeddedt
94d5121a26
Merge 1.16 into 1.18
2023-07-16 20:00:06 -04:00
embeddedt
4f186c03f5
Filter valid paths using explicit joiner instead of Path.toString
...
to avoid issues on Windows
2023-07-16 19:59:22 -04:00
embeddedt
9a5edb9431
Merge 1.19.4 into 1.20
2023-07-15 20:37:19 -04:00
embeddedt
2a328356cd
Merge 1.19.2 into 1.19.4
2023-07-15 20:37:18 -04:00
embeddedt
48fdb94343
Merge 1.18 into 1.19.2
2023-07-15 20:37:18 -04:00
embeddedt
67343b5680
Merge 1.16 into 1.18
2023-07-15 20:37:17 -04:00
embeddedt
ad948f0ec1
Rework wall block caching to cache collision shapes as well
2023-07-15 20:36:56 -04:00
embeddedt
c63a8fa21e
Deduplicate wall block shapes
2023-07-15 20:23:59 -04:00
embeddedt
09d24c542e
Merge 1.18 into 1.19.2
2023-07-15 15:07:17 -04:00
embeddedt
9fcc1f5dc2
Merge 1.16 into 1.18
2023-07-15 15:05:56 -04:00
embeddedt
dff181accb
Allow corrupt JSONs when scanning models for textures
...
Fixes Hexerei textures being missing on 1.18
2023-07-15 15:05:25 -04:00
embeddedt
faccdb0ed7
Merge 1.19.4 into 1.20
2023-07-13 21:43:49 -04:00
embeddedt
b0815bcae6
Merge 1.19.2 into 1.19.4
2023-07-13 21:43:48 -04:00
embeddedt
c684b56124
Merge 1.18 into 1.19.2
2023-07-13 21:43:48 -04:00
embeddedt
dccde1a422
Merge 1.16 into 1.18
2023-07-13 21:43:47 -04:00
embeddedt
6cd99383b9
Disable item_cache_flag when Lithium or derivatives are present,
...
as they rely on the broken cache logic
2023-07-13 21:43:40 -04:00
embeddedt
0116a31616
Hotfix for Class.descriptorString() not existing on Java 8
2023-07-13 21:20:16 -04:00
embeddedt
1531762524
Merge 1.19.4 into 1.20
2023-07-13 19:40:40 -04:00
embeddedt
b79a66ce83
Merge 1.19.2 into 1.19.4
2023-07-13 19:40:39 -04:00
embeddedt
17d479bc93
Merge 1.18 into 1.19.2
2023-07-13 19:40:38 -04:00
embeddedt
5f59fdf471
Merge 1.16 into 1.18
2023-07-13 19:40:37 -04:00
其智乃反不能及
a1ee34bb1c
Update zh_cn.json ( #153 )
2023-07-13 19:39:48 -04:00
embeddedt
a799afc19c
Merge 1.19.4 into 1.20
2023-07-13 17:08:59 -04:00
embeddedt
24130cde74
Merge 1.19.2 into 1.19.4
2023-07-13 17:08:58 -04:00
embeddedt
bd179f817f
Merge 1.18 into 1.19.2
2023-07-13 17:08:57 -04:00
embeddedt
fd72aa4fac
Merge 1.16 into 1.18
2023-07-13 17:08:57 -04:00
embeddedt
793fb5f388
Allow spam_thread_dump to work even earlier
2023-07-13 17:08:32 -04:00
embeddedt
73e8631fcd
Merge 1.19.4 into 1.20
2023-07-12 11:49:31 -04:00
embeddedt
29c260f7ce
Merge 1.19.2 into 1.19.4
2023-07-12 11:49:30 -04:00
embeddedt
5318347ab2
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-12 11:49:19 -04:00
embeddedt
6548d5da80
Fix parity issue in paper_chunk_patches for 1.20+
...
Ensure scheduleChunkGeneration is correctly called if chunk status has load dependencies
Thanks to ishland for noticing this
2023-07-12 11:28:19 -04:00
embeddedt
aff4e0c2d0
Drop chunk status transition patch from paper_chunk_patches
...
Research by ishland suggests that vanilla already does this, at least
since 1.18
2023-07-12 10:53:12 -04:00
embeddedt
944e481f32
Remove item cache flag patch on 1.20 branch
2023-07-11 21:33:27 -04:00
embeddedt
b409db3e29
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-07-11 21:33:07 -04:00
embeddedt
6ae19f11ea
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-07-11 21:31:29 -04:00
embeddedt
eded461866
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-11 21:23:38 -04:00
embeddedt
c1e40ebe1f
Update item empty cache patch for 1.18
2023-07-11 21:23:22 -04:00
embeddedt
406a4a3a91
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-11 21:17:59 -04:00
embeddedt
896c8d1f5f
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-11 21:14:47 -04:00
embeddedt
816346e919
Make mod overrides higher priority than user configuration
...
Prevents players inadvertently enabling incompatible options
2023-07-11 21:13:02 -04:00
embeddedt
4c484f5125
Recognize ThreadTweak when disabling overlapping patches
2023-07-11 19:03:20 -04:00
embeddedt
c7aaa15a19
Remove emptyCacheFlag from item stacks (fixes MC-258939)
2023-07-11 17:25:26 -04:00
embeddedt
a5ae6e0631
Merge 1.19.4 into 1.20
2023-07-11 17:00:20 -04:00
embeddedt
0e248f8b83
Merge 1.19.2 into 1.19.4
2023-07-11 17:00:20 -04:00
embeddedt
2ca29efd77
Merge 1.18 into 1.19.2
2023-07-11 17:00:19 -04:00
embeddedt
3c9e5d2f0f
Disable deduplicate_climate_parameters by default
...
The 1.5-2MB this saves in vanilla isn't worth the cost of deduplication
in larger modpacks. Option still works fine and can be re-enabled
2023-07-11 16:58:19 -04:00
embeddedt
61288a17ac
Merge 1.19.4 into 1.20
2023-07-11 14:25:35 -04:00
embeddedt
fff28fdcbf
Merge 1.19.2 into 1.19.4
2023-07-11 14:25:34 -04:00
embeddedt
84cc58d30b
Merge 1.18 into 1.19.2
2023-07-11 14:25:33 -04:00
embeddedt
1f043c7088
Attempt fix for occasional world holes when paper_chunk_patches is enabled
...
1.18 seems to never return an unloaded Either here, instead always calling
scheduleChunkGeneration, so we do the same. This hasn't regressed
memory usage from some testing on 1.20.
2023-07-11 14:22:12 -04:00
embeddedt
9a966cfad9
Merge 1.19.4 into 1.20
2023-07-10 20:28:31 -04:00
embeddedt
e235e07bb2
Merge 1.19.2 into 1.19.4
2023-07-10 20:28:30 -04:00
embeddedt
1ba2a1fae0
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-10 20:28:20 -04:00
embeddedt
e87c85b75c
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-10 20:24:38 -04:00
embeddedt
bd351197b2
Backport https://github.com/MinecraftForge/MinecraftForge/pull/8959 to 1.18
2023-07-10 20:23:54 -04:00
embeddedt
546d1df48f
Prevent mixin.perf suboptions from defaulting to on if an explicit
...
option is not added
2023-07-10 19:13:01 -04:00
embeddedt
4ea7b864a8
Add facility to hide mixin options outside dev
2023-07-10 19:00:37 -04:00
embeddedt
489d3abe65
Merge 1.19.4 into 1.20
2023-07-10 09:02:45 -04:00
embeddedt
5dea99f139
Merge 1.19.2 into 1.19.4
2023-07-10 09:02:44 -04:00
embeddedt
11f107d60b
Merge 1.18 into 1.19.2
2023-07-10 09:02:43 -04:00
embeddedt
829994f5b5
Merge 1.16 into 1.18
2023-07-10 09:02:42 -04:00
embeddedt
5315d80859
Use synchronized HashMap instead of CHM to permit null keys for buggy mods
...
Related: #157
2023-07-10 09:01:18 -04:00
embeddedt
7e25e31d33
Merge 1.19.4 into 1.20
2023-07-09 20:35:41 -04:00
embeddedt
a1d56e2921
Merge 1.19.2 into 1.19.4
2023-07-09 20:35:41 -04:00
embeddedt
a34ac84e00
Merge 1.18 into 1.19.2
2023-07-09 20:35:40 -04:00
embeddedt
e248e2966a
Merge 1.16 into 1.18
2023-07-09 20:35:39 -04:00
embeddedt
f040f66bf9
Make backing maps in ItemProperties thread-safe
...
Helps prevent CMEs on Forge 1.16
2023-07-09 19:02:59 -04:00
embeddedt
540b19c141
Merge 1.19.4 into 1.20
2023-07-09 14:15:14 -04:00
embeddedt
aa493c41d5
Merge 1.19.2 into 1.19.4
2023-07-09 14:15:13 -04:00
embeddedt
637f844601
Merge 1.18 into 1.19.2
2023-07-09 14:15:12 -04:00
embeddedt
1815554070
Merge 1.16 into 1.18
2023-07-09 14:15:11 -04:00
embeddedt
5f255a83dc
Implement Map.replace on DynamicBakedModelProvider
...
Related: #154
2023-07-09 14:14:34 -04:00
embeddedt
28c456e4c5
Merge 1.18 into 1.19.2
2023-07-09 13:32:34 -04:00
embeddedt
2d12c6e282
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-09 13:31:01 -04:00
embeddedt
d987c1227b
Scan fallback resource managers as well as main resource manager
...
For buggy mods such as https://github.com/FoundationGames/EnhancedBlockEntities/issues/162
2023-07-09 13:27:18 -04:00
embeddedt
a502a509ed
Merge 1.16 into 1.18
2023-07-08 14:51:43 -04:00
embeddedt
bb0c4fdf54
Ignore RuntimeException when gathering blockstate paths
2023-07-08 14:51:07 -04:00
embeddedt
e56898fff4
Merge 1.19.4 into 1.20
2023-07-07 20:23:42 -04:00
embeddedt
7671066548
Merge 1.19.2 into 1.19.4
2023-07-07 20:23:41 -04:00
embeddedt
87cd49a291
Merge 1.18 into 1.19.2
2023-07-07 20:23:40 -04:00
embeddedt
8fd31f3190
Merge 1.16 into 1.18
2023-07-07 20:23:39 -04:00
embeddedt
f3a2ca73e8
Log all option overrides once at startup rather than per mixin
2023-07-07 20:23:10 -04:00
embeddedt
f27d6e154c
Make disabling feature.measure_time also disable game/world load messages
2023-07-07 20:19:08 -04:00
embeddedt
60d06c92f6
Merge 1.19.4 into 1.20
2023-07-07 19:22:08 -04:00
embeddedt
f1cd8bac20
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-07-07 19:21:25 -04:00
embeddedt
6020ff7ee1
Merge 1.18 into 1.19.2
2023-07-07 19:19:44 -04:00
embeddedt
b99e253715
Merge 1.16 into 1.18
2023-07-07 19:19:43 -04:00
embeddedt
1c0fca8f06
Spotless
2023-07-07 12:40:46 -04:00
embeddedt
cb55bd3612
Merge 1.18 into 1.19.2
2023-07-07 12:35:55 -04:00
embeddedt
2ec8a2719e
Merge 1.16 into 1.18
2023-07-07 12:35:53 -04:00
embeddedt
79219d286f
Fix issue with anonymous classes in mixin
...
Related: #151
2023-07-07 12:34:36 -04:00
embeddedt
e65727937c
Merge 1.19.4 into 1.20
2023-07-06 22:10:26 -04:00
embeddedt
a1f3cb9270
Merge 1.19.2 into 1.19.4
2023-07-06 22:10:25 -04:00
embeddedt
3b85b20020
Merge 1.18 into 1.19.2
2023-07-06 22:10:24 -04:00
embeddedt
36a1b6bb93
Merge 1.16 into 1.18
2023-07-06 22:10:24 -04:00
ZZZank
45ada33d7d
Update zh_cn Translation ( #150 )
...
from: ce6ce1d341
2023-07-06 21:34:25 -04:00
embeddedt
5e7421ab24
Merge 1.19.4 into 1.20
2023-07-06 21:29:26 -04:00
embeddedt
92264ed37e
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-07-06 21:27:43 -04:00
embeddedt
9ce029b35d
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-06 21:24:11 -04:00
embeddedt
127f091728
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-06 21:14:44 -04:00
embeddedt
ff39e9022b
Get testing working, add tests for blockstate cache rebuilds
2023-07-06 19:26:44 -04:00
embeddedt
454256d455
Deduplicate climate parameters
2023-07-06 12:29:29 -04:00
embeddedt
6300dd6737
Add utility for disabling Unihex font
...
Saves 10MB of RAM
2023-07-06 11:38:36 -04:00
embeddedt
5ca9485f0b
Add null check for ClassInfo objects
2023-07-05 21:52:02 -04:00
embeddedt
ce8c6e0283
Merge 1.19.4 into 1.20
2023-07-05 20:02:28 -04:00
embeddedt
50e558644a
Merge 1.19.2 into 1.19.4
2023-07-05 20:02:27 -04:00
embeddedt
1592e1c0ce
Merge 1.18 into 1.19.2
2023-07-05 20:02:26 -04:00
embeddedt
d155dacadc
Merge 1.16 into 1.18
2023-07-05 20:02:14 -04:00
embeddedt
c6cb0acd3c
Rewrite clear_mixin_classinfo, now more aggressive
2023-07-05 20:01:43 -04:00
embeddedt
2a16229056
Merge 1.19.4 into 1.20
2023-07-05 14:50:28 -04:00
embeddedt
7652a1dbc5
Merge 1.19.2 into 1.19.4
2023-07-05 14:50:07 -04:00
embeddedt
6d4071f42c
Merge 1.18 into 1.19.2
2023-07-05 14:50:05 -04:00
embeddedt
6cd49334d7
Merge 1.16 into 1.18
2023-07-05 14:47:30 -04:00
embeddedt
095b9c3277
Revamp mod warning system, also warn about FerriteCore missing
2023-07-05 14:47:17 -04:00
embeddedt
5aeea48413
Apply spotless
2023-07-05 12:47:43 -04:00
embeddedt
7632647e1d
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-07-05 12:45:02 -04:00
embeddedt
41a56fba20
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-07-05 12:35:41 -04:00
embeddedt
1600dc4f84
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-05 12:26:14 -04:00
embeddedt
46cff62796
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-05 12:18:00 -04:00
embeddedt
ce6ce1d341
Add option categories
2023-07-04 11:14:23 -04:00
embeddedt
18f78b9624
Add in-game patch descriptions
2023-07-03 17:04:20 -04:00
embeddedt
3237de7e33
Merge 1.19.4 into 1.20
2023-07-03 14:59:21 -04:00
embeddedt
37d6f477c4
Merge 1.19.2 into 1.19.4
2023-07-03 14:58:45 -04:00
embeddedt
0f90f53f53
Merge 1.18 into 1.19.2
2023-07-03 14:58:44 -04:00
embeddedt
9d5953c9f5
Merge 1.16 into 1.18
2023-07-03 14:58:06 -04:00
notlin4
6f07cbdc70
Add Traditional Chinese translation ( #148 )
2023-07-02 13:34:23 -04:00
embeddedt
dc8d727bdb
Update Diagonal Fences mixin
2023-07-02 13:30:43 -04:00
embeddedt
3be36f826c
Merge 1.19.4 into 1.20
2023-06-29 19:28:08 -04:00
embeddedt
dc268285b0
Add .mcmeta files to resource list to match 1.19.4+ behavior
...
Fixes modded texture .mcmeta files not being picked up
Fixes #145
2023-06-29 19:28:01 -04:00
embeddedt
a6cce0c043
Merge 1.19.4 into 1.20
2023-06-27 16:40:33 -04:00
embeddedt
152e795c32
Merge 1.19.2 into 1.19.4
2023-06-27 16:40:32 -04:00
embeddedt
89a78bf43b
Merge 1.18 into 1.19.2
2023-06-27 16:40:31 -04:00
embeddedt
1e9e310922
Merge 1.16 into 1.18
2023-06-27 16:40:30 -04:00
embeddedt
8bb5e464bc
Disable cache_strongholds when LittleTiles is installed
...
Related: #143
Related: https://github.com/CreativeMD/LittleTiles/issues/859
2023-06-27 16:39:49 -04:00
embeddedt
840cad23b8
Merge 1.19.4 into 1.20
2023-06-27 15:29:27 -04:00
embeddedt
93817c5d3a
Merge 1.19.2 into 1.19.4
2023-06-27 15:29:26 -04:00
embeddedt
470f8aed5b
Merge 1.18 into 1.19.2
2023-06-27 15:29:25 -04:00
embeddedt
e9ee866c60
Merge 1.16 into 1.18
2023-06-27 15:29:25 -04:00
embeddedt
4f711a4995
Populate isFabric earlier
2023-06-27 15:29:14 -04:00
embeddedt
ca60a13bb4
Merge 1.19.4 into 1.20
2023-06-27 11:04:06 -04:00
embeddedt
96a83533dd
Merge 1.19.2 into 1.19.4
2023-06-27 11:04:05 -04:00
embeddedt
99521e4d76
Merge 1.18 into 1.19.2
2023-06-27 11:04:04 -04:00
embeddedt
299abeb25d
Apply merge mode change to 1.18
2023-06-27 11:03:49 -04:00
embeddedt
54f55ee257
Merge 1.19.4 into 1.20
2023-06-26 21:26:28 -04:00
embeddedt
84b08ef64a
Merge 1.19.2 into 1.19.4
2023-06-26 21:26:27 -04:00
embeddedt
bd3a9eb345
Merge 1.18 into 1.19.2
2023-06-26 21:26:26 -04:00
embeddedt
a937ccb07c
Merge 1.16 into 1.18
2023-06-26 21:26:01 -04:00
embeddedt
58eaf44d89
Make mixin info clearing work on Fabric
2023-06-26 21:15:19 -04:00
embeddedt
7a2d38f2f1
Merge 1.19.4 into 1.20
2023-06-26 19:46:09 -04:00
embeddedt
370a0fad11
Merge 1.19.2 into 1.19.4
2023-06-26 19:46:09 -04:00
embeddedt
ec49868d27
Merge 1.18 into 1.19.2
2023-06-26 19:46:08 -04:00
embeddedt
25d1956da0
Merge 1.16 into 1.18
2023-06-26 19:46:07 -04:00
embeddedt
e3944d7879
Add option to aggressively clear Fabric mapping tables
2023-06-26 19:43:53 -04:00
embeddedt
af486998d2
Merge 1.19.4 into 1.20
2023-06-26 15:57:50 -04:00
embeddedt
5229643761
Add missing ExpectPlatform
2023-06-26 15:57:37 -04:00
embeddedt
8e467e8239
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-06-26 14:33:26 -04:00
embeddedt
04c6ea2e66
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-06-26 14:33:12 -04:00
embeddedt
b6182b4913
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-06-26 14:30:23 -04:00
embeddedt
ce92fedf09
Give correct MC/platform info to profiler
2023-06-26 14:24:37 -04:00
embeddedt
012ed17208
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-06-26 14:21:19 -04:00
embeddedt
4943702061
Add platform name to hooks
2023-06-26 14:21:07 -04:00
embeddedt
33c0cf33d9
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-06-26 14:14:35 -04:00
embeddedt
60525ad594
Add option to profile launch using Spark
2023-06-26 13:58:12 -04:00
embeddedt
2bad1c0226
Merge 1.19.4 into 1.20
2023-06-26 13:04:44 -04:00
embeddedt
65506ba7e1
Merge 1.19.2 into 1.19.4
2023-06-26 13:04:43 -04:00
embeddedt
c93380dcf2
Merge 1.18 into 1.19.2
2023-06-26 13:04:41 -04:00
embeddedt
7849ba16f5
Merge 1.16 into 1.18
2023-06-26 13:04:40 -04:00
embeddedt
b611830b7e
Eliminate need to use platform hook to retrieve server here
2023-06-26 13:01:53 -04:00
embeddedt
565dfb4b81
Merge 1.19.4 into 1.20
2023-06-22 13:45:27 -04:00
embeddedt
24f31dd92a
Initial version of resource pack caching for 1.19.4+
2023-06-22 13:45:13 -04:00
embeddedt
63bcdb1019
Merge 1.19.4 into 1.20
2023-06-22 13:42:57 -04:00
embeddedt
5b2e70cda0
Merge 1.19.2 into 1.19.4
2023-06-22 13:42:56 -04:00
embeddedt
d97b18e633
Merge 1.18 into 1.19.2
2023-06-22 13:42:55 -04:00
embeddedt
6678864555
Merge 1.16 into 1.18
2023-06-22 13:42:25 -04:00
embeddedt
20ca15f0c4
Add a few more features to resource pack cache engine (for 1.19.4+)
2023-06-22 13:42:15 -04:00
embeddedt
5bd745a188
Merge 1.18 into 1.19.2
2023-06-21 21:43:29 -04:00
embeddedt
1ac69035ed
Merge 1.16 into 1.18
2023-06-21 21:41:12 -04:00
embeddedt
19c6687745
More aggressively load model files
2023-06-21 21:17:11 -04:00
embeddedt
c1c0010126
Merge 1.19.4 into 1.20
2023-06-20 14:34:54 -04:00
embeddedt
9cdeeb4c94
Merge 1.19.2 into 1.19.4
2023-06-20 14:34:53 -04:00
embeddedt
a84fa8ac0c
Merge 1.18 into 1.19.2
2023-06-20 14:34:37 -04:00
embeddedt
6a7d62b38d
Merge 1.16 into 1.18
2023-06-20 14:34:36 -04:00
embeddedt
40be7c9fc1
Add a few missing ClientOnlyMixin annotations
...
Related: #137
2023-06-20 10:43:17 -04:00
embeddedt
5d6566512c
Rewrite CanonizingStringMap to simply use a normal HashMap and intern keys
...
There are no memory savings from using the fastutil maps, and they
may be harming performance based on the Project MMO issues
Probably also the solution to #134
2023-06-20 10:31:49 -04:00
embeddedt
c1acdf1bb4
Make config wrapping possible to disable
2023-06-20 09:42:44 -04:00
embeddedt
761417833e
Merge 1.19.4 into 1.20
2023-06-12 21:58:58 -04:00
embeddedt
e5ab4df3dc
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-06-12 21:58:51 -04:00
embeddedt
12345a67e8
Merge 1.18 into 1.19.2
2023-06-12 21:57:43 -04:00
embeddedt
440cc21d8c
Merge 1.16 into 1.18
2023-06-12 21:57:42 -04:00
embeddedt
d242431e9a
Change dynamic_dfu to return real schemas as well
2023-06-12 21:57:22 -04:00
embeddedt
e5cc8ef97c
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-06-12 10:46:44 -04:00
embeddedt
af63a6ca09
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-06-12 10:46:33 -04:00
embeddedt
a13e8d98e1
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-06-12 10:45:39 -04:00
embeddedt
5136889c3e
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-06-12 10:43:52 -04:00
embeddedt
cfd3920c8c
Add tickable object framework
2023-06-12 10:24:49 -04:00
embeddedt
755bc35d09
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-06-07 11:45:27 -04:00
embeddedt
a7e93ad8f9
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-06-06 19:18:14 -04:00
embeddedt
57e1e54441
Tweak faster_texture_loading injection point for compatibility
2023-06-06 19:12:03 -04:00
embeddedt
aedbc88e3c
Update to 1.20-rc1
2023-06-06 12:28:30 -04:00
embeddedt
f9cbd8fa61
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-06-06 12:01:21 -04:00
embeddedt
a614c050e7
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-06-06 11:57:49 -04:00
embeddedt
931bf29c47
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-06-06 11:52:49 -04:00
embeddedt
3996804e71
Merge remote-tracking branch 'origin/main' into 1.18
2023-06-05 19:46:52 -04:00
embeddedt
b430b67052
Return missing model for null BlockState
2023-06-05 19:43:25 -04:00
embeddedt
41c2bb733e
Add name change easter egg when running on snapshots
2023-06-03 20:01:19 -04:00
embeddedt
673e6dec8d
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-06-03 11:40:31 -04:00
embeddedt
f8771a260c
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-06-03 11:31:37 -04:00
embeddedt
39531aba0e
Merge remote-tracking branch 'origin/main' into 1.18
2023-06-03 11:27:32 -04:00
embeddedt
941331f90a
Compatibility improvements for mixin.perf.nbt_memory_usage
...
Related: #119
2023-06-03 11:26:44 -04:00
embeddedt
a635671276
This will likely be the last ever 1.19.4 release
2023-06-02 20:17:13 -04:00
embeddedt
144bdaa301
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-06-02 20:14:14 -04:00
embeddedt
618698aab3
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-06-01 21:28:05 -04:00
embeddedt
b610a21b37
Merge remote-tracking branch 'origin/main' into 1.18
2023-06-01 21:14:19 -04:00
embeddedt
39e1ac0896
Simplify item rendering optimization
...
Now uses a wrapped item model instead of actually modifying
the rendering code, to avoid disabling Sodium's optimization
2023-06-01 21:11:54 -04:00
embeddedt
945027295a
Merge remote-tracking branch 'origin/main' into 1.18
2023-06-01 19:55:10 -04:00
embeddedt
c8bce3e015
Disable bugfix.chunk_deadlock for DimThread
...
Related: #118
2023-06-01 19:54:18 -04:00
embeddedt
4b73d699e4
Disable packet leak fix when MemoryLeakFix is present on Fabric
2023-06-01 19:45:19 -04:00
embeddedt
1a7d5b3436
Decommission the chunk saving fix
...
Does not actually fix the issue, sadly
2023-06-01 19:39:21 -04:00
embeddedt
b15537a32f
Make CanonizingStringMap not crash on null keys/values
2023-05-31 09:37:34 -04:00
embeddedt
76485b0cba
Fix Skyblock Builder crash
...
Related: #117
2023-05-30 10:43:08 -04:00
embeddedt
cb22591182
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-30 10:34:03 -04:00
embeddedt
8c061ec070
Support new REI version
...
Related: #116
2023-05-30 10:27:47 -04:00
embeddedt
4a9cd78d1d
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-29 20:39:14 -04:00
embeddedt
0f4e835f6c
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-29 20:19:01 -04:00
embeddedt
39939076e7
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-29 20:18:34 -04:00
embeddedt
3dbff477e9
Improve structure cache wording
2023-05-29 18:29:11 -04:00
embeddedt
d51de3fa55
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-29 10:19:21 -04:00
embeddedt
f1811bbbc6
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-29 10:17:59 -04:00
embeddedt
a7d894cbc2
Disable cache invalidation outside dev
...
Not needed as mod contents shouldn't change (right...)
2023-05-29 10:16:54 -04:00
embeddedt
d89f8da5a2
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-28 22:21:08 -04:00
embeddedt
b8850b2aae
Only use JEI backed search tree if EMI is not installed
2023-05-28 22:17:03 -04:00
embeddedt
f4b2db89ec
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-27 10:28:35 -04:00
embeddedt
5a09f27c6a
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-27 10:28:00 -04:00
embeddedt
c4a50bb6e2
Replace default backing map of NBT tags in more compatible way
...
Related: #111
2023-05-27 10:12:05 -04:00
embeddedt
b5d62b4bbb
Add off-by-default feature to automatically thread dump every 60 seconds
2023-05-26 11:55:57 -04:00
embeddedt
a327b460bb
Tweak dynamic texture mixin
2023-05-23 20:30:22 -04:00
embeddedt
ddf2fc5a74
Provide more useful information if the image used in DynamicTexture is null
2023-05-23 19:29:24 -04:00
embeddedt
74eb8a0619
Split unbaked model load event into load and pre-bake stages
...
Allows mods like Continuity to wrap the model being baked
separately from the model in the cache
2023-05-23 18:50:49 -04:00
embeddedt
2bd2fd7ef7
Only inject integration first time
2023-05-23 16:38:34 -04:00
embeddedt
baca029fd0
Add support for Diagonal Fences
2023-05-23 14:59:46 -04:00
embeddedt
0f180ff979
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-23 14:50:41 -04:00
embeddedt
86e748dd93
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-23 14:47:48 -04:00
embeddedt
be4c8607d4
Disable faster texture loader if Changed:MC is installed
...
Related: #108
2023-05-23 11:53:28 -04:00
embeddedt
31feef398f
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-22 14:24:27 -04:00
embeddedt
49a8f72151
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-22 13:50:27 -04:00
embeddedt
675e3bb08b
Fix startup crash introduced in last commit
2023-05-22 13:49:08 -04:00
embeddedt
aae4db7ebf
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-22 13:27:20 -04:00
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
4cccd8f6d9
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-17 17:46:31 -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
adbf61a06b
1.20-pre2
2023-05-16 11:27:08 -04:00
embeddedt
b44739e33c
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-05-16 11:21:43 -04:00
embeddedt
340b026951
Remove unneeded imports
2023-05-16 11:21:34 -04:00
embeddedt
30bf3afc1d
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-05-16 11:18:10 -04:00
embeddedt
119f9ec6dd
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-16 11:11:00 -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
b1fb365f22
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-15 11:14:20 -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
57947441ce
Spotless
2023-05-11 11:33:32 -04:00
embeddedt
f1515c5063
1.20-pre1
2023-05-11 11:27:22 -04:00
embeddedt
05b28b8269
Fix spotless error
2023-05-11 11:01:49 -04:00
embeddedt
9c421218b8
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-11 10:51: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
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
c229b1c60c
Update item renderer mixin for 1.19.4
2023-05-06 16:18:47 -04:00
embeddedt
422b6d56f7
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-06 16:07:10 -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
95ee0c60ca
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-05 10:53:30 -04:00
embeddedt
1f4e45eca6
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-05 10:50:34 -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
170da33755
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-04 11:47:58 -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
embeddedt
d4cf8503cd
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-04 10:27:13 -04:00
embeddedt
168983c972
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-04 10:26:07 -04:00
embeddedt
11a37d59ec
Ignore exceptions thrown by structure upgrade command
2023-05-04 10:25:47 -04:00
embeddedt
1fbf83c562
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-04 10:22:23 -04:00
embeddedt
b3da731e1f
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-04 10:18:45 -04:00
embeddedt
26bc9514d7
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-04 10:15:26 -04:00
embeddedt
8b9d3cab18
Add Mod Menu compatibility
2023-05-04 10:08:58 -04:00
embeddedt
d4bfe17a72
Tweak Fabric model bakery to run more vanilla code
2023-05-03 19:23:43 -04:00
embeddedt
2a7733e61f
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-03 11:16:34 -04:00
embeddedt
d658c18566
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-03 10:38:33 -04:00
embeddedt
ac97dfd8c4
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-03 10:37:11 -04:00
embeddedt
9d7f897dae
Get Continuity working on Fabric
2023-05-03 10:32:32 -04:00
embeddedt
f1cdbc339b
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-03 10:17:41 -04:00
embeddedt
1b10ed3f66
Keep custom models loaded permanently on Fabric
2023-05-03 10:14:43 -04:00
embeddedt
74cf6ef598
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-02 22:02:41 -04:00
embeddedt
8f71606fad
Fix entity renderer crash in some modpacks
2023-05-02 22:00:49 -04:00
embeddedt
ae33070507
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-02 20:24:48 -04:00
embeddedt
e1b29f2985
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-02 20:20:12 -04:00
embeddedt
2772351a3d
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-02 20:10:40 -04:00
embeddedt
6a85047132
Add structure upgrading command
2023-05-02 20:04:54 -04:00
embeddedt
969c3fd18e
Update entity renderer mixin
2023-05-02 19:24:42 -04:00
embeddedt
f62aac1c77
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-02 19:23:34 -04:00
embeddedt
8d1a73c339
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-02 19:22:09 -04:00
embeddedt
71d7004d0c
Shrink oversized PalettedContainers
2023-05-02 19:19:57 -04:00
embeddedt
47e01693c5
Reimplement dynamic entity renderers
2023-05-02 16:14:23 -04:00
embeddedt
7ca647b763
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-02 11:20:58 -04:00
embeddedt
85d54292b2
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-02 11:20:21 -04:00
embeddedt
5a3d519bab
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-02 11:19:38 -04:00
embeddedt
a29ffb252c
Fix some configs not being available
2023-05-02 11:18:30 -04:00
embeddedt
0de67936c1
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-01 21:30:01 -04:00
embeddedt
3f2a8dbb61
Fixes
2023-05-01 21:28:59 -04:00
embeddedt
e830fd9bef
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-01 21:25:21 -04:00
embeddedt
fa9ac8c8ab
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-01 21:24:31 -04:00
embeddedt
81a2b9cb56
Fix issues
2023-05-01 21:12:02 -04:00
embeddedt
01c1d73355
Use custom BakedModel as sentinel
2023-05-01 21:00:50 -04:00
embeddedt
ada0bd4012
Fix mixin
2023-05-01 20:50:56 -04:00
embeddedt
a06a46b498
Spotless
2023-05-01 20:47:24 -04:00
embeddedt
b746be4c67
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-01 20:46:16 -04:00
embeddedt
45b4b3a6f8
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-01 20:44:25 -04:00
embeddedt
fddac90db2
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-01 20:42:59 -04:00
embeddedt
e704b25bc8
Fix AW
2023-05-01 20:42:46 -04:00
embeddedt
de00e21835
Clean up imports
2023-05-01 20:40:06 -04:00
embeddedt
ea25f2e854
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-05-01 20:30:25 -04:00
embeddedt
d9c2e0f342
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-05-01 19:46:23 -04:00
embeddedt
5ffac3bc3e
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-01 19:11:16 -04:00
embeddedt
64eb01987f
Package restructuring for modern FML
2023-05-01 19:05:08 -04:00
embeddedt
9dd9ef923c
Merge remote-tracking branch 'origin/main' into 1.18
2023-05-01 18:37:26 -04:00
embeddedt
b6ae90d384
Multiloader
2023-05-01 16:55:26 -04:00
