Merge remote-tracking branch 'origin/feature/11.1' into feature/12.1

# Conflicts:
#	api/src/main/java/me/shedaniel/rei/api/client/favorites/CompoundFavoriteRenderer.java
#	api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/WidgetWithBounds.java
#	gradle.properties
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ConfigureCategoriesScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringAddRuleScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringCategoriesEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringCategoriesEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/NoFilteringEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/RecipeScreenTypeEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/ReloadPluginsEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/SearchFilterSyntaxHighlightingEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/TitleTextEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/dragging/CurrentDraggingStack.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/Menu.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/performance/entry/PerformanceEntry.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/UncertainDisplayViewingScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/generic/OptionEntriesScreen.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayCompositeWidget.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DisplayTooltipComponent.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DynamicErrorFreeEntryListWidget.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/EntryWidget.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/TabContainerWidget.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/basewidgets/PanelWidget.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/entrylist/PaginatedEntryListWidget.java
#	runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/trash/TrashWidget.java
#	runtime/src/main/java/me/shedaniel/rei/plugin/client/runtime/DefaultClientRuntimePlugin.java

1 files changed, 6 insertions, 165 deletions

diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_hk.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_hk.json
index 31ec794b9..60226a68f 100644
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_hk.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/zh_hk.json
@@ -207,148 +207,6 @@
   "subsets.rei.roughlyenoughitems.item_groups": "創造模式分類",
   "_comment": "設定提示",
   "config.roughlyenoughitems.title": "Roughly Enough Items 設定",
