Merge branch 'fabric-dev' into 1.14

6 files changed, 26 insertions, 4 deletions

diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
index de6413d4f..a07adbd33 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",
@@ -98,9 +100,11 @@
   "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",
   "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 +112,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."
 }
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",
 }
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
--- /dev/null
+++ b/src/main/resources/assets/roughlyenoughitems/textures/gui/button_dark.png
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
--- /dev/null
+++ b/src/main/resources/assets/roughlyenoughitems/textures/gui/display_dark.png
diff --git a/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png b/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png
index 59e606de1..366a8791f 100755
--- a/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png
+++ b/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer.png
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
--- /dev/null
+++ b/src/main/resources/assets/roughlyenoughitems/textures/gui/recipecontainer_dark.png