From 9e55b44b710f38c63a4bfd17d0b07318d5c68535 Mon Sep 17 00:00:00 2001 From: Daniel She Date: Mon, 25 Feb 2019 21:18:26 +0800 Subject: REI v2.3.1 (#40) - API Changes - Updated Config Screen - Added Tipped Arrows Recipes - Updated Mappings - Added IRecipeHelper - Turning things to Optional - Removed Cheats button, now included with the new config button - Buttons for switching gamemodes / time / weather (default: off) [Maybe not in this update] - Clickable Labels - 3+ recipes at the same time - Fixed RecipeBaseWidget bad rendering when too big - Fixed #42 Patched up item deleting & cheating - Choose Page Dialog --- .../assets/roughlyenoughitems/lang/de_de.json | 10 +++--- .../assets/roughlyenoughitems/lang/en_ud.json | 10 +++--- .../assets/roughlyenoughitems/lang/en_us.json | 37 +++++++++++++++------ .../assets/roughlyenoughitems/lang/et_ee.json | 10 +++--- .../assets/roughlyenoughitems/lang/fr_fr.json | 14 ++++---- .../assets/roughlyenoughitems/lang/lol_us.json | 10 +++--- .../assets/roughlyenoughitems/lang/zh_cn.json | 10 +++--- .../assets/roughlyenoughitems/lang/zh_tw.json | 10 +++--- .../textures/gui/recipecontainer.png | Bin 7421 -> 5819 bytes 9 files changed, 64 insertions(+), 47 deletions(-) (limited to 'src/main/resources/assets') diff --git a/src/main/resources/assets/roughlyenoughitems/lang/de_de.json b/src/main/resources/assets/roughlyenoughitems/lang/de_de.json index 74f3d2f5c..ec755bcc9 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/de_de.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/de_de.json @@ -18,10 +18,10 @@ "category.rei.brewing.reactant": "§Zutat", "category.rei.brewing.result": "§eEntstehender Trank", "text.rei.config": "Einstellung", - "text.rei.centre_searchbox": "Rechte Suchbox: ", + "text.rei.config.side_search_box": "Rechte Suchbox: ", "text.rei.cheat_items": "[{item_name}] x{item_count} {player_name} gegeben.", "text.rei.failed_cheat_items": "§cItems geben fehlgeschlagen.", - "text.rei.list_ordering": "Item Listen Reihenfolge", + "text.rei.config.list_ordering": "Item Listen Reihenfolge", "ordering.rei.ascending": "Aufsteigend", "ordering.rei.descending": "Absteigend", @@ -30,15 +30,15 @@ "ordering.rei.item_groups": "Itemgruppen", "text.speed_craft.failed_move_items": "§cItems können nicht bewegt werden!", "text.speed_craft.move_items": "Items bewegen", - "text.rei.enable_craftable_only": "Aktiviere nur Herstellen: ", + "text.rei.config.enable_craftable_only": "Aktiviere nur Herstellen: ", "text.rei.showing_craftable": "Zeige herstellbar", "text.rei.showing_all": "Zeige alle", "text.rei.delete_items": "§cLösche Item", "text.rei.check_updates": "Überprüfe Updates: ", "text.rei.update_outdated": "§6REI ist veraltet!\n§6Aktuell: §a%s §6Letzte: §a%s\n§6Update Priorität: §a%s", "text.rei.update_changelog_line": "§6- %s", - "text.rei.load_default_plugin": "Lade Standard-Plugin: ", - "text.rei.load_default_plugin.restart_tooltip": "Du möchtest das wahrscheinlich niemals deaktivieren.\nStarte Minecraft erneut, um die Einstellungen zu übernehmen." + "text.rei.config.load_default_plugin": "Lade Standard-Plugin: ", + "text.rei.config.load_default_plugin.restart_tooltip": "Du möchtest das wahrscheinlich niemals deaktivieren.\nStarte Minecraft erneut, um die Einstellungen zu übernehmen." diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_ud.json b/src/main/resources/assets/roughlyenoughitems/lang/en_ud.json index b3c259940..d72b60bd5 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/en_ud.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/en_ud.json @@ -18,12 +18,12 @@ "category.rei.brewing.reactant": "§eʇuǝᴉpǝɹƃuI", "category.rei.brewing.result": "§euoᴉʇoԀ pǝʇlnsǝɹ", "text.rei.config": "ƃᴉɟuoƆ", - "text.rei.side_searchbox": "xoq ɥɔɹɐǝS ǝpᴉS: ", - "text.rei.mirror_rei": "sʇǝƃpᴉM IƎɹ ɹoɹɹᴉW: ", + "text.rei.config.side_search_box": "xoq ɥɔɹɐǝS ǝpᴉS: ", + "text.rei.config.mirror_rei": "sʇǝƃpᴉM IƎɹ ɹoɹɹᴉW: ", "text.rei.cheat_items": "˙{player_name} oʇ {item_count}x [{item_name}] uǝʌᴉפ", "text.rei.failed_cheat_items": "§c˙sɯǝʇᴉ ǝʌᴉƃ oʇ pǝlᴉɐℲ", - "text.rei.list_ordering": "ƃuᴉɹǝpɹO ʇsᴉ˥ ɯǝʇI", - "text.rei.list_ordering_button": "%s [%s]", + "text.rei.config.list_ordering": "ƃuᴉɹǝpɹO ʇsᴉ˥ ɯǝʇI", + "text.rei.config.list_ordering_button": "%s [%s]", "ordering.rei.ascending": "ƃuᴉpuǝɔs∀", "ordering.rei.descending": "ƃuᴉpuǝɔsǝp", "ordering.rei.registry": "ʎɹʇsᴉƃǝɹ", @@ -31,7 +31,7 @@ "ordering.rei.item_groups": "sdnoɹפ ɯǝʇI", "text.speed_craft.failed_move_items": "§c¡sɯǝʇᴉ ǝʌoɯ ʇ,uɐƆ", "text.speed_craft.move_items": "sɯǝʇI ǝʌoW", - "text.rei.enable_craftable_only": "ɹǝʇlᴉℲ ǝlqɐʇɟɐɹƆ ǝlqɐuƎ: ", + "text.rei.config.enable_craftable_only": "ɹǝʇlᴉℲ ǝlqɐʇɟɐɹƆ ǝlqɐuƎ: ", "text.rei.showing_craftable": "ǝlqɐʇɟɐɹƆ ƃuᴉʍoɥS", "text.rei.showing_all": "ll∀ ƃuᴉʍoɥS", "text.rei.delete_items": "§cɯǝʇI ǝʇǝlǝp", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json index 0ff4cd75b..080a78378 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json @@ -3,8 +3,9 @@ "key.roughlyenoughitems.recipe_keybind": "Show Recipe", "key.roughlyenoughitems.hide_keybind": "Hide/Show REI", "key.roughlyenoughitems.usage_keybind": "Show Uses", - "text.rei.cheat": "Cheat", - "text.rei.nocheat": "§c§mCheat", + "text.rei.config.general": "General", + "text.rei.config.cheating": "Cheating:", + "text.rei.cheating": "Cheating", "category.rei.crafting": "Crafting", "category.rei.smelting": "Smelting", "category.rei.smelting.fuel": "§eFuel", @@ -18,12 +19,13 @@ "category.rei.brewing.reactant": "§eIngredient", "category.rei.brewing.result": "§eResulted Potion", "text.rei.config": "Config", - "text.rei.side_searchbox": "Side Search Box: ", - "text.rei.mirror_rei": "Mirror REI Widgets: ", - "text.rei.cheat_items": "Given [{item_name}] x{item_count} to {player_name}.", + "text.rei.config_tooltip": "Open Config Screen\n§7Shift-Click to toggle cheat mode", + "text.rei.config.side_search_box": "Side Search Box: ", + "text.rei.config.mirror_rei": "Mirror REI Widgets: ", + "text.rei.cheat_items": "Gave [{item_name}] x{item_count} to {player_name}.", "text.rei.failed_cheat_items": "§cFailed to give items.", - "text.rei.list_ordering": "Item List Ordering", - "text.rei.list_ordering_button": "%s [%s]", + "text.rei.config.list_ordering": "Item List Ordering:", + "text.rei.config.list_ordering_button": "%s [%s]", "ordering.rei.ascending": "Ascending", "ordering.rei.descending": "Descending", "ordering.rei.registry": "Registry", @@ -31,18 +33,33 @@ "ordering.rei.item_groups": "Item Groups", "text.speed_craft.failed_move_items": "§cCan't move items!", "text.speed_craft.move_items": "Move Items", - "text.rei.enable_craftable_only": "Enable Craftable Filter: ", + "text.rei.config.enable_craftable_only": "Enable Craftable Filter: ", "text.rei.showing_craftable": "Showing Craftable", "text.rei.showing_all": "Showing All", "text.rei.delete_items": "§cDelete Item", "text.rei.check_updates": "Check Updates: ", "text.rei.update_outdated": "§6REI is outdated!\n§6Current: §a%s §6Latest: §a%s\n§6Update Priority: §a%s", "text.rei.update_changelog_line": "§6- %s", - "text.rei.load_default_plugin": "Load Default Plugin: ", - "text.rei.load_default_plugin.restart_tooltip": "You probably never want to disable this.\nRestart Minecraft to apply this setting.", + "text.rei.config.load_default_plugin": "Load Default Plugin: ", + "text.rei.config.load_default_plugin.restart_tooltip": "You probably never want to disable this.\nRestart Minecraft to apply this setting.", "text.rei.credits": "Credits", "text.rei.left_arrow": "<", "text.rei.right_arrow": ">", + "text.rei.give_command": "Cheat Give Command:", + "text.rei.gamemode_command": "Cheat Give Command:", + "text.rei.give_command.tooltip": "This command is only used in servers when cheating.", + "text.rei.give_command.suggestion": "Enter command.", + "text.rei.view_all_categories": "View All Categories", + "text.rei.go_back_first_page": "Back to Page 1", + "text.rei.config.appearance": "Appearance", + "text.rei.config.modules": "Modules", + "text.rei.config.advanced": "Advanced", + "text.rei.choose_page": "Choose Page", + "text.rei.config.disable_credits_button": "Disable Credits Button:", + "text.rei.config.max_recipes_per_page": "Maximum Recipes Each Page:", + "text.rei.config.enable_util_buttons": "Enable Utils Buttons:", + "text.rei.gamemode_button.tooltip": "Switch GameMode\n§7Switch to %s mode.", + "text.rei.weather_button.tooltip": "Switch Weather\n§7Switch to %s.", "_comment": "Don't change / translate the credit down below if you are doing it :)", "text.rei.credit.text": "§lRoughly Enough Items\n§7Originally a fork for Almost Enough Items.\n\n§lDevelopers\n - Originally by ZenDarva\n - Created by Danielshe\n - Plugin Support by TehNut\n\n§lLanguage Translation\n English - Danielshe\n Simplified Chinese - Danielshe\n Traditional Chinese - hugoalh & Danielshe\n French - Yanis48\n German - MelanX\n Estonian - Madis0\n Hebrew - nerdoron\n LOLCAT - Danielshe\n Upside Down - Danielshe\n\n§lLicense\n§7Roughly Enough Items is using MIT." diff --git a/src/main/resources/assets/roughlyenoughitems/lang/et_ee.json b/src/main/resources/assets/roughlyenoughitems/lang/et_ee.json index 36a497c43..c27431eb9 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/et_ee.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/et_ee.json @@ -18,12 +18,12 @@ "category.rei.brewing.reactant": "§eKoostisosa", "category.rei.brewing.result": "§eValmiv võlujook", "text.rei.config": "Seadistus", - "text.rei.side_searchbox": "Külgmine otsingukast: ", - "text.rei.mirror_rei": "REI vidinate peegeldamine: ", + "text.rei.config.side_search_box": "Külgmine otsingukast: ", + "text.rei.config.mirror_rei": "REI vidinate peegeldamine: ", "text.rei.cheat_items": "{item_count} [{item_name}] antud mängijale {player_name}.", "text.rei.failed_cheat_items": "§cEsemete andmine ebaõnnestus.", - "text.rei.list_ordering": "Esemenimekirja järjestus", - "text.rei.list_ordering_button": "%s (%s)", + "text.rei.config.list_ordering": "Esemenimekirja järjestus", + "text.rei.config.list_ordering_button": "%s (%s)", "ordering.rei.ascending": "kasvav", "ordering.rei.descending": "kahanev", "ordering.rei.registry": "Register", @@ -31,7 +31,7 @@ "ordering.rei.item_groups": "Esemegrupid", "text.speed_craft.failed_move_items": "§cEsemeid ei saa liigutada!", "text.speed_craft.move_items": "Liiguta esemeid", - "text.rei.enable_craftable_only": "Luba meisterdatavate filter: ", + "text.rei.config.enable_craftable_only": "Luba meisterdatavate filter: ", "text.rei.showing_craftable": "Kuvab meisterdatavaid", "text.rei.showing_all": "Kuvab kõiki", "text.rei.delete_items": "§cKustuta ese", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json b/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json index 4daead0a1..0d2ccb665 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/fr_fr.json @@ -18,12 +18,12 @@ "category.rei.brewing.reactant": "§eIngrédient", "category.rei.brewing.result": "§ePotion obtenue", "text.rei.config": "Config", - "text.rei.side_searchbox": "Zone de recherche latérale : ", - "text.rei.mirror_rei": "Refléter les widgets REI : ", + "text.rei.config.side_search_box": "Zone de recherche latérale : ", + "text.rei.config.mirror_rei": "Refléter les widgets REI : ", "text.rei.cheat_items": "[{item_name}] x{item_count} ont été donnés à {player_name}.", "text.rei.failed_cheat_items": "§cImpossible de donner les objets.", - "text.rei.list_ordering": "Ordre de la liste d'objets", - "text.rei.list_ordering_button": "%s [%s]", + "text.rei.config.list_ordering": "Ordre de la liste d'objets", + "text.rei.config.list_ordering_button": "%s [%s]", "ordering.rei.ascending": "Croissant", "ordering.rei.descending": "Décroissant", "ordering.rei.registry": "Registre", @@ -31,15 +31,15 @@ "ordering.rei.item_groups": "Groupes d'objets", "text.speed_craft.failed_move_items": "§cImpossible de déplacer les objets!", "text.speed_craft.move_items": "Déplacer les objets", - "text.rei.enable_craftable_only": "Activer les recettes réalisables uniquement : ", + "text.rei.config.enable_craftable_only": "Activer les recettes réalisables uniquement : ", "text.rei.showing_craftable": "Recettes réalisables", "text.rei.showing_all": "Toutes les recettes", "text.rei.delete_items": "§cSupprimer l'objet", "text.rei.check_updates": "Vérifier les mises à jour : ", "text.rei.update_outdated": "§6REI est obsolète !\n§6Version actuelle : §a%s §6Dernière version : §a%s\n§6Priorité de mise à jour : §a%s", "text.rei.update_changelog_line": "§6- %s", - "text.rei.load_default_plugin": "Charger le plugin par défaut : ", - "text.rei.load_default_plugin.restart_tooltip": "Vous ne voudrez probablement jamais désactiver cela.\nRedémarrez Minecraft pour appliquer ce paramètre.", + "text.rei.config.load_default_plugin": "Charger le plugin par défaut : ", + "text.rei.config.load_default_plugin.restart_tooltip": "Vous ne voudrez probablement jamais désactiver cela.\nRedémarrez Minecraft pour appliquer ce paramètre.", "text.rei.credits": "Crédits", "text.rei.left_arrow": "<", "text.rei.right_arrow": ">" diff --git a/src/main/resources/assets/roughlyenoughitems/lang/lol_us.json b/src/main/resources/assets/roughlyenoughitems/lang/lol_us.json index c64a3c0e8..c1f420124 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/lol_us.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/lol_us.json @@ -18,12 +18,12 @@ "category.rei.brewing.reactant": "§eThng", "category.rei.brewing.result": "§eResuted Poshun", "text.rei.config": "Konfig", - "text.rei.side_searchbox": "Sie Saerhc Boz: ", - "text.rei.mirror_rei": "Miror REI Widgetz: ", + "text.rei.config.side_search_box": "Sie Saerhc Boz: ", + "text.rei.config.mirror_rei": "Miror REI Widgetz: ", "text.rei.cheat_items": "Giv [{item_name}] x{item_count} 2 {player_name}.", "text.rei.failed_cheat_items": "§cFaild 2 giv itemz.", - "text.rei.list_ordering": "Item lis orderin", - "text.rei.list_ordering_button": "%s [%s]", + "text.rei.config.list_ordering": "Item lis orderin", + "text.rei.config.list_ordering_button": "%s [%s]", "ordering.rei.ascending": "Acendin", "ordering.rei.descending": "Dscendin", "ordering.rei.registry": "Registry", @@ -31,7 +31,7 @@ "ordering.rei.item_groups": "Itmz groupz", "text.speed_craft.failed_move_items": "§cKan'z m0v itemz!", "text.speed_craft.move_items": "M0v Itemz", - "text.rei.enable_craftable_only": "Enabel craftabel fit3r: ", + "text.rei.config.enable_craftable_only": "Enabel craftabel fit3r: ", "text.rei.showing_craftable": "Sowin Craftabel", "text.rei.showing_all": "Sowin all", "text.rei.delete_items": "§cDel Itm", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json b/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json index df7ed0108..74708e3ec 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json @@ -18,12 +18,12 @@ "category.rei.brewing.reactant": "§e材料", "category.rei.brewing.result": "§e输出药水", "text.rei.config": "设置", - "text.rei.side_searchbox": "不置中搜索栏: ", - "text.rei.mirror_rei": "右置 REI 小工具: ", + "text.rei.config.side_search_box": "不置中搜索栏: ", + "text.rei.config.mirror_rei": "右置 REI 小工具: ", "text.rei.cheat_items": "已将 {item_count} 个 [{item_name}] 给予 {player_name}", "text.rei.failed_cheat_items": "§c不能给予物品.", - "text.rei.list_ordering": "物品清单排序", - "text.rei.list_ordering_button": "%s [%s]", + "text.rei.config.list_ordering": "物品清单排序", + "text.rei.config.list_ordering_button": "%s [%s]", "ordering.rei.ascending": "顺序", "ordering.rei.descending": "倒序", "ordering.rei.registry": "注册", @@ -31,7 +31,7 @@ "ordering.rei.item_groups": "物品分类", "text.speed_craft.failed_move_items": "§c不能移动物品!", "text.speed_craft.move_items": "移动物品", - "text.rei.enable_craftable_only": "过滤不可合成的物品: ", + "text.rei.config.enable_craftable_only": "过滤不可合成的物品: ", "text.rei.showing_craftable": "显示可合成的物品", "text.rei.showing_all": "显示所有物品", "text.rei.delete_items": "§c删除物品", diff --git a/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json b/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json index 58c6b4b97..07269070b 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json @@ -18,12 +18,12 @@ "category.rei.brewing.reactant": "§e材料", "category.rei.brewing.result": "§e輸出藥水", "text.rei.config": "設置", - "text.rei.side_searchbox": "不置中搜索欄: ", - "text.rei.mirror_rei": "右置 REI 小工具: ", + "text.rei.config.side_search_box": "不置中搜索欄: ", + "text.rei.config.mirror_rei": "右置 REI 小工具: ", "text.rei.cheat_items": "已將 {item_count} 個 [{item_name}] 給予 {player_name}", "text.rei.failed_cheat_items": "§c不能給予物品.", - "text.rei.list_ordering": "物品清單排序", - "text.rei.list_ordering_button": "%s [%s]", + "text.rei.config.list_ordering": "物品清單排序", + "text.rei.config.list_ordering_button": "%s [%s]", "ordering.rei.ascending": "順序", "ordering.rei.descending": "倒序", "ordering.rei.registry": "註冊", @@ -31,7 +31,7 @@ "ordering.rei.item_groups": "物品分類", "text.speed_craft.failed_move_items": "§c不能移動物品!", "text.speed_craft.move_items": "移動物品", - "text.rei.enable_craftable_only": "過濾不可合成的物品: ", + "text.rei.config.enable_craftable_only": "過濾不可合成的物品: ", "text.rei.showing_craftable": "顯示可合成的物品", "text.rei.showing_all": "顯示所有物品", "text.rei.delete_items": "§c刪除物品", diff --git a/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png b/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png index 7ca6c8eb7..6ccd027c2 100755 Binary files a/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png and b/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png differ -- cgit