From 5f7287fd21a63451db446b4a51f1546811416119 Mon Sep 17 00:00:00 2001 From: TheScienceDemon Date: Thu, 7 Mar 2024 21:52:32 +0100 Subject: [PATCH 1/4] Add more localisation support to main menu --- config/CustomMainMenu/mainmenu.json | 4 ++-- resources/langfiles/lang/en_us.lang | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config/CustomMainMenu/mainmenu.json b/config/CustomMainMenu/mainmenu.json index 32c52ace5..553563266 100644 --- a/config/CustomMainMenu/mainmenu.json +++ b/config/CustomMainMenu/mainmenu.json @@ -61,7 +61,7 @@ "height": 20, "imageWidth": 200, "imageHeight": 20, - "tooltip": "§a#modsactive#§r/§e#modsloaded#§7 mods loaded.§r", + "tooltip": "susy.menu.mods.tooltip", "texture": "supersymmetry:mainmenu/button.png", "hoverTextColor": 65484, "clickSound": "block.lever.click", @@ -89,7 +89,7 @@ }, "quit": { "text": "menu.quit", - "hoverText": "You can never escape Greg.", + "hoverText": "susy.menu.quit.hover", "alignment": "center", "posX": -150, "posY": 55, diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang index 2a6a1d3d1..23d7a80a1 100644 --- a/resources/langfiles/lang/en_us.lang +++ b/resources/langfiles/lang/en_us.lang @@ -2338,9 +2338,11 @@ gregtech.block_group_members.extractable_logs_2.name=Acacia and Dark Oak gregtech.block_group_members.latex_logs.name=Rubber Log # Main Menu +susy.menu.mods.tooltip=§a#modsactive#§r/§e#modsloaded#§7 mods loaded.§r susy.menu.options=Options susy.menu.discord=Discord Server susy.menu.reportabug=Report A Bug susy.menu.openfolder=Open MC Folder susy.menu.refresh=Refresh Menu -susy.menu.replayviewer=Replay Viewer \ No newline at end of file +susy.menu.replayviewer=Replay Viewer +susy.menu.quit.hover=You can never escape Greg. \ No newline at end of file From 68bb475f56504fb94db7516f3e1027eb93bcd187 Mon Sep 17 00:00:00 2001 From: TheScienceDemon Date: Thu, 7 Mar 2024 21:49:37 +0100 Subject: [PATCH 2/4] Translate Main Menu [DE] --- resources/langfiles/lang/de_de.lang | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 resources/langfiles/lang/de_de.lang diff --git a/resources/langfiles/lang/de_de.lang b/resources/langfiles/lang/de_de.lang new file mode 100644 index 000000000..fc45b4dbf --- /dev/null +++ b/resources/langfiles/lang/de_de.lang @@ -0,0 +1,10 @@ +# Main Menu +fml.menu.mods=Modifizierungen +susy.menu.mods.tooltip=§a#modsactive#§r/§e#modsloaded#§7 Modifizierungen geladen.§r +susy.menu.options=Einstellungen +susy.menu.discord=Discord-Server +susy.menu.reportabug=Spielfehler melden +susy.menu.openfolder=Minecraft-Ordner öffnen +susy.menu.refresh=Menü aktualisieren +susy.menu.replayviewer=Wiederholungen +susy.menu.quit.hover=Du kannst GregTech nicht entkommen. \ No newline at end of file From ff08c7e524222abe2a1c361c5e78e8ce02813060 Mon Sep 17 00:00:00 2001 From: TheScienceDemon Date: Thu, 7 Mar 2024 22:07:03 +0100 Subject: [PATCH 3/4] Make mod counter work again `#modsactive#` and `#modsloaded#` don't work when used as localised strings --- config/CustomMainMenu/mainmenu.json | 2 +- resources/langfiles/lang/de_de.lang | 1 - resources/langfiles/lang/en_us.lang | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/config/CustomMainMenu/mainmenu.json b/config/CustomMainMenu/mainmenu.json index 553563266..ad3d70afd 100644 --- a/config/CustomMainMenu/mainmenu.json +++ b/config/CustomMainMenu/mainmenu.json @@ -61,7 +61,7 @@ "height": 20, "imageWidth": 200, "imageHeight": 20, - "tooltip": "susy.menu.mods.tooltip", + "tooltip": "§a#modsactive#§r/§e#modsloaded#§r", "texture": "supersymmetry:mainmenu/button.png", "hoverTextColor": 65484, "clickSound": "block.lever.click", diff --git a/resources/langfiles/lang/de_de.lang b/resources/langfiles/lang/de_de.lang index fc45b4dbf..83f68da45 100644 --- a/resources/langfiles/lang/de_de.lang +++ b/resources/langfiles/lang/de_de.lang @@ -1,6 +1,5 @@ # Main Menu fml.menu.mods=Modifizierungen -susy.menu.mods.tooltip=§a#modsactive#§r/§e#modsloaded#§7 Modifizierungen geladen.§r susy.menu.options=Einstellungen susy.menu.discord=Discord-Server susy.menu.reportabug=Spielfehler melden diff --git a/resources/langfiles/lang/en_us.lang b/resources/langfiles/lang/en_us.lang index 23d7a80a1..856106ff3 100644 --- a/resources/langfiles/lang/en_us.lang +++ b/resources/langfiles/lang/en_us.lang @@ -2338,7 +2338,6 @@ gregtech.block_group_members.extractable_logs_2.name=Acacia and Dark Oak gregtech.block_group_members.latex_logs.name=Rubber Log # Main Menu -susy.menu.mods.tooltip=§a#modsactive#§r/§e#modsloaded#§7 mods loaded.§r susy.menu.options=Options susy.menu.discord=Discord Server susy.menu.reportabug=Report A Bug From 8c7f007cd756b5d1f3f17a2fe25051b7d7e7da27 Mon Sep 17 00:00:00 2001 From: TheScienceDemon Date: Thu, 7 Mar 2024 22:20:10 +0100 Subject: [PATCH 4/4] Rename Replay Mod button in main menu [DE] --- resources/langfiles/lang/de_de.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/langfiles/lang/de_de.lang b/resources/langfiles/lang/de_de.lang index 83f68da45..ab50f5c82 100644 --- a/resources/langfiles/lang/de_de.lang +++ b/resources/langfiles/lang/de_de.lang @@ -5,5 +5,5 @@ susy.menu.discord=Discord-Server susy.menu.reportabug=Spielfehler melden susy.menu.openfolder=Minecraft-Ordner öffnen susy.menu.refresh=Menü aktualisieren -susy.menu.replayviewer=Wiederholungen +susy.menu.replayviewer=Aufnahmen susy.menu.quit.hover=Du kannst GregTech nicht entkommen. \ No newline at end of file