From ceee1f181f3a1326edb55059d77d28e025fa263d Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Mon, 20 Mar 2023 16:06:47 -0300 Subject: [PATCH] bump version. copy/paste some lang entries --- gradle.properties | 2 +- src/main/java/appeng/client/gui/AEBaseMEGui.java | 2 +- src/main/java/appeng/core/localization/ButtonToolTips.java | 2 +- src/main/resources/assets/appliedenergistics2/lang/de_de.lang | 2 +- src/main/resources/assets/appliedenergistics2/lang/en_us.lang | 2 +- src/main/resources/assets/appliedenergistics2/lang/ja_jp.lang | 1 + src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang | 1 + src/main/resources/assets/appliedenergistics2/lang/zh_cn.lang | 1 + 8 files changed, 8 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index cb275df23..1dc281fbc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ aebuild=7 aegroup=appeng aebasename=appliedenergistics2 extended=extended_life -extendedversion=v0.55.9 +extendedversion=v0.55.11 ######################################################### # Versions # ######################################################### diff --git a/src/main/java/appeng/client/gui/AEBaseMEGui.java b/src/main/java/appeng/client/gui/AEBaseMEGui.java index bb7e9f43d..cba578caa 100644 --- a/src/main/java/appeng/client/gui/AEBaseMEGui.java +++ b/src/main/java/appeng/client/gui/AEBaseMEGui.java @@ -77,7 +77,7 @@ public abstract class AEBaseMEGui extends AEBaseGui { } if (myStack.isCraftable() && AEConfig.instance().isShowCraftableTooltip()) { - final String local = ButtonToolTips.ItemCraftable.getLocal(); + final String local = ButtonToolTips.ItemsCraftable.getLocal(); currentToolTip.add(TextFormatting.GRAY + local); } diff --git a/src/main/java/appeng/core/localization/ButtonToolTips.java b/src/main/java/appeng/core/localization/ButtonToolTips.java index 485d8ce2c..fbbdd3223 100644 --- a/src/main/java/appeng/core/localization/ButtonToolTips.java +++ b/src/main/java/appeng/core/localization/ButtonToolTips.java @@ -161,7 +161,7 @@ public enum ButtonToolTips { // Used in the tooltips of the items in the terminal, when moused over ItemsStored, ItemsRequestable, - ItemCraftable, + ItemsCraftable, SchedulingMode, SchedulingModeDefault, diff --git a/src/main/resources/assets/appliedenergistics2/lang/de_de.lang b/src/main/resources/assets/appliedenergistics2/lang/de_de.lang index 07c65d9b7..14f2141ff 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/de_de.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/de_de.lang @@ -323,7 +323,7 @@ gui.tooltips.appliedenergistics2.SchedulingModeRoundRobin=Exportiere im Round-Ro gui.tooltips.appliedenergistics2.SchedulingModeRandom=Exportiere im Zufallsmodus. gui.tooltips.appliedenergistics2.ItemsStored=Items gespeichert: %s gui.tooltips.appliedenergistics2.ItemsRequestable=Anfragbare Items: %s -gui.tooltips.appliedenergistics2.ItemCraftable=Herstellbar +gui.tooltips.appliedenergistics2.ItemsCraftable=Herstellbar // Units gui.appliedenergistics2.units.appliedenergstics=AE diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang index f004c9981..360edaf42 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/en_us.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/en_us.lang @@ -354,7 +354,7 @@ gui.tooltips.appliedenergistics2.FilterModeKeep=Restore previous search filter. gui.tooltips.appliedenergistics2.FilterModeClear=Clear on each opening. gui.tooltips.appliedenergistics2.ItemsStored=Items Stored: %s gui.tooltips.appliedenergistics2.ItemsRequestable=Items Requestable: %s -gui.tooltips.appliedenergistics2.ItemCraftable=Craftable +gui.tooltips.appliedenergistics2.ItemsCraftable=Craftable gui.tooltips.appliedenergistics2.P2PFrequency=Frequency: %s gui.tooltips.appliedenergistics2.MultiplyByTwo=Double the items set gui.tooltips.appliedenergistics2.MultiplyByTwoDesc=Will try to double the items set in the crafting slots diff --git a/src/main/resources/assets/appliedenergistics2/lang/ja_jp.lang b/src/main/resources/assets/appliedenergistics2/lang/ja_jp.lang index 947cf7164..054d26957 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ja_jp.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ja_jp.lang @@ -359,6 +359,7 @@ gui.tooltips.appliedenergistics2.FilterModeKeep=以前の検索フィルター gui.tooltips.appliedenergistics2.FilterModeClear=GUIを開くたびにリセットする gui.tooltips.appliedenergistics2.ItemsStored=在庫アイテム: %s gui.tooltips.appliedenergistics2.ItemsRequestable=要求可能なアイテム: %s +gui.tooltips.appliedenergistics2.ItemsCraftable=クラフト可能 gui.tooltips.appliedenergistics2.P2PFrequency=周波数: %s gui.tooltips.appliedenergistics2.MultiplyByTwo=アイテムを倍にする gui.tooltips.appliedenergistics2.MultiplyByTwoDesc=スロットのアイテム数を倍にすることを試みる diff --git a/src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang b/src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang index 822a244a3..a85e762ec 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/ru_ru.lang @@ -354,6 +354,7 @@ gui.tooltips.appliedenergistics2.FilterModeKeep=Восстановить пре gui.tooltips.appliedenergistics2.FilterModeClear=Очищать при каждом открытии. gui.tooltips.appliedenergistics2.ItemsStored=Хранящиеся предметы: %s gui.tooltips.appliedenergistics2.ItemsRequestable=Запрашиваемые предметы: %s +gui.tooltips.appliedenergistics2.ItemsCraftable=Можно создать gui.tooltips.appliedenergistics2.P2PFrequency=Частота: %s gui.tooltips.appliedenergistics2.MultiplyByTwo=Удвоить колличество предметов gui.tooltips.appliedenergistics2.MultiplyByTwoDesc=Удвоить колличество предметов, установленных в слотах для крафта diff --git a/src/main/resources/assets/appliedenergistics2/lang/zh_cn.lang b/src/main/resources/assets/appliedenergistics2/lang/zh_cn.lang index e9cb16279..7ddc7cd0e 100644 --- a/src/main/resources/assets/appliedenergistics2/lang/zh_cn.lang +++ b/src/main/resources/assets/appliedenergistics2/lang/zh_cn.lang @@ -354,6 +354,7 @@ gui.tooltips.appliedenergistics2.FilterModeKeep=重载上一个搜索过滤器 gui.tooltips.appliedenergistics2.FilterModeClear=在每次打开时清空。 gui.tooltips.appliedenergistics2.ItemsStored=存储物品：%s gui.tooltips.appliedenergistics2.ItemsRequestable=可请求：%s +gui.tooltips.appliedenergistics2.ItemsCraftable=可合成 gui.tooltips.appliedenergistics2.P2PFrequency=频率：%s gui.tooltips.appliedenergistics2.MultiplyByTwo=物品数量×2 gui.tooltips.appliedenergistics2.MultiplyByTwoDesc=将尝试将格内物品数量×2