aboutsummaryrefslogtreecommitdiff
path: root/forge
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2024-09-17 14:06:55 +0800
committershedaniel <daniel@shedaniel.me>2024-09-17 14:10:43 +0800
commitccf3dcd60aa6c1d079dd57c59d9a89c2ca60b1e7 (patch)
tree2fc4f5f476dfd64519c413bf56559fae8a4f1d63 /forge
parent97adf5d548ddb76d94e1c0542573cd21b7c6827c (diff)
parentb666943c4f14cfc6a8f1db7d3ac7fa2c7c0519da (diff)
downloadRoughlyEnoughItems-ccf3dcd60aa6c1d079dd57c59d9a89c2ca60b1e7.tar.gz
RoughlyEnoughItems-ccf3dcd60aa6c1d079dd57c59d9a89c2ca60b1e7.tar.bz2
RoughlyEnoughItems-ccf3dcd60aa6c1d079dd57c59d9a89c2ca60b1e7.zip
Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
# Conflicts: # default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java # fabric/src/main/resources/roughlyenoughitems.accessWidener # forge/src/main/resources/META-INF/accesstransformer.cfg
Diffstat (limited to 'forge')
-rw-r--r--forge/src/main/resources/META-INF/accesstransformer.cfg2
1 files changed, 2 insertions, 0 deletions
diff --git a/forge/src/main/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg
index 082c7dea2..6eb5af3b2 100644
--- a/forge/src/main/resources/META-INF/accesstransformer.cfg
+++ b/forge/src/main/resources/META-INF/accesstransformer.cfg
@@ -48,3 +48,5 @@ public-f net.minecraft.client.gui.font.CodepointMap f_283938_ # blockMap
public-f net.minecraft.client.gui.font.CodepointMap f_283773_ # blockConstructor
public net.minecraft.world.item.CreativeModeTab f_256824_ # displayItemsGenerator
public net.minecraft.world.item.CreativeModeTab$ItemDisplayBuilder
+public net.minecraft.client.multiplayer.ClientLevel f_104561_ # connection
+public net.minecraft.client.multiplayer.MultiPlayerGameMode f_105190_ # connection \ No newline at end of file