From e6dfba86eab967b6b8ba53b448f9346bcff8bcdd Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 3 Jun 2019 14:56:52 +0800 Subject: Better buttons --- .../textures/gui/recipecontainer.png | Bin 7332 -> 7393 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/roughlyenoughitems') diff --git a/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png b/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png index 59e606de1..66a44dc2e 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 From 7689bdbb42ad10b2ad99e2bae55ddaceac15bca7 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 3 Jun 2019 21:39:36 +0800 Subject: Dark Mode --- .../assets/roughlyenoughitems/lang/en_us.json | 4 ++-- .../roughlyenoughitems/textures/gui/button_dark.png | Bin 0 -> 15750 bytes .../roughlyenoughitems/textures/gui/display_dark.png | Bin 0 -> 8722 bytes .../textures/gui/recipecontainer.png | Bin 7393 -> 7393 bytes .../textures/gui/recipecontainer_dark.png | Bin 0 -> 6756 bytes 5 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/roughlyenoughitems/textures/gui/button_dark.png create mode 100644 src/main/resources/assets/roughlyenoughitems/textures/gui/display_dark.png create mode 100644 src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer_dark.png (limited to 'src/main/resources/assets/roughlyenoughitems') diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json index de6413d4f..b83a1fa17 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json @@ -87,6 +87,8 @@ "text.rei.config.enable_legacy_speedcraft_support": "Enable Legacy Plugin Support: ", "text.rei.config.april_fools": "April Fools", "text.rei.config.april_fools.2019": "Force 2019 REI April Fools' joke: ", + "text.rei.config.dark_theme": "Dark Mode:", + "text.rei.config.villager_screen_permanent_scroll_bar": "Villager Screen Permanent Scroll Bar:", "text.rei.config.item_cheating_mode": "Item Cheating Amount:", "text.rei.config.item_cheating_mode.rei_like": "Normal", "text.rei.config.item_cheating_mode.jei_like": "Reversed", @@ -100,7 +102,6 @@ "text.rei.select": "Select", "text.rei.recipe_screen_type.selection": "Recipe Screen Type Selection", "text.rei.recipe_screen_type.selection.sub": "You can always edit this setting again via the config screen.", - "_comment": "Config Tooltips", "tooltip.rei.config.side_search_box": "Declares the location of the search field:\nYes: Left / Right\nNo: Center\n \nDefaulted: No", "tooltip.rei.config.list_ordering": "Declares the ordering of the side item list:\nValues: Registry / Name / Item Groups\n(Ascending / Descending)\n \nDefaulted: %s", @@ -108,7 +109,6 @@ "tooltip.rei.config.max_recipes_per_page": "Declares the maximum possible displayed recipes:\nValues: 2 - 99\n \nDefaulted: 3", "tooltip.rei.config.light_gray_recipe_border": "Declares the appearance of the recipe border:\nYes: Light Gray\nNo: Hard Black\n \nDefaulted: No", "tooltip.rei.config.april_fools.2019": "Forcefully enables the 2019 april fools joke:\nValues: Yes / No\n \nDefaulted: No", - "_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 - XuyuEre & Danielshe\n Traditional Chinese - hugoalh, gxy17886 & Danielshe\n French - Yanis48\n German - MelanX\n Estonian - Madis0\n Portuguese - thiagokenis\n LOLCAT - Danielshe\n Upside Down - Danielshe\n Brazilian Portuguese - thiagokenis\n Bulgarian - geniiii\n\n§lLicense\n§7Roughly Enough Items is using MIT." } diff --git a/src/main/resources/assets/roughlyenoughitems/textures/gui/button_dark.png b/src/main/resources/assets/roughlyenoughitems/textures/gui/button_dark.png new file mode 100644 index 000000000..3d72f5c53 Binary files /dev/null and b/src/main/resources/assets/roughlyenoughitems/textures/gui/button_dark.png differ diff --git a/src/main/resources/assets/roughlyenoughitems/textures/gui/display_dark.png b/src/main/resources/assets/roughlyenoughitems/textures/gui/display_dark.png new file mode 100644 index 000000000..d5bd24b90 Binary files /dev/null and b/src/main/resources/assets/roughlyenoughitems/textures/gui/display_dark.png differ diff --git a/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png b/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png index 66a44dc2e..366a8791f 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 diff --git a/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer_dark.png b/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer_dark.png new file mode 100644 index 000000000..6033f91b1 Binary files /dev/null and b/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer_dark.png differ -- cgit From 73c9d403fd36af0a625c5fa98bb67a2cd851217c Mon Sep 17 00:00:00 2001 From: xuyu0v0 Date: Wed, 5 Jun 2019 05:09:41 -0400 Subject: Update zh_cn.json (#103) --- .../assets/roughlyenoughitems/lang/zh_cn.json | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src/main/resources/assets/roughlyenoughitems') diff --git a/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json b/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json index 5992cb03e..c0821b86f 100644 --- a/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json @@ -3,6 +3,8 @@ "key.roughlyenoughitems.recipe_keybind": "显示配方", "key.roughlyenoughitems.hide_keybind": "隐藏／显示 REI", "key.roughlyenoughitems.usage_keybind": "显示用途", + "key.roughlyenoughitems.next_page": "下一页", + "key.roughlyenoughitems.previous_page": "上一页", "text.rei.config.general": "常规", "text.rei.config.action": "功能", "text.rei.config.cheating": "作弊:", @@ -38,7 +40,7 @@ "ordering.rei.descending": "倒序", "ordering.rei.registry": "注册", "ordering.rei.name": "名字", - "ordering.rei.item_groups": "物品分类", + "ordering.rei.item_groups": "物品组", "text.speed_craft.failed_move_items": "§c不能移动物品!", "text.speed_craft.move_items": "移动物品", "text.rei.config.enable_craftable_only": "过滤不可合成的物品: ", @@ -85,10 +87,26 @@ "text.rei.config.enable_legacy_speedcraft_support": "启用旧版插件支持: ", "text.rei.config.april_fools": "愚人节", "text.rei.config.april_fools.2019": "强制启用REI 2019愚人节玩笑: ", + "text.rei.config.dark_theme": "深色模式:", + "text.rei.config.villager_screen_permanent_scroll_bar": "村民界面一直显示滚动条:", "text.rei.config.item_cheating_mode": "物品作弊数量模式:", "text.rei.config.item_cheating_mode.rei_like": "标准", "text.rei.config.item_cheating_mode.jei_like": "反转", "text.rei.config.light_gray_recipe_border": "浅灰色配方边框:", "text.rei.config_api_failed": "如果Cloth Config API装载失败了或你没有安装它，你就会到达这个界面!\n升级/安装API或向bug跟踪器报告.", - "text.rei.back": "返回" + "text.rei.back": "返回", + "text.rei.config.recipe_screen_type": "界面类型", + "text.rei.config.recipe_screen_type.unset": "未设置", + "text.rei.config.recipe_screen_type.original": "原生", + "text.rei.config.recipe_screen_type.villager": "类村民", + "text.rei.select": "选择", + "text.rei.recipe_screen_type.selection": "合成界面类型选择", + "text.rei.recipe_screen_type.selection.sub": "你始终可以通过配置界面再次编辑此设置.", + "_comment": "Config Tooltips", + "tooltip.rei.config.side_search_box": "声明搜索框的位置:\nYes: 左 / 右\nNo: 中央\n \n默认: No", + "tooltip.rei.config.list_ordering": "声明侧边物品列表的排序:\n值: 注册 / 名字 / 物品组\n(顺序 / 倒序)\n \n默认: %s", + "tooltip.rei.config.item_list_position": "声明侧边物品列表的位置:\n值: 左 / 右\n \n默认: 右", + "tooltip.rei.config.max_recipes_per_page": "声明每页显示的最大的配方数目:\n值: 2 - 99\n \n默认: 3", + "tooltip.rei.config.light_gray_recipe_border": "声明配方边框的外观D:\nYes: 浅灰色\nNo: 深黑色\n \n默认: No", + "tooltip.rei.config.april_fools.2019": "强制启用2019愚人节玩笑:\n值: Yes / No\n \n默认: No", } -- cgit From fd99a42678f27d74483cfa2ae069de8bea38f893 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 5 Jun 2019 20:14:36 +0800 Subject: recipe id cache --- src/main/resources/assets/roughlyenoughitems/lang/en_us.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/resources/assets/roughlyenoughitems') diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json index b83a1fa17..9f2f94e0e 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json @@ -100,6 +100,7 @@ "text.rei.config.recipe_screen_type.original": "Original", "text.rei.config.recipe_screen_type.villager": "Villager", "text.rei.select": "Select", + "text.rei.recipe_id": "\n%sRecipe Id: %s", "text.rei.recipe_screen_type.selection": "Recipe Screen Type Selection", "text.rei.recipe_screen_type.selection.sub": "You can always edit this setting again via the config screen.", "_comment": "Config Tooltips", -- cgit From 94e6085d2d49e7fe38871c9548774c4e50a2f422 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 6 Jun 2019 16:09:48 +0800 Subject: this is still not working --- src/main/resources/assets/roughlyenoughitems/lang/en_us.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/resources/assets/roughlyenoughitems') diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json index 9f2f94e0e..d8eba374b 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json @@ -101,6 +101,7 @@ "text.rei.config.recipe_screen_type.villager": "Villager", "text.rei.select": "Select", "text.rei.recipe_id": "\n%sRecipe Id: %s", + "text.rei.config.register_in_other_thread": "Register Recipes in other thread:", "text.rei.recipe_screen_type.selection": "Recipe Screen Type Selection", "text.rei.recipe_screen_type.selection.sub": "You can always edit this setting again via the config screen.", "_comment": "Config Tooltips", @@ -110,6 +111,7 @@ "tooltip.rei.config.max_recipes_per_page": "Declares the maximum possible displayed recipes:\nValues: 2 - 99\n \nDefaulted: 3", "tooltip.rei.config.light_gray_recipe_border": "Declares the appearance of the recipe border:\nYes: Light Gray\nNo: Hard Black\n \nDefaulted: No", "tooltip.rei.config.april_fools.2019": "Forcefully enables the 2019 april fools joke:\nValues: Yes / No\n \nDefaulted: No", + "tooltip.rei.config.register_in_other_thread": "Requires datapacks to be reloaded.\nCan be done by rejoin the world / server", "_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 - XuyuEre & Danielshe\n Traditional Chinese - hugoalh, gxy17886 & Danielshe\n French - Yanis48\n German - MelanX\n Estonian - Madis0\n Portuguese - thiagokenis\n LOLCAT - Danielshe\n Upside Down - Danielshe\n Brazilian Portuguese - thiagokenis\n Bulgarian - geniiii\n\n§lLicense\n§7Roughly Enough Items is using MIT." } -- cgit From 98c2c0f1af8b264cfce5c005f4694318cce001b2 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 6 Jun 2019 18:36:51 +0800 Subject: alterative solution to the working stations --- src/main/resources/assets/roughlyenoughitems/lang/en_us.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/resources/assets/roughlyenoughitems') diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json index d8eba374b..a07adbd33 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json @@ -100,6 +100,7 @@ "text.rei.config.recipe_screen_type.original": "Original", "text.rei.config.recipe_screen_type.villager": "Villager", "text.rei.select": "Select", + "text.rei.working_station": "Working Station", "text.rei.recipe_id": "\n%sRecipe Id: %s", "text.rei.config.register_in_other_thread": "Register Recipes in other thread:", "text.rei.recipe_screen_type.selection": "Recipe Screen Type Selection", -- cgit