-  "config.roughlyenoughitems.basics": "一般",
-  "config.roughlyenoughitems.appearance": "外觀",
-  "config.roughlyenoughitems.functionality": "功能",
-  "config.roughlyenoughitems.advanced": "進階",
-  "config.roughlyenoughitems.cheating": "作弊模式：",
-  "config.roughlyenoughitems.cheating.when_creative": "僅限創造模式",
-  "config.roughlyenoughitems.favoritesEnabled": "啟用我的最愛：",
-  "config.roughlyenoughitems.keyBindings": "快速鍵",
-  "config.roughlyenoughitems.keyBindings.recipeKeybind": "顯示合成配方：",
-  "config.roughlyenoughitems.keyBindings.hideKeybind": "隱藏/顯示 REI：",
-  "config.roughlyenoughitems.keyBindings.usageKeybind": "顯示用途配方：",
-  "config.roughlyenoughitems.keyBindings.nextPageKeybind": "下一頁：",
-  "config.roughlyenoughitems.keyBindings.previousPageKeybind": "上一頁：",
-  "config.roughlyenoughitems.keyBindings.focusSearchFieldKeybind": "游標移至搜尋欄：",
-  "config.roughlyenoughitems.keyBindings.copyRecipeIdentifierKeybind": "複製配方識別碼：",
-  "config.roughlyenoughitems.keyBindings.exportImageKeybind": "匯出配方：",
-  "config.roughlyenoughitems.keyBindings.favoriteKeybind": "加入我的最愛：",
-  "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.recipeScreenType.composite": "複合",
-  "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.isSubsetsEnabled": "顯示分類集合：",
-  "config.roughlyenoughitems.allowInventoryHighlighting": "物品欄突顯顯示：",
-  "config.roughlyenoughitems.miscellaneous.renderEntryEnchantmentGlint": "顯示附魔光效：",
-  "config.roughlyenoughitems.layout.configButtonLocation": "設定按鈕位置：",
-  "config.roughlyenoughitems.layout.configButtonLocation.upper": "上方",
-  "config.roughlyenoughitems.layout.configButtonLocation.lower": "下方",
-  "config.roughlyenoughitems.layout.mergeDisplayUnderOne": "合併相同的內容：",
-  "config.roughlyenoughitems.layout.favoriteAddWidgetMode": "我的最愛自選按鈕：",
-  "config.roughlyenoughitems.layout.favoriteAddWidgetMode.always_invisible": "永遠不可見",
-  "config.roughlyenoughitems.layout.favoriteAddWidgetMode.auto_hide": "自動隱藏",
-  "config.roughlyenoughitems.layout.favoriteAddWidgetMode.always_visible": "永遠可見",
-  "config.roughlyenoughitems.filteredEntries.selectAll": "選取全部",
-  "config.roughlyenoughitems.filteredEntries.selectNone": "取消全選",
-  "config.roughlyenoughitems.filteredEntries.hide": "隱藏所選",
-  "config.roughlyenoughitems.filteredEntries.show": "顯示所選",
-  "config.roughlyenoughitems.filteredEntries.loadWorldFirst": "請先載入世界！",
-  "config.roughlyenoughitems.accessibility.entrySize": "物品大小：",
-  "config.roughlyenoughitems.search.asyncSearch": "異步搜尋：",
-  "config.roughlyenoughitems.search.asyncSearchPartitionSize": "異步搜尋分區大小：",
-  "config.roughlyenoughitems.search.patchAsyncThreadCrash": "異步線程崩潰補丁：",
-  "config.roughlyenoughitems.accessibility.useCompactTabs": "簡潔分類標籤：",
-  "config.roughlyenoughitems.accessibility.useCompactTabButtons": "簡潔分類分頁按鍵：",
-  "config.roughlyenoughitems.theme": "外觀主題：",
-  "config.roughlyenoughitems.theme.dark": "深色主題",
-  "config.roughlyenoughitems.theme.light": "淺色主題",
-  "config.roughlyenoughitems.recipeBorder": "配方表顯示外框：",
-  "config.roughlyenoughitems.recipeBorder.lighter": "較淺",
-  "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": "右邊",
-  "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": "使用字首時",
-  "config.roughlyenoughitems.search_mode.never": "總是禁用",
-  "config.roughlyenoughitems.layout.debugRenderTimeRequired": "物品列表除錯模式：",
-  "config.roughlyenoughitems.search.debugSearchTimeRequired": "搜尋除錯模式：",
-  "config.roughlyenoughitems.accessibility.resizeDynamically": "動態調整大小：",
-  "config.roughlyenoughitems.layout.searchFieldLocation": "搜尋欄位置：",
-  "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": "§a是",
-  "config.roughlyenoughitems.leftSideMobEffects": "狀態效果的位置：",
-  "config.roughlyenoughitems.leftSideMobEffects.boolean.true": "左側",
-  "config.roughlyenoughitems.leftSideMobEffects.boolean.false": "右側 (原版)",
-  "config.roughlyenoughitems.fixTabCloseContainer": "修正原版頁籤容器 (關閉配方手冊時)：",
-  "config.roughlyenoughitems.lighterButtonHover": "較輕的按鈕停留：",
-  "config.roughlyenoughitems.layout.showCraftableOnlyButton": "可合成物品篩選器：",
-  "config.roughlyenoughitems.layout.showUtilsButtons": "功能按鈕：",
-  "config.roughlyenoughitems.commands.gamemodeCommand": "改變遊戲模式的指令：",
-  "config.roughlyenoughitems.commands.giveCommand": "給予物品的指令：",
-  "config.roughlyenoughitems.commands.timeCommand": "改變時間的指令：",
-  "config.roughlyenoughitems.miscellaneous.loadDefaultPlugin": "載入預設插件：",
-  "config.roughlyenoughitems.miscellaneous.loadDefaultPlugin.boolean.false": "§c否 (危險)",
-  "config.roughlyenoughitems.miscellaneous.registerRecipesInAnotherThread": "REI 重載線程：",
-  "config.roughlyenoughitems.miscellaneous.registerRecipesInAnotherThread.boolean.true": "REI 線程",
-  "config.roughlyenoughitems.miscellaneous.registerRecipesInAnotherThread.boolean.false": "§c整包線程",
-  "config.roughlyenoughitems.commands.weatherCommand": "天氣指令：",
-  "config.roughlyenoughitems.layout.entryPanelOrdering": "物品列表排序：",
-  "config.roughlyenoughitems.list_ordering_button": "%s [%s]",
-  "config.roughlyenoughitems.miscellaneous.newFastEntryRendering": "較快的物品顯示：",
-  "config.roughlyenoughitems.miscellaneous.cachingFastEntryRendering": "緩存項目繪圖：",
-  "config.roughlyenoughitems.miscellaneous.cachingFastEntryRendering.@PrefixText": "此選項將提高渲染項目時的性能，性能增益最多為5倍，平均為2倍。但是這將破壞附魔效果和帶動畫的項目。",
-  "config.roughlyenoughitems.itemCheatingMode": "作弊物品取得數量：",
-  "config.roughlyenoughitems.itemCheatingMode.rei_like": "一般",
-  "config.roughlyenoughitems.itemCheatingMode.jei_like": "反向",
-  "config.roughlyenoughitems.search.searchFavorites": "在我的最愛中搜尋篩選：",
-  "config.roughlyenoughitems.tooltips.appendModNames": "加上模組名稱：",
-  "config.roughlyenoughitems.tooltips.displayFavoritesTooltip": "加上我的最愛提示：",
-  "config.roughlyenoughitems.accessibility.snapToRows": "定格捲動物品列表：",
-  "config.roughlyenoughitems.accessibility.toastDisplayedOnCopyIdentifier": "複製識別碼訊息：",
-  "config.roughlyenoughitems.scrollingEntryListWidget": "物品列表方式：",
-  "config.roughlyenoughitems.scrollingEntryListWidget.boolean.true": "捲動",
-  "config.roughlyenoughitems.scrollingEntryListWidget.boolean.false": "分頁",
-  "config.roughlyenoughitems.horizontalEntriesBoundaries": "物品列表水平邊界：",
-  "config.roughlyenoughitems.verticalEntriesBoundaries": "物品列表垂直邊界：",
-  "config.roughlyenoughitems.horizontalEntriesBoundariesColumns": "最大列數：",
-  "config.roughlyenoughitems.verticalEntriesBoundariesRows": "最大行數：",
-  "config.roughlyenoughitems.favoritesHorizontalEntriesBoundaries": "我的最愛列表水平邊界：",
-  "config.roughlyenoughitems.favoritesHorizontalEntriesBoundariesColumns": "收藏籃限制：",
-  "config.roughlyenoughitems.syntaxHighlightingMode": "語法突顯：",
-  "config.roughlyenoughitems.syntaxHighlightingMode.config": "%s",
-  "config.roughlyenoughitems.syntaxHighlightingMode.plain": "無色",
-  "config.roughlyenoughitems.syntaxHighlightingMode.plain_underscored": "無色加底線",
-  "config.roughlyenoughitems.syntaxHighlightingMode.colorful": "彩色",
-  "config.roughlyenoughitems.syntaxHighlightingMode.colorful_underscored": "彩色加底線",
-  "config.roughlyenoughitems.isFocusModeZoomed": "物品焦點模式：",
-  "config.roughlyenoughitems.isFocusModeZoomed.boolean.true": "縮放",
-  "config.roughlyenoughitems.isFocusModeZoomed.boolean.false": "螢光",
-  "config.roughlyenoughitems.filtering.shouldFilterDisplays": "應過濾顯示：",
-  "config.roughlyenoughitems.filtering.filteringQuickCraftCategories": "快速合成排除項：",
-  "config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure": "設定...",
   "config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure.title": "配置快速合成類別",
   "config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure.toggle": "切換",
   "config.roughlyenoughitems.filtering.filteringQuickCraftCategories.configure.true": "可用於快速合成",
