From 96c72b55e4a9a5fc34f9b5142acffe34c7d6c169 Mon Sep 17 00:00:00 2001 From: osfanbuff63 <91388253+osfanbuff63@users.noreply.github.com> Date: Mon, 11 Sep 2023 18:14:17 +0000 Subject: [PATCH 1/2] Actually link to MemoryLeakFix in the incompatibilities section (#240) Just saw this was linking to Krypton instead of MemoryLeakFix - this PR fixes that. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 62303b6d..d70d3e61 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ ViaFabricPlus is intended to replace [multiconnect](https://github.com/Earthcomp ### Breaks - ***[ViaFabric (*)](https://github.com/ViaVersion/ViaFabric)*** - ***[krypton (<= 0.2.2)](https://github.com/astei/krypton)*** -- ***[MemoryLeakFix (<= 1.1.0)](https://github.com/astei/krypton)*** +- ***[MemoryLeakFix (<= 1.1.0)](https://github.com/fxmorin/MemoryLeakFix)*** ### Conflicts - ***[DashLoader (*)](https://github.com/alphaqu/DashLoader/tree/fabric-1.20)*** - Font rendering related fixes aren't working From 7b4cd8f91872294384da9dcd104c3f3cb5b6573b Mon Sep 17 00:00:00 2001 From: Blay Date: Tue, 12 Sep 2023 13:19:41 +0200 Subject: [PATCH 2/2] updated pl_pl.json and deleted a duplicate key from en_us.json (#241) --- src/main/resources/assets/viafabricplus/lang/en_us.json | 1 - src/main/resources/assets/viafabricplus/lang/pl_pl.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/viafabricplus/lang/en_us.json b/src/main/resources/assets/viafabricplus/lang/en_us.json index 8c3f26d8..7c111a59 100644 --- a/src/main/resources/assets/viafabricplus/lang/en_us.json +++ b/src/main/resources/assets/viafabricplus/lang/en_us.json @@ -23,7 +23,6 @@ "misc.viafabricplus.vanillaonly": "Vanilla only", "misc.viafabricplus.kick": "Kick", "misc.viafabricplus.cancelnotify": "Cancel and notify", - "misc.viafabricplus.cancel": "Cancel", "settings.viafabricplus.authentication": "Authentication", "settings.viafabricplus.experimental": "Experimental", diff --git a/src/main/resources/assets/viafabricplus/lang/pl_pl.json b/src/main/resources/assets/viafabricplus/lang/pl_pl.json index 35f46236..1c7a10c4 100644 --- a/src/main/resources/assets/viafabricplus/lang/pl_pl.json +++ b/src/main/resources/assets/viafabricplus/lang/pl_pl.json @@ -21,6 +21,8 @@ "misc.viafabricplus.addserverscreenbuttontitle": "Ustaw wersję dla tego serwera", "misc.viafabricplus.all": "Vanilla i modyfikacje", "misc.viafabricplus.vanillaonly": "Tylko vanilla", + "misc.viafabricplus.kick": "Wyrzuć", + "misc.viafabricplus.cancelnotify": "Anuluj i powiadom", "settings.viafabricplus.authentication": "Uwierzytelnianie", "settings.viafabricplus.experimental": "Eksperymenty", @@ -37,6 +39,7 @@ "general.viafabricplus.creative": "Usuwaj niedostępne przedmioty z ekwipunku trybu kreatywnego", "general.viafabricplus.autodetect": "Automatycznie wykrywaj wersję gry", "general.viafabricplus.advertised": "Pokazuj informacje dotyczące tłumaczenia pakietów po najechaniu na ikonę pingu w menu multiplayer", + "general.viafabricplus.ignoreerrors": "Sposób obsługiwania błędów tłumaczenia pakietów", "bedrock.viafabricplus.confirmtransfer": "Pytaj, żeby potwierdzić przełączanie do innych serwerów", "bedrock.viafabricplus.authentication": "Naciśnij, aby ustawić konto dla minecraft bedrock edition",