Merge branch '6.x-1.17' into 7.x-1.18

# Conflicts:
#	gradle.properties

4 files changed, 15 insertions, 0 deletions

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 c944215f0..d84b2e67d 100755
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -167,6 +167,7 @@
   "config.roughlyenoughitems.layout.configButtonLocation": "Config Button Position:",
   "config.roughlyenoughitems.layout.configButtonLocation.upper": "Upper",
   "config.roughlyenoughitems.layout.configButtonLocation.lower": "Lower",
+  "config.roughlyenoughitems.layout.mergeDisplayUnderOne": "Merge Displays with Equal Contents:",
   "config.roughlyenoughitems.filteredEntries.selectAll": "Select All",
   "config.roughlyenoughitems.filteredEntries.selectNone": "Unselect All",
   "config.roughlyenoughitems.filteredEntries.hide": "Hide Selected",
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/he_il.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/he_il.json
index 498e92a83..7a0ad52c7 100644
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/he_il.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/he_il.json
@@ -96,6 +96,7 @@
   "tooltip.rei.drag_to_add_favorites": "תגרור את זה למעה כדי להוסיף את זה לרשימת הפריטים השמורים!",
   "msg.rei.copied_recipe_id": "העתיק זהות מתכון",
   "msg.rei.recipe_id_details": "זהות מתכון: %s",
+  "msg.rei.exported_recipe": "מתכון מיוצא",
   "subsets.rei.roughlyenoughitems.item_groups": "כרטיסייות מצב יצירתי",
   "config.roughlyenoughitems.title": "קונפיגורציה REI",
   "config.roughlyenoughitems.basics": "בסיסים",
@@ -113,17 +114,22 @@
   "config.roughlyenoughitems.keyBindings.copyRecipeIdentifierKeybind": "העתק זהות מתכון:",
   "config.roughlyenoughitems.keyBindings.previousScreenKeybind": "מסך קודם:",
   "config.roughlyenoughitems.cheatingStyle": "סטייל של רמאות:",
+  "config.roughlyenoughitems.cheatingStyle.grab": "תפוס",
   "config.roughlyenoughitems.cheatingStyle.give": "תן",
   "config.roughlyenoughitems.motion": "הגדרות אנימציה / תזוזה",
+  "config.roughlyenoughitems.motion.configScreenAnimation": "מסך קונפיגורציה מונפש:",
   "config.roughlyenoughitems.motion.creditsScreenAnimation": "מסך קרדיטים מונפש:",
   "config.roughlyenoughitems.motion.favoritesAnimation": "רשימת פריטים שמורים מונפשת:",
   "config.roughlyenoughitems.recipeScreenType": "סוג מסך מתכון:",
   "config.roughlyenoughitems.recipeScreenType.config": "סוג מסך מתכון: %s",
   "config.roughlyenoughitems.recipeScreenType.unset": "לא נקבע",
   "config.roughlyenoughitems.recipeScreenType.original": "ברירת מחדל",
+  "config.roughlyenoughitems.layout": "פריסה",
+  "config.roughlyenoughitems.tooltips": "תאורים",
   "config.roughlyenoughitems.accessibility": "נגישות",
   "config.roughlyenoughitems.search": "חיפוש",
   "config.roughlyenoughitems.commands": "פקודות",
+  "config.roughlyenoughitems.filtering": "סינון",
   "config.roughlyenoughitems.miscellaneous": "שונות",
   "config.roughlyenoughitems.miscellaneous.clickableRecipeArrows": "חצי מתכונים לחיצים",
   "config.roughlyenoughitems.miscellaneous.renderEntryEnchantmentGlint": "הראה זהירת כישוף:",
@@ -141,7 +147,9 @@
   "config.roughlyenoughitems.recipeBorder.none": "כלום",
   "config.roughlyenoughitems.accessibility.displayPanelLocation.left": "צד שמאל",
   "config.roughlyenoughitems.accessibility.displayPanelLocation.right": "צד ימין",
+  "config.roughlyenoughitems.search.tooltipSearch": "חיפוש לפי תאורים (#):",
   "config.roughlyenoughitems.search.tagSearch": "חיפוש לפי תווית ($):",
+  "config.roughlyenoughitems.search.identifierSearch": "חיפוש לפי מזהה (*):",
   "config.roughlyenoughitems.search.modSearch": "חיפוש לפי מוד (@):",
   "config.roughlyenoughitems.search_mode.always": "תמיד פעיל",
   "config.roughlyenoughitems.search_mode.prefix": "כאשר משתמשים בקידומת",
@@ -149,7 +157,9 @@
   "config.roughlyenoughitems.layout.searchFieldLocation.bottom_side": "למטה בשמאל / ימין",
   "config.roughlyenoughitems.layout.searchFieldLocation.top_side": "למעלה בשמאל / ימין",
   "config.roughlyenoughitems.layout.searchFieldLocation.center": "באמצע",
+  "config.roughlyenoughitems.accessibility.compositeScrollBarPermanent": "דהיית סרגל הגלילה:",
   "config.roughlyenoughitems.accessibility.compositeScrollBarPermanent.boolean.true": "לעולם לא",
+  "config.roughlyenoughitems.accessibility.compositeScrollBarPermanent.boolean.false": "כאשר אינו פעיל",
   "config.roughlyenoughitems.disableRecipeBook": "ספר מתכונים של וונילה:",
   "config.roughlyenoughitems.disableRecipeBook.boolean.true": "§cלא",
   "config.roughlyenoughitems.disableRecipeBook.boolean.false": "§cכן",
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 0256f54c9..88e977e97 100644
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
@@ -47,6 +47,8 @@
   "text.rei.cheat_items": "已将 {item_count} 个 [{item_name}§f] 给予 {player_name}",
   "text.rei.failed_cheat_items": "§c物品给予失败",
   "text.rei.too_long_nbt": "§c物品 NBT 太长，不能应用于多人游戏.",
+  "text.rei.tag_match": "标签： %s",
+  "text.rei.performance": "性能分析",
   "ordering.rei.ascending": "顺序",
   "ordering.rei.descending": "倒序",
   "ordering.rei.registry": "物品ID循序",
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 38bcd4a00..c99289bbb 100644
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
@@ -47,6 +47,8 @@
   "text.rei.cheat_items": "已將 {item_count} 個 [{item_name}§f] 給予 {player_name}",
   "text.rei.failed_cheat_items": "§c給予物品失敗",
   "text.rei.too_long_nbt": "§c物品 NBT 過長，不能應用於多人遊戲。",
+  "text.rei.tag_match": "標籤： %s",
+  "text.rei.performance": "效能分析",
   "ordering.rei.ascending": "從 A 到 Z",
   "ordering.rei.descending": "從 Z 到 A",
   "ordering.rei.registry": "註冊名",