Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorianMichael committed Sep 16, 2023
2 parents a449541 + 7b4cd8f commit 7ea0500
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/viafabricplus/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/viafabricplus/lang/pl_pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit 7ea0500

Please sign in to comment.