Merge remote-tracking branch 'origin/8.x-1.18.2' into 9.x-1.19

5 files changed, 7 insertions, 6 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 b96037482..6f8b677f0 100755
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -221,6 +221,7 @@
   "config.roughlyenoughitems.search.asyncSearch": "Async Search:",
   "config.roughlyenoughitems.search.asyncSearchPartitionSize": "Async Search Partition Size:",
   "config.roughlyenoughitems.accessibility.useCompactTabs": "Compact Tabs:",
+  "config.roughlyenoughitems.accessibility.useCompactTabButtons": "Compact Tab Arrow Buttons:",
   "config.roughlyenoughitems.theme": "Appearance Theme:",
   "config.roughlyenoughitems.theme.dark": "Dark Theme",
   "config.roughlyenoughitems.theme.light": "Light Theme",
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 fd80fc89c..aec8aad67 100644
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
@@ -10,7 +10,7 @@
   "text.rei.feedback": "想给REI的开发者提交什么建议吗？%s以反馈！",
   "text.rei.feedback.link": "点击此处填写Google问卷",
   "text.rei.support.me": "支持我继续让 REI 变得更好！",
-  "text.rei.support.me.desc": "作为 REI 的 Patreon 订阅会员，你可以下载适用于最新 Minecraft 快照的 REI 版本。\n你也可以通过租用 BisectHosting 服务器来支持我。",
+  "text.rei.support.me.desc": "作为 REI 的 Patreon 订阅会员，你可以下载适用于最新 Minecraft 快照的 REI 版本。\n你也可以通过租用 BisectHosting 服务器来支持我。\n\n%s\n%s",
   "text.rei.support.me.patreon": "在 Patreon 上支持我",
   "text.rei.support.me.bisect": "在 BisectHosting 上使用代码 SHEDANIEL",
   "text.rei.not.fully.initialized": "REI 尚未完全初始化！",
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 2d53d5f90..d035ae78a 100644
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
@@ -10,7 +10,7 @@
   "text.rei.feedback": "您想向 REI 開發人員提供任何回饋嗎？ %s 以提交您的建議！",
   "text.rei.feedback.link": "點擊此處前往 Google Form",
   "text.rei.support.me": "支持我繼續讓 REI 變得更好！",
-  "text.rei.support.me.desc": "作為 REI 的 Patreon 訂閱會員，你可以下載適用於最新 Minecraft 快照的 REI 版本。\n你也可以通過租用 BisectHosting 服務器來支持我。",
+  "text.rei.support.me.desc": "作為 REI 的 Patreon 訂閱會員，你可以下載適用於最新 Minecraft 快照的 REI 版本。\n你也可以通過租用 BisectHosting 服務器來支持我。\n\n%s\n%s",
   "text.rei.support.me.patreon": "在 Patreon 上支持我",
   "text.rei.support.me.bisect": "在 BisectHosting 上使用代碼 SHEDANIEL",
   "text.rei.not.fully.initialized": "REI 尚未完成初始化！",
@@ -76,7 +76,7 @@
   "ordering.rei.name": "名稱",
   "ordering.rei.item_groups": "物品分類",
   "text.auto_craft.move_items": "移動物品",
-  "text.auto_craft.move_items.tooltip": "按住《Shift》鍵再點擊此處以移動物品",
+  "text.auto_craft.move_items.tooltip": "按住《Ctrl》鍵再點擊此處以移動物品",
   "text.auto_craft.move_items.yog": "發生異常無效指標 ！！",
   "error.rei.transfer.too_small": "無法將物品移動至 %dx%d 的合成格！",
   "error.rei.not.on.server": "伺服器未安裝 REI ！",
diff --git a/runtime/src/main/resources/roughlyenoughitems.changes.json b/runtime/src/main/resources/roughlyenoughitems.changes.json
index 34177eb71..0a3e2be7c 100644
--- a/runtime/src/main/resources/roughlyenoughitems.changes.json
+++ b/runtime/src/main/resources/roughlyenoughitems.changes.json
@@ -1,3 +1,3 @@
 {
-  "version": "2022.2"
+  "version": "2022.1"
 }
\ No newline at end of file
diff --git a/runtime/src/main/resources/roughlyenoughitems/2022.1/changelog.md b/runtime/src/main/resources/roughlyenoughitems/2022.1/changelog.md
index 1a815e109..2b5c2b3f3 100644
--- a/runtime/src/main/resources/roughlyenoughitems/2022.1/changelog.md
+++ b/runtime/src/main/resources/roughlyenoughitems/2022.1/changelog.md
@@ -22,9 +22,9 @@ Instead of highlighting the items on hover, you can now configure REI to zoom in
 ![Example](roughlyenoughitems/2022.2/2022-02-18_09-05.png)
 ---
 #**Changes**
-- **Support for JEI API 9.5** [#821](https://github.com/shedaniel/RoughlyEnoughItems/issues/821)
+- **Support for JEI API 9.7** [#821](https://github.com/shedaniel/RoughlyEnoughItems/issues/821)
 
-The JEI compatibility layer has been updated to support APIs from JEI 9.5, this is a completely new way for
+The JEI compatibility layer has been updated to support APIs from JEI 9.7, this is a completely new way for
 JEI plugins to layout their categories, please report any issues you find with this new update.
 - **Filtering of Entries in Recipes** [#783](https://github.com/shedaniel/RoughlyEnoughItems/issues/783)