Merge remote-tracking branch 'origin/6.x-1.17' into 7.x-1.18

# Conflicts:
#	gradle.properties

5 files changed, 45 insertions, 0 deletions

diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/cs_cz.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/cs_cz.json
index 7bd9d4603..c42c8e1ae 100644
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/cs_cz.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/cs_cz.json
@@ -47,6 +47,8 @@
   "text.rei.cheat_items": "Hráči {player_name} dán předmět ({item_count}x) [{item_name}§f]",
   "text.rei.failed_cheat_items": "§cNepodařilo se dát předměty.",
   "text.rei.too_long_nbt": "§cNBT předmětu je příliš dlouhé, než aby mohl být použito ve hře pro více hráčů.",
+  "text.rei.tag_match": "Tag: %s",
+  "text.rei.performance": "Analýza výkonu",
   "ordering.rei.ascending": "Vzestupně",
   "ordering.rei.descending": "Sestupně",
   "ordering.rei.registry": "Registr",
@@ -165,6 +167,7 @@
   "config.roughlyenoughitems.layout.configButtonLocation": "Pozice tlačítka konfigurace:",
   "config.roughlyenoughitems.layout.configButtonLocation.upper": "Nahoře",
   "config.roughlyenoughitems.layout.configButtonLocation.lower": "Dole",
