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