FlorianMichael dac8f0deef Merge remote-tracking branch 'origin/main' into 1.20-recode ... # Conflicts: # src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinConnectScreen.java # src/main/java/de/florianmichael/viafabricplus/injection/mixin/base/MixinDownloadingTerrainScreen.java # src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinInGameHud.java # src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinItemRenderer.java # src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinClientPlayerEntity.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/MappedSlotEntry.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/ClassicItemSelectionScreen.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/base/ForceVersionScreen.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/base/ProtocolSelectionScreen.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/settings/SettingsScreen.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/settings/settingrenderer/BooleanSettingRenderer.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/settings/settingrenderer/ButtonSettingRenderer.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/settings/settingrenderer/ModeSettingRenderer.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/settings/settingrenderer/ProtocolSyncBooleanSettingRenderer.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/settings/settingrenderer/meta/TitleRenderer.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/thirdparty/BetaCraftScreen.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/thirdparty/classicube/ClassiCubeLoginScreen.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/thirdparty/classicube/ClassiCubeMFAScreen.java # src/main/java/de/florianmichael/viafabricplus/ui/screen/impl/thirdparty/classicube/ClassiCubeServerListScreen.java		2023-05-13 16:21:47 +02:00
..
de/florianmichael/viafabricplus	Merge remote-tracking branch 'origin/main' into 1.20-recode	2023-05-13 16:21:47 +02:00