+  "config.roughlyenoughitems.layout.mergeDisplayUnderOne": "Sloučit objekty s rovnocenným obsahem:",
   "config.roughlyenoughitems.filteredEntries.selectAll": "Vybrat vše",
   "config.roughlyenoughitems.filteredEntries.selectNone": "Zrušit výběr",
   "config.roughlyenoughitems.filteredEntries.hide": "Skrýt vybrané",
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_gb.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_gb.json
index 6c7403e2b..8ff387e6e 100644
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_gb.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_gb.json
@@ -1,6 +1,36 @@
 {
+  "text.rei.cheating": "Cheating",
+  "text.rei.not.fully.initialized": "REI not yet fully initialised!",
+  "text.rei.inventory.highlighting.enabled": "Inventory Highlighting On",
   "text.rei.inventory.highlighting.enabled.tooltip": "This makes slots that does not match\nthe search filter grey.\nDouble click the search bar to toggle this mode.",
+  "category.rei.crafting": "Crafting",
+  "category.rei.smelting": "Smelting",
+  "category.rei.smelting.fuel": "Fuel",
+  "category.rei.fuel": "Fuel",
+  "category.rei.fuel.time": "Burn Time: %d ticks",
+  "category.rei.fuel.time.items": "Burn Time: %s item(s)",
+  "category.rei.fuel.time_short": "%d ticks",
+  "category.rei.fuel.time_short.items": "%s item(s)",
+  "category.rei.smoking": "Smoking",
   "category.rei.blasting": "Blasting",
+  "category.rei.campfire": "Campfire",
+  "category.rei.stone_cutting": "Stone Cutting",
+  "category.rei.brewing": "Brewing",
+  "category.rei.brewing.input": "Original Potion",
+  "category.rei.brewing.reactant": "Ingredient",
+  "category.rei.brewing.result": "Resulted Potion",
+  "category.rei.composting": "Composting",
+  "category.rei.stripping": "Stripping",
+  "category.rei.smithing": "Smithing",
+  "category.rei.beacon_base": "Beacon Base",
+  "category.rei.beacon_payment": "Beacon Payment",
+  "category.rei.tilling": "Tilling",
+  "category.rei.pathing": "Pathing",
+  "category.rei.information": "Information",
+  "text.rei.config": "Config",
+  "text.rei.performance": "Performance Analysis",
+  "ordering.rei.ascending": "Ascending",
+  "ordering.rei.descending": "Descending",
   "text.rei.favorites": "Favourites",
   "text.rei.favorites_tooltip": " \n§7Press %s to add this to favourites.",
   "text.rei.remove_favorites_tooltip": " \n§7Press %s to remove this from favourites.",
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
index d84b2e67d..386f336be 100755
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -73,6 +73,7 @@
   "text.rei.view_all_categories": "View All Categories",
   "text.rei.go_back_first_page": "Back to Page 1",
   "text.rei.choose_page": "Choose Page",
+  "text.rei.shift_click_to": "Shift-Click to %s",
   "text.rei.gamemode_button.tooltip.dropdown": "Switch Game Mode: Dropdown",
   "text.rei.gamemode_button.tooltip.entry": "Switch to %s",
   "text.rei.weather_button.tooltip.dropdown": "Switch Weather: Dropdown",
@@ -111,6 +112,7 @@
   "text.rei.subsets": "Subsets",
   "text.rei.tiny_potato": "Tiny Potatoz",
   "text.rei.add_favorite_widget": "Add...",
+  "text.rei.dispose_here": "Dispose Here",
   "favorite.section.gamemode": "Game Mode",
   "favorite.section.weather": "Weather",
   "tooltip.rei.fluid_amount": "§7%d Unit",
@@ -185,6 +187,7 @@
   "config.roughlyenoughitems.recipeBorder.default": "Default",
   "config.roughlyenoughitems.recipeBorder.none": "None",
   "config.roughlyenoughitems.layout.maxRecipesPerPage": "Maximum Recipes Per Page:",
+  "config.roughlyenoughitems.layout.maxRecipesPageHeight": "Maximum Recipes Page Height:",
   "config.roughlyenoughitems.accessibility.displayPanelLocation": "Entry Panel Position:",
   "config.roughlyenoughitems.accessibility.displayPanelLocation.left": "Left Side",
   "config.roughlyenoughitems.accessibility.displayPanelLocation.right": "Right Side",
@@ -236,6 +239,10 @@
   "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "Paginated",
   "config.roughlyenoughitems.horizontalEntriesBoundaries": "Horizontal Entries Boundaries:",
   "config.roughlyenoughitems.verticalEntriesBoundaries": "Vertical Entries Boundaries:",
+  "config.roughlyenoughitems.horizontalEntriesBoundariesColumns": "Entries Columns Limit:",
+  "config.roughlyenoughitems.verticalEntriesBoundariesRows": "Entries Rows Limit:",
+  "config.roughlyenoughitems.favoritesHorizontalEntriesBoundaries": "Horizontal Favorites Boundaries:",
+  "config.roughlyenoughitems.favoritesHorizontalEntriesBoundariesColumns": "Favorites Columns Limit:",
   "config.roughlyenoughitems.syntaxHighlightingMode": "Syntax Highlighting Mode:",
   "config.roughlyenoughitems.syntaxHighlightingMode.config": "%s",
   "config.roughlyenoughitems.syntaxHighlightingMode.plain": "Plain",
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
index 88e977e97..df26cb0c5 100644
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
@@ -73,6 +73,7 @@
   "text.rei.view_all_categories": "查看全部类别",
   "text.rei.go_back_first_page": "返回第 1 页",
   "text.rei.choose_page": "选择页面",
+  "text.rei.shift_click_to": "Shift点击%s",
   "text.rei.gamemode_button.tooltip.dropdown": "切换游戏模式：下拉列表",
   "text.rei.gamemode_button.tooltip.entry": "切换至 %s",
   "text.rei.weather_button.tooltip.dropdown": "切换天气：菜单",
@@ -184,6 +185,7 @@
   "config.roughlyenoughitems.recipeBorder.default": "默认",
   "config.roughlyenoughitems.recipeBorder.none": "无",
   "config.roughlyenoughitems.layout.maxRecipesPerPage": "每页可以显示最多合成:",
+  "config.roughlyenoughitems.layout.maxRecipesPageHeight": "每页最大高度:",
   "config.roughlyenoughitems.accessibility.displayPanelLocation": "条目列表位置：",
   "config.roughlyenoughitems.accessibility.displayPanelLocation.left": "左侧",
   "config.roughlyenoughitems.accessibility.displayPanelLocation.right": "右侧",
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
index c99289bbb..461f6b070 100644
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
@@ -73,6 +73,7 @@
   "text.rei.view_all_categories": "顯示所有類別",
   "text.rei.go_back_first_page": "返回第 1 頁",
   "text.rei.choose_page": "選擇頁數",
+  "text.rei.shift_click_to": "按住《Shift》鍵再點擊此處以%s",
   "text.rei.gamemode_button.tooltip.dropdown": "切換遊戲模式：選單",
   "text.rei.gamemode_button.tooltip.entry": "切換至 %s",
   "text.rei.weather_button.tooltip.dropdown": "切換天氣：選單",
@@ -184,6 +185,7 @@
   "config.roughlyenoughitems.recipeBorder.default": "預設 ",
   "config.roughlyenoughitems.recipeBorder.none": "無",
   "config.roughlyenoughitems.layout.maxRecipesPerPage": "每頁最多可顯示配方：",
+  "config.roughlyenoughitems.layout.maxRecipesPageHeight": "每頁最大高度：",
   "config.roughlyenoughitems.accessibility.displayPanelLocation": "物品列表位置：",
   "config.roughlyenoughitems.accessibility.displayPanelLocation.left": "左邊",
   "config.roughlyenoughitems.accessibility.displayPanelLocation.right": "右邊",
@@ -235,6 +237,7 @@
   "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "分頁",
   "config.roughlyenoughitems.horizontalEntriesBoundaries": "物品列表水平邊界：",
   "config.roughlyenoughitems.verticalEntriesBoundaries": "物品列表垂直邊界：",
+  "config.roughlyenoughitems.favoritesHorizontalEntriesBoundaries": "我的最愛列表水平邊界：",
   "config.roughlyenoughitems.syntaxHighlightingMode": "語法突顯：",
   "config.roughlyenoughitems.syntaxHighlightingMode.config": "%s",
   "config.roughlyenoughitems.syntaxHighlightingMode.plain": "無色",