embeddedt
4b8ec822fe
Merge 1.16 into 1.18
2023-10-13 10:47:50 -04:00
embeddedt
49c1bc71ba
Patch modded shape caches to be thread-safe
...
Related: #260
2023-10-13 10:47:44 -04:00
embeddedt
637c14fb6d
Merge 1.19.2 into 1.20
2023-10-07 17:48:38 -04:00
embeddedt
ea918a44c4
Merge 1.18 into 1.19.2
2023-10-07 17:48:36 -04:00
embeddedt
5c73ddeaf8
Port vehicle mixin to 1.18
2023-10-07 17:48:30 -04:00
embeddedt
b56fbc853d
Merge 1.19.2 into 1.20
2023-10-07 17:46:24 -04:00
embeddedt
1a358582a5
Merge 1.18 into 1.19.2
2023-10-07 17:46:23 -04:00
embeddedt
2d14bc3b1b
Merge 1.16 into 1.18
2023-10-07 17:46:21 -04:00
embeddedt
6593b6a5cf
Preserve rotation
2023-10-07 17:42:04 -04:00
embeddedt
204c8b78c4
Fix lag caused by Forge vehicle resync patch
...
This patch previously set the player to the entity's position,
which is not always correct for entities that position the player
at an offset (e.g. boats with two entities). Move the player using
positionRider() instead
Original PR: https://github.com/MinecraftForge/MinecraftForge/pull/5160
2023-10-07 17:27:23 -04:00
embeddedt
b1a0d0b94a
Merge 1.19.2 into 1.20
2023-10-06 17:07:47 -04:00
embeddedt
d7d75e88d5
Merge 1.18 into 1.19.2
2023-10-06 17:07:46 -04:00
embeddedt
6c7a5c70f5
Merge 1.16 into 1.18
2023-10-06 17:07:23 -04:00
embeddedt
d877ab46f0
Remove reference to Component in NightConfigFixer
2023-10-06 17:06:10 -04:00
embeddedt
c87dee4f3f
Merge 1.18 into 1.19.2
2023-10-05 14:30:23 -04:00
embeddedt
fb720782b9
Merge 1.16 into 1.18
2023-10-05 14:30:21 -04:00
embeddedt
36673f275e
Tweak dynamic resources injection point on Forge
...
Related: #252
2023-10-05 14:29:28 -04:00
embeddedt
385523c826
Merge 1.19.2 into 1.20
2023-10-05 14:12:35 -04:00
embeddedt
c387e91f0d
Merge 1.18 into 1.19.2
2023-10-05 14:12:33 -04:00
embeddedt
9c02b2c393
Update mixin for 1.18
2023-10-05 14:12:26 -04:00
embeddedt
9306743001
Update package for 1.18
2023-10-05 14:09:25 -04:00
embeddedt
a1f867c26d
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-10-05 14:09:04 -04:00
embeddedt
2710a02b2a
Detect vanilla connection using custom logic
2023-10-05 14:08:44 -04:00
embeddedt
4090a91272
Merge 1.18 into 1.19.2
2023-10-05 13:37:48 -04:00
embeddedt
00144af296
Merge 1.16 into 1.18
2023-10-05 13:37:46 -04:00
embeddedt
96d01e5a1e
Don't read modded recipe book settings on vanilla connection
...
Related: https://github.com/neoforged/NeoForge/issues/150
2023-10-05 13:37:31 -04:00
embeddedt
7b1d9ff8bb
Improve Async Locator backport for 1.16
2023-09-22 22:05:10 -04:00
embeddedt
88d56c451e
Merge 1.19.4 into 1.20
2023-09-20 17:58:55 -04:00
embeddedt
ec6de638a2
Merge 1.19.2 into 1.19.4
2023-09-20 17:58:53 -04:00
embeddedt
17e3b40bf9
Merge 1.18 into 1.19.2
2023-09-20 17:58:52 -04:00
embeddedt
0aabad688b
Merge 1.16 into 1.18
2023-09-20 17:58:50 -04:00
embeddedt
7ff300d8df
Add Vampirism to mods requiring fallback model iterator
...
Related: #242
2023-09-20 17:58:25 -04:00
embeddedt
6198f0c9d3
Merge 1.19.4 into 1.20
2023-08-31 07:57:26 -04:00
Phoenix-Starlight
5fef7dc66b
Fix dynamic resources ModelManager leak ( #231 )
...
The opened BufferedReader was not being closed, and apparently the cleaner/finalize mechanism doesn't exist for it
2023-08-31 07:56:38 -04:00
embeddedt
fcde6104eb
Possible NPE fixes for KubeJS
2023-08-30 19:39:41 -04:00
embeddedt
4b560c7d3d
Merge 1.19.4 into 1.20
2023-08-29 15:17:06 -04:00
embeddedt
ecb3863410
Merge 1.19.2 into 1.19.4
2023-08-29 15:17:05 -04:00
embeddedt
eac4ddac4c
Merge 1.18 into 1.19.2
2023-08-29 15:17:04 -04:00
embeddedt
987c5dc321
Change mixin priority
2023-08-29 15:16:54 -04:00
embeddedt
ec99687702
Fix Canary compat
2023-08-29 15:08:50 -04:00
embeddedt
ce7b7cbaf2
Merge 1.19.4 into 1.20
2023-08-24 21:47:04 -04:00
embeddedt
fa5b947442
Merge 1.19.2 into 1.19.4
2023-08-24 21:47:03 -04:00
embeddedt
11f1be0d2c
Merge 1.18 into 1.19.2
2023-08-24 21:47:02 -04:00
embeddedt
4418dd2eab
Fix misapplied Forge patch that no longer checks currently loading chunk
2023-08-24 21:46:23 -04:00
embeddedt
73d2a4405d
Improve performance of async handoff
2023-08-20 20:51:46 -04:00
embeddedt
8d766a8cc8
Avoid calling createCapabilities many times, mark mixin as client-only
2023-08-20 20:35:20 -04:00
embeddedt
fe8d0434c5
Rename feature
2023-08-20 20:27:10 -04:00
embeddedt
ae59c2496e
Show mod names and progress during registry events
2023-08-20 20:26:26 -04:00
embeddedt
a19d519b4b
Temporarily shift splash screen control to background thread during registry events
2023-08-20 20:01:36 -04:00
embeddedt
e946cc896a
Merge 1.19.4 into 1.20
2023-08-18 15:16:55 -04:00
embeddedt
a1e8838aee
Merge 1.19.2 into 1.19.4
2023-08-18 15:16:54 -04:00
embeddedt
9390f7fca9
Merge 1.18 into 1.19.2
2023-08-18 15:16:53 -04:00
embeddedt
7490809a42
Merge 1.16 into 1.18
2023-08-18 15:16:52 -04:00
embeddedt
45f92f7fce
Disable config reload message for now
...
There isn't a good way to print this in a way that will catch the
modification in all scenarios, and that doesn't annoy the user
2023-08-18 15:16:20 -04:00
embeddedt
bc7fb1e6d4
Merge 1.19.4 into 1.20
2023-08-18 14:39:26 -04:00
embeddedt
2ee1ef13ec
Merge 1.19.2 into 1.19.4
2023-08-18 14:39:25 -04:00
embeddedt
7552199f5e
Merge 1.18 into 1.19.2
2023-08-18 14:39:24 -04:00
embeddedt
73c80d0603
Merge 1.16 into 1.18
2023-08-18 14:39:24 -04:00
embeddedt
fa9103fb06
Convert milliseconds to nanoseconds correctly
2023-08-18 14:39:07 -04:00
embeddedt
9964693050
Merge 1.19.4 into 1.20
2023-08-18 14:35:25 -04:00
embeddedt
c51133f2c3
Merge 1.19.2 into 1.19.4
2023-08-18 14:35:25 -04:00
embeddedt
da944c330b
Merge 1.18 into 1.19.2
2023-08-18 14:35:24 -04:00
embeddedt
6b1f5232fa
Merge 1.16 into 1.18
2023-08-18 14:35:23 -04:00
embeddedt
672ca92aab
Show time to bootstrap stage on Forge
2023-08-18 14:35:15 -04:00
embeddedt
6e00010e9a
Merge 1.19.4 into 1.20
2023-08-15 21:21:18 -04:00
embeddedt
9325a8c892
Update mixin target
2023-08-15 21:21:10 -04:00
embeddedt
00481145b6
Merge 1.19.4 into 1.20
2023-08-15 21:19:16 -04:00
embeddedt
a918c09543
Merge 1.19.2 into 1.19.4
2023-08-15 21:19:15 -04:00
embeddedt
a06fca791a
Fix Forge experimental world suppression not working on first reopen
2023-08-15 21:18:39 -04:00
embeddedt
5203985a25
Merge 1.19.4 into 1.20
2023-08-13 16:38:04 -04:00
embeddedt
351e4d3fc6
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-08-13 16:37:56 -04:00
embeddedt
5079ce65ba
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-13 16:36:02 -04:00
embeddedt
47a04c66f1
Fix chunk future chain not being bypassed during entity load
...
Backport of https://github.com/neoforged/NeoForge/pull/99
2023-08-13 16:34:23 -04:00
embeddedt
d9184833ec
Introduce MixinExtras
2023-08-13 15:53:20 -04:00
embeddedt
2f92dbe12c
Update mixin
2023-08-12 12:13:31 -04:00
embeddedt
fab831f143
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-08-12 12:09:38 -04:00
embeddedt
073b8cb9de
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-08-12 12:09:21 -04:00
embeddedt
b776587f2d
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-12 12:02:43 -04:00
embeddedt
70a2a2194f
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-12 11:54:31 -04:00
embeddedt
d1c9be8900
Clean up warnings
2023-08-12 11:41:04 -04:00
embeddedt
df8da0823a
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-12 11:31:45 -04:00
embeddedt
21ee0dc1cf
Add warning for Connectedness and dynamic resources
2023-08-12 11:28:07 -04:00
embeddedt
507cc7eb14
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-08-11 19:55:28 -04:00
embeddedt
dcad671568
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-08-11 19:48:12 -04:00
embeddedt
0a18e9c1dc
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-11 19:45:31 -04:00
embeddedt
e949ed67ef
Merge 1.16 into 1.18
2023-08-11 19:44:22 -04:00
embeddedt
a51b1563b1
Try to make config reload message appear less often
...
Related: #210
2023-08-11 19:31:36 -04:00
embeddedt
180ac925f7
Merge 1.19.4 into 1.20
2023-08-08 10:27:08 -04:00
embeddedt
bb115f1d2f
Merge 1.19.2 into 1.19.4
2023-08-08 10:27:08 -04:00
embeddedt
6c465c7182
Update use of Component
2023-08-08 10:26:57 -04:00
embeddedt
46be9a801c
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-08 10:26:30 -04:00
embeddedt
b8d0e5fee2
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-08 10:26:09 -04:00
embeddedt
e2aa482187
Try to provide more guidance to users when reloading configs
2023-08-08 10:24:48 -04:00
embeddedt
8f31048619
Merge 1.19.4 into 1.20
2023-08-07 21:53:31 -04:00
embeddedt
52b66db729
Merge 1.19.2 into 1.19.4
2023-08-07 21:53:30 -04:00
embeddedt
39e8e4a2ae
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-07 21:53:21 -04:00
embeddedt
8875710f3d
Use client commands on 1.18+ for /mfrc
2023-08-07 21:51:54 -04:00
embeddedt
858551411b
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-08-07 11:22:35 -04:00
embeddedt
e0a170db92
Fix CTM block models not working (only item models worked)
2023-08-07 11:21:47 -04:00
embeddedt
fa17a5f745
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-08-07 10:47:02 -04:00
embeddedt
dc59c9bf0c
Update CTM integration for 1.19.4+
2023-08-07 10:46:19 -04:00
embeddedt
5165cf20c8
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-08-05 12:18:45 -04:00
embeddedt
2cb5acb9f9
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-08-05 12:17:50 -04:00
embeddedt
41ca9fc251
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-05 12:07:53 -04:00
embeddedt
1a25984e88
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-05 11:46:24 -04:00
embeddedt
c1277a2bf5
Make a copy of the top-level model list when collecting materials
...
This should prevent CMEs if material collection triggers a model
load
2023-08-05 11:42:44 -04:00
embeddedt
3df41090e4
Remove resource_key_equality patch as NeoForge fixes it in 1.20+
2023-08-04 10:05:55 -04:00
embeddedt
1b73ded110
Merge 1.19.4 into 1.20
2023-08-04 09:44:06 -04:00
embeddedt
6fe2674f5b
Merge 1.19.2 into 1.19.4
2023-08-04 09:44:05 -04:00
embeddedt
c3eb1369ac
Merge 1.18 into 1.19.2
2023-08-04 09:44:04 -04:00
embeddedt
9c380e52d1
Merge 1.16 into 1.18
2023-08-04 09:44:03 -04:00
embeddedt
e04b05dcc8
Don't return null for models we claim are in the faked model registry
2023-08-04 09:42:07 -04:00
embeddedt
c2695b1180
Merge 1.19.4 into 1.20
2023-08-03 20:04:49 -04:00
embeddedt
d3884d764d
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-08-03 20:02:55 -04:00
embeddedt
f05d33969f
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-03 20:02:15 -04:00
embeddedt
f225e6cf75
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-03 19:57:15 -04:00
embeddedt
14170ade1f
Implement /mfrc and /mfsrc commands to reload configs on client/server respectively
2023-08-03 19:45:37 -04:00
embeddedt
c8749940f7
Show log message after reloads are processed
2023-08-03 18:09:57 -04:00
embeddedt
dbff17a1ff
Better fix for config corruption
...
Defer posting of all config reload events to the main thread, and
don't process any until after the launch finishes. This should
hopefully fix some synchronization issues
2023-08-03 18:08:46 -04:00
embeddedt
1989f122c6
Remove locking system for Night Config files
...
This can cause deadlocks if mods themselves are also using their
own internal locks (Sophisticated Backpacks does this on 1.16 by
using a CHM)
This system will be replaced by a command/keybind to manually reload
configs
2023-08-03 17:54:30 -04:00
embeddedt
4972081d8a
Forcefully inject access transformers from mods even if a load error occurs
...
Related: https://github.com/neoforged/NeoForge/issues/43
2023-08-03 17:04:41 -04:00
embeddedt
331ad00758
Merge 1.19.4 into 1.20
2023-08-03 17:01:14 -04:00
embeddedt
b64fefa73c
Merge 1.19.2 into 1.19.4
2023-08-03 17:01:13 -04:00
embeddedt
c5f73c5e26
Merge 1.18 into 1.19.2
2023-08-03 17:01:12 -04:00
embeddedt
eac9edb13a
Fix Forge overriding ResourceKey.equals() with a slower implementation
2023-08-03 16:29:13 -04:00
embeddedt
19593b5574
Merge 1.19.4 into 1.20
2023-08-03 11:27:54 -04:00
embeddedt
89abcdb17c
Merge 1.19.2 into 1.19.4
2023-08-03 11:27:53 -04:00
embeddedt
89c7e58101
Merge 1.18 into 1.19.2
2023-08-03 11:27:52 -04:00
embeddedt
6d53262a9f
Merge 1.16 into 1.18
2023-08-03 11:27:51 -04:00
embeddedt
24792b96cc
Move ModernFix branding to right side of screen
2023-08-03 11:27:32 -04:00
embeddedt
02fd57f9a4
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-08-02 16:31:51 -04:00
embeddedt
f76ca049cc
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-08-02 16:31:07 -04:00
embeddedt
d77946a5ab
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-02 16:23:22 -04:00
embeddedt
0d190a4c80
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-02 16:17:45 -04:00
embeddedt
201db412a4
Rewrite tracking code for game load/world join timing
2023-08-02 16:08:36 -04:00
embeddedt
1d1e7b640a
Call Item.fillItemCategory() on all items when removing creative search trees
...
This fixes obscure issues caused by mods that accidentally rely on that
method to initialize other classes
Resolves https://github.com/Shadows-of-Fire/GatewaysToEternity/issues/29
2023-08-02 09:33:05 -04:00
embeddedt
858325e40d
Merge 1.19.4 into 1.20
2023-07-31 15:34:04 -04:00
embeddedt
c7604672fc
Merge 1.19.2 into 1.19.4
2023-07-31 15:34:03 -04:00
embeddedt
49f9644714
Merge 1.18 into 1.19.2
2023-07-31 15:34:02 -04:00
embeddedt
2bc5b39895
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-31 13:14:25 -04:00
embeddedt
3e4f1ab23a
Improve registry performance with large entry counts
2023-07-31 13:13:39 -04:00
embeddedt
ec2f6e8490
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-07-31 11:21:39 -04:00
embeddedt
472531d1b6
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-31 11:17:33 -04:00
embeddedt
4fe235cdbd
Workaround for mods instantiating PathResourcePack incorrectly
2023-07-31 11:14:38 -04:00
embeddedt
84bd756cdf
Merge 1.19.4 into 1.20
2023-07-30 13:11:12 -04:00
embeddedt
1a2981e5f1
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-07-30 13:09:42 -04:00
embeddedt
cedd9ac79b
Fix merge error
2023-07-30 13:09:32 -04:00
embeddedt
94f7b9295d
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-07-30 12:59:23 -04:00
embeddedt
78ff767b9e
Merge 1.18 into 1.19.2
2023-07-30 12:57:40 -04:00
embeddedt
762728c0a6
Merge 1.16 into 1.18
2023-07-30 12:57:39 -04:00
embeddedt
377f59847e
Skip dynamic resources single blockstate optimization when outside world
...
This should improve performance of model baking events during launch
2023-07-30 12:57:11 -04:00
embeddedt
92a204c253
Make FlagManager patch handle both impls of CoFH Core
2023-07-30 12:57:11 -04:00
embeddedt
4e3dc99479
Merge remote-tracking branch 'origin/1.19.4' into 1.20
2023-07-27 16:49:05 -04:00
embeddedt
e45acac6b6
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
2023-07-27 16:48:48 -04:00
embeddedt
3456b8cf23
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-27 16:41:07 -04:00
embeddedt
f3f66e1873
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-27 16:35:06 -04:00
embeddedt
13cc103be2
Switch to compile-only Arch Transformer
2023-07-27 16:26:16 -04:00
embeddedt
2663f5e3f4
Use Forge resource finder for directories instead of MF finder
2023-07-27 13:59:13 -04:00
embeddedt
7a648f0c5e
Merge 1.19.4 into 1.20
2023-07-26 22:03:11 -04:00
embeddedt
f1fa3a4c9c
Merge 1.19.2 into 1.19.4
2023-07-26 22:03:10 -04:00
embeddedt
213bcd1b2a
Fix getResource("") failing to return valid resource
...
Fixes #187
2023-07-26 22:02:21 -04:00
embeddedt
33e437f865
Hotfix for CoFH crash
...
Apparently BooleanSupplier is *not* used
2023-07-26 21:29:33 -04:00
embeddedt
c41728b97c
Merge 1.19.4 into 1.20
2023-07-24 16:05:01 -04:00
embeddedt
512ed02db2
Merge 1.19.2 into 1.19.4
2023-07-24 16:05:00 -04:00
embeddedt
5babe993df
Merge 1.18 into 1.19.2
2023-07-24 16:04:32 -04:00
embeddedt
6ae1992329
Merge 1.16 into 1.18
2023-07-24 16:04:31 -04:00
embeddedt
7f44701670
Display ModernFix version in early part of log
2023-07-24 16:03:29 -04:00
embeddedt
5338cca79b
Adjust patch for 1.18 FlagManager
2023-07-24 14:23:28 -04:00
embeddedt
bb5e71c651
Remove second config warning, now redundant
2023-07-23 20:37:57 -04:00
embeddedt
437eb9f793
Merge 1.19.4 into 1.20
2023-07-23 19:29:31 -04:00
embeddedt
23f5af93ce
Merge 1.19.2 into 1.19.4
2023-07-23 19:29:30 -04:00
embeddedt
55f6e86a56
Merge 1.18 into 1.19.2
2023-07-23 19:29:29 -04:00
embeddedt
aa50c4466e
Fix memory leak in Blueprint
...
Implements https://github.com/team-abnormals/blueprint/pull/195 , which
is still not released on 1.19.2, and may never be released on 1.18.2
2023-07-23 19:28:16 -04:00
embeddedt
1889ef2d8c
Merge 1.19.4 into 1.20
2023-07-23 19:23:27 -04:00
embeddedt
3a96f63798
Merge 1.19.2 into 1.19.4
2023-07-23 19:23:26 -04:00
embeddedt
18db311712
Merge 1.18 into 1.19.2
2023-07-23 19:23:26 -04:00
embeddedt
000e9746ba
Merge 1.16 into 1.18
2023-07-23 19:23:25 -04:00
embeddedt
7fa6c45f07
Fix dragging in ModLoader too early
2023-07-23 19:21:00 -04:00
embeddedt
90f6f6d68d
Merge 1.19.4 into 1.20
2023-07-23 18:33:34 -04:00
embeddedt
b24f82d257
Merge 1.19.2 into 1.19.4
2023-07-23 18:33:33 -04:00
embeddedt
bbcc58f103
Merge 1.18 into 1.19.2
2023-07-23 18:33:26 -04:00
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
821f87b880
Merge 1.19.4 into 1.20
2023-07-22 11:22:05 -04:00
embeddedt
ecbcc6dcaa
Merge 1.19.2 into 1.19.4
2023-07-22 11:22:04 -04:00
embeddedt
cd9adbdf7e
Merge 1.18 into 1.19.2
2023-07-22 11:22:03 -04:00
embeddedt
6efa7f3c5b
Merge 1.16 into 1.18
2023-07-22 11:22:02 -04:00
embeddedt
48409fc572
Fix concurrency issue in CoFH FlagManager
...
Related: #173
2023-07-22 11:19:20 -04:00
embeddedt
373a10f12c
Fix crash with dynamic resources if mods depend on themselves
2023-07-22 11:06:11 -04:00
embeddedt
18cec4f88d
Fix NPE from config fixers
...
Related: #174
2023-07-22 09:56:25 -04:00
embeddedt
4031b65099
Merge 1.19.4 into 1.20
2023-07-21 11:15:22 -04:00
embeddedt
bc09210ada
Merge 1.19.2 into 1.19.4
2023-07-21 11:15:22 -04:00
embeddedt
affb24fc11
Merge 1.18 into 1.19.2
2023-07-21 11:15:21 -04:00
embeddedt
b5870b3ae4
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-21 11:15:11 -04:00
embeddedt
edb3da4f74
Fix deadlock with the config fixers by moving all locking to one object
2023-07-21 11:13:56 -04:00
embeddedt
c6eb703648
Merge 1.19.4 into 1.20
2023-07-20 21:35:15 -04:00
embeddedt
24598ac463
Merge 1.19.2 into 1.19.4
2023-07-20 21:35:14 -04:00
embeddedt
b98377d5cb
Merge 1.16 into 1.18
2023-07-20 21:35:13 -04:00
embeddedt
08bf8ecc89
Merge 1.18 into 1.19.2
2023-07-20 21:35:13 -04:00
