diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-09-17 21:54:19 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-09-17 22:11:00 +0800 |
| commit | ed9454b4d82fbfc4e7b80369cc0c9ba5b6bc23d6 (patch) | |
| tree | 70b204e876ab9aa640c29982b432bcc863a2a254 /neoforge/src/main | |
| parent | 581543cb56b8a85d32d7237e0d37fb5ad24da9b5 (diff) | |
| parent | 20317a973895ad237fb58adc2b2b1ece8a45cea4 (diff) | |
| download | RoughlyEnoughItems-ed9454b4d82fbfc4e7b80369cc0c9ba5b6bc23d6.tar.gz RoughlyEnoughItems-ed9454b4d82fbfc4e7b80369cc0c9ba5b6bc23d6.tar.bz2 RoughlyEnoughItems-ed9454b4d82fbfc4e7b80369cc0c9ba5b6bc23d6.zip | |
Merge remote-tracking branch 'origin/14.x-1.20.4' into 15.x-1.20.5
# Conflicts:
# neoforge/src/main/resources/META-INF/accesstransformer.cfg
Diffstat (limited to 'neoforge/src/main')
| -rw-r--r-- | neoforge/src/main/resources/META-INF/accesstransformer.cfg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/neoforge/src/main/resources/META-INF/accesstransformer.cfg b/neoforge/src/main/resources/META-INF/accesstransformer.cfg index 2d87bddf1..17e4ec408 100644 --- a/neoforge/src/main/resources/META-INF/accesstransformer.cfg +++ b/neoforge/src/main/resources/META-INF/accesstransformer.cfg @@ -48,4 +48,5 @@ public-f net.minecraft.client.gui.font.CodepointMap blockMap # blockMap public-f net.minecraft.client.gui.font.CodepointMap blockConstructor # blockConstructor public net.minecraft.world.item.CreativeModeTab displayItemsGenerator # displayItemsGenerator public net.minecraft.world.item.CreativeModeTab$ItemDisplayBuilder +public net.minecraft.client.multiplayer.ClientLevel connection # connection public net.minecraft.client.multiplayer.MultiPlayerGameMode connection # connection |