@@ -358,6 +216,10 @@
   "config.roughlyenoughitems.filteringRulesScreen.new": "建立篩選規則",
   "config.roughlyenoughitems.filteringRulesScreen.delete": "刪除",
   "config.roughlyenoughitems.filteringRulesScreen.hint": "請嘗試拖拽！",
+  "config.roughlyenoughitems.filteredEntries.selectAll": "選取全部",
+  "config.roughlyenoughitems.filteredEntries.selectNone": "取消全選",
+  "config.roughlyenoughitems.filteredEntries.hide": "隱藏所選",
+  "config.roughlyenoughitems.filteredEntries.show": "顯示所選",
   "rule.roughlyenoughitems.filtering.manual": "手動篩選",
   "rule.roughlyenoughitems.filtering.manual.subtitle": "手動選擇哪些要顯示或隱藏。",
   "rule.roughlyenoughitems.filtering.search": "關鍵字篩選",
@@ -368,27 +230,6 @@
   "rule.roughlyenoughitems.filtering.search.show.false": "隱藏",
   "rule.roughlyenoughitems.filtering.basic": "一般插件篩選",
   "rule.roughlyenoughitems.filtering.basic.subtitle": "按 REI 插件過濾條目，這在此處不可設定。",
-  "language.roughlyenoughitems.english": "英文",
-  "language.roughlyenoughitems.japanese": "日文",
-  "language.roughlyenoughitems.chinese_simplified": "簡體中文",
-  "language.roughlyenoughitems.chinese_traditional": "繁體中文",
-  "language.roughlyenoughitems.chinese_traditional_hong_kong": "繁體中文（香港）",
-  "language.roughlyenoughitems.french": "法文",
-  "language.roughlyenoughitems.german": "德文",
-  "language.roughlyenoughitems.estonian": "愛沙尼亞文",
-  "language.roughlyenoughitems.portuguese": "葡萄牙文",
-  "language.roughlyenoughitems.portuguese_brazilian": "巴西葡萄牙文",
-  "language.roughlyenoughitems.lolcat": "LOLCAT",
-  "language.roughlyenoughitems.upside_down_english": "顛倒英文",
-  "language.roughlyenoughitems.bulgarian": "保加利亞文",
-  "language.roughlyenoughitems.russian": "俄文",
-  "language.roughlyenoughitems.polish": "波蘭文",
-  "language.roughlyenoughitems.norwegian": "挪威文",
-  "language.roughlyenoughitems.turkish": "土耳其文",
-  "language.roughlyenoughitems.ukrainian": "烏克蘭文",
-  "language.roughlyenoughitems.spanish": "西班牙文",
-  "language.roughlyenoughitems.italian": "義大利文",
-  "language.roughlyenoughitems.czech": "捷克文",
-  "language.roughlyenoughitems.danish": "丹麥文",
-  "language.roughlyenoughitems.hebrew": "希伯來文"
+  "rule.roughlyenoughitems.filtering.hide.tag": "標籤篩選",
+  "rule.roughlyenoughitems.filtering.hide.tag.subtitle": "按 'c:hidden_from_recipe_viewers' 過濾條目，這在此處不可設定。"
 }