From 91db25fd2bc0b1e0f00f13611d53e035b2aebff3 Mon Sep 17 00:00:00 2001 From: Jimmy-sheep Date: Sat, 18 Feb 2023 15:57:49 +0800 Subject: [PATCH 01/14] Add zh_tw.json --- .../assets/patchouli/lang/zh_tw.json | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json diff --git a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json new file mode 100644 index 00000000..6532fb2c --- /dev/null +++ b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json @@ -0,0 +1,101 @@ +{ + "item.patchouli.guide_book": "指南手冊", + "item.patchouli.guide_book.undefined": "無效的手冊：沒有定義的 ID", + "item.patchouli.guide_book.invalid": "無效的手冊：%s", + + "item.patchouli.comprehensive_test_book.name": "綜合測試書", + "item.patchouli.comprehensive_test_book.landing": "希望能成為綜合測試 Patchouli 的測試書，而不是現在這樣一盤散沙。", + + "item.patchouli:test_book_1.name": "測試書 1", + "item.patchouli:test_book_1.landing": "這裡的文本可能該更有趣一點。管他呢。", + + "item.patchouli:test_book_2.name": "測試書 2", + "item.patchouli:test_book_2.landing": "現在支持$(2)顏色$()和$(4)$(bold)粗體$()了！這就有趣多了。", + + "item.patchouli:test_completion.name": "進度測試書", + "item.patchouli:test_completion.landing": "隨著你解鎖條目，書的顏色會跟著變！", + + "item.patchouli:intro_book.name": "Patchouli", + "item.patchouli:intro_book.subtitle": "給所有人的文件", + "item.patchouli:intro_book.landing": "使用 $(item)Patchouli$() ，你可以為模組和整合包製作易於閱讀、可解鎖進度的$(thing)書$()！", + + "item.patchouli:pamphlet.name": "測試小冊", + "item.patchouli:pamphlet.landing": "一個測試小冊，這是一本只有一個類別的書。", + + "patchouli.subtitle.book_open": "翻開", + "patchouli.subtitle.book_flip": "翻頁", + + "patchouli.gui.lexicon.landing_info": "（預留位置登陸文字，請在你的 book.json 檔案中中自行定義！）", + "patchouli.gui.lexicon.progress_meter": "解鎖進度：", + "patchouli.gui.lexicon.progress_tooltip": "%d/%d 已解鎖", + "patchouli.gui.lexicon.progress_tooltip.secret1": "包含 1 個隱藏頁", + "patchouli.gui.lexicon.progress_tooltip.secret": "包含 %d 個隱藏頁", + "patchouli.gui.lexicon.progress_tooltip.info": "完成進度以解鎖更多內容！", + "patchouli.gui.lexicon.categories": "類別", + "patchouli.gui.lexicon.chapters": "章節", + "patchouli.gui.lexicon.editor": "書本編輯器", + "patchouli.gui.lexicon.editor.mock_header": "測試頁首", + "patchouli.gui.lexicon.editor.info": "這個編輯器是給 Patchouli 的書頁準備的，主要面向開發或翻譯時的測試。對普通玩家來說沒有用途。$(br2)參閱 $(l:https://github.com/Vazkii/Patchouli/wiki/Text-Formatting-101)Patchouli Wiki$() 了解更多關於控制字符的內容。", + "patchouli.gui.lexicon.shift_for_recipe": "Shift 點擊以顯示合成", + "patchouli.gui.lexicon.index": "總目錄", + "patchouli.gui.lexicon.index.info": "本書所有章節的索引。$(br2)你可以通過簡單地輸入你的查詢以搜索索引或任何其他類別。然後會出現一個搜索欄來幫助你。", + "patchouli.gui.lexicon.shapeless": "無序合成", + "patchouli.gui.lexicon.no_results": "沒有結果", + "patchouli.gui.lexicon.sad": ":(", + "patchouli.gui.lexicon.no_entries": "無條目", + "patchouli.gui.lexicon.locked": "（已鎖定）", + "patchouli.gui.lexicon.reloaded": "本書已重新載入，耗時 %d ms。", + "patchouli.gui.lexicon.add_bookmark": "新增書簽", + "patchouli.gui.lexicon.remove_bookmark": "（Shift 並點擊以清除）", + "patchouli.gui.lexicon.multiblock_bookmark": "可視化多方塊結構", + "patchouli.gui.lexicon.relations": "相關章節", + "patchouli.gui.lexicon.not_anchored": "右鍵點擊某個方塊以錨定結構", + "patchouli.gui.lexicon.structure_complete": "完成！", + "patchouli.gui.lexicon.needs_air": "（需要清除的方塊會標記為紅色）", + "patchouli.gui.lexicon.visualize_letter": "V", + "patchouli.gui.lexicon.seconds": "%s 秒", + "patchouli.gui.lexicon.history": "閱讀紀錄", + "patchouli.gui.lexicon.history.info": "這個章節儲存你之前訪問過的幾個章節。$(br2)當你瀏覽本書時，章節會自動新增和刪除。如果你希望更長時間地參考它們，你可以將它們加入書籤。$(br2)$(o)提示：嘗試按住 Shift 鍵並點擊章節按鈕！$()", + "patchouli.gui.lexicon.toast": "新章節", + "patchouli.gui.lexicon.toast.info": "新章節已解鎖", + "patchouli.gui.lexicon.external_link": "（外部連結）", + "patchouli.gui.lexicon.loading_error": "加載時遇到錯誤！", + "patchouli.gui.lexicon.loading_error_hover": "（鼠標指針懸停在這裡以顯示更多信息）", + "patchouli.gui.lexicon.loading_error_log": "請檢查記錄檔以取得更多", + "patchouli.gui.lexicon.dev_edition": "編輯者", + "patchouli.gui.lexicon.edition_str": "%s 版本", + "patchouli.gui.lexicon.added_by": "由 %s 新增", + "patchouli.gui.lexicon.sneak": "潛行以查看", + "patchouli.gui.lexicon.view": "檢視項目", + "patchouli.gui.lexicon.keybind": "快捷鍵：%s", + "patchouli.gui.lexicon.keybind_missing": "沒有這個快捷鍵：%s", + "patchouli.gui.lexicon.objective": "目標", + "patchouli.gui.lexicon.incomplete": "未完成", + "patchouli.gui.lexicon.complete": "完成！", + "patchouli.gui.lexicon.mark_complete": "標記為完成", + "patchouli.gui.lexicon.mark_incomplete": "標記為未完成", + + "patchouli.gui.lexicon.button.prev_page": "上一頁", + "patchouli.gui.lexicon.button.next_page": "下一頁", + "patchouli.gui.lexicon.button.back": "返回", + "patchouli.gui.lexicon.button.back.info": "Shift 並點擊以返回首頁", + "patchouli.gui.lexicon.button.resize": "調整介面大小", + "patchouli.gui.lexicon.button.toggle_mock_header": "切換模擬頁首", + "patchouli.gui.lexicon.button.resize.size0": "預設", + "patchouli.gui.lexicon.button.resize.size1": "小", + "patchouli.gui.lexicon.button.resize.size2": "中", + "patchouli.gui.lexicon.button.resize.size3": "稍大", + "patchouli.gui.lexicon.button.resize.size4": "大", + "patchouli.gui.lexicon.button.resize.size5": "極大", + "patchouli.gui.lexicon.button.resize.verybig.message": "你的螢幕有多大，甚至", + "patchouli.gui.lexicon.button.resize.verybig.container": "%s？", + "patchouli.gui.lexicon.button.editor": "編輯器", + "patchouli.gui.lexicon.button.editor.info": "（Shift 並點擊以重新載入）", + "patchouli.gui.lexicon.button.advancements": "進度", + "patchouli.gui.lexicon.button.config": "設定", + "patchouli.gui.lexicon.button.visualize": "可視化", + "patchouli.gui.lexicon.button.visualize.info": "（再次點擊以清除）", + "patchouli.gui.lexicon.button.history": "瀏覽歷史" + "patchouli.gui.lexicon.button.mark_all_read": "全部標示為已讀取", + "patchouli.gui.lexicon.button.mark_category_read": "標示這個類別為已讀取" +} \ No newline at end of file From f7f5c94729af0bfe1d6571b465b02d2a1ffe7245 Mon Sep 17 00:00:00 2001 From: Jimmy-sheep Date: Sat, 18 Feb 2023 23:33:40 +0800 Subject: [PATCH 02/14] Update zh_tw.json --- .../assets/patchouli/lang/zh_tw.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json index 6532fb2c..bd3acf9d 100644 --- a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json +++ b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json @@ -1,23 +1,23 @@ { "item.patchouli.guide_book": "指南手冊", - "item.patchouli.guide_book.undefined": "無效的手冊：沒有定義的 ID", + "item.patchouli.guide_book.undefined": "無效的手冊：沒有已定義的 ID", "item.patchouli.guide_book.invalid": "無效的手冊：%s", - "item.patchouli.comprehensive_test_book.name": "綜合測試書", - "item.patchouli.comprehensive_test_book.landing": "希望能成為綜合測試 Patchouli 的測試書，而不是現在這樣一盤散沙。", + "item.patchouli.comprehensive_test_book.name": "全方位測試書", + "item.patchouli.comprehensive_test_book.landing": "希望能成為全方位測試 Patchouli 的測試書，而不是現在這樣一團亂。", "item.patchouli:test_book_1.name": "測試書 1", - "item.patchouli:test_book_1.landing": "這裡的文本可能該更有趣一點。管他呢。", + "item.patchouli:test_book_1.landing": "沒那麼有趣的登陸文字，但仍然出現在這裡。", "item.patchouli:test_book_2.name": "測試書 2", - "item.patchouli:test_book_2.landing": "現在支持$(2)顏色$()和$(4)$(bold)粗體$()了！這就有趣多了。", + "item.patchouli:test_book_2.landing": "登陸文字！它甚至支援$(2)顏色$()和$(4)$(bold)粗體$()！", "item.patchouli:test_completion.name": "進度測試書", - "item.patchouli:test_completion.landing": "隨著你解鎖條目，書的顏色會跟著變！", + "item.patchouli:test_completion.landing": "隨著你解鎖項目，書的顏色會隨著改變！", "item.patchouli:intro_book.name": "Patchouli", "item.patchouli:intro_book.subtitle": "給所有人的文件", - "item.patchouli:intro_book.landing": "使用 $(item)Patchouli$() ，你可以為模組和整合包製作易於閱讀、可解鎖進度的$(thing)書$()！", + "item.patchouli:intro_book.landing": "使用 $(item)Patchouli$()，你可以為模組和整合包製作易於閱讀、可解鎖進度的$(thing)書$()！", "item.patchouli:pamphlet.name": "測試小冊", "item.patchouli:pamphlet.landing": "一個測試小冊，這是一本只有一個類別的書。", @@ -35,14 +35,14 @@ "patchouli.gui.lexicon.chapters": "章節", "patchouli.gui.lexicon.editor": "書本編輯器", "patchouli.gui.lexicon.editor.mock_header": "測試頁首", - "patchouli.gui.lexicon.editor.info": "這個編輯器是給 Patchouli 的書頁準備的，主要面向開發或翻譯時的測試。對普通玩家來說沒有用途。$(br2)參閱 $(l:https://github.com/Vazkii/Patchouli/wiki/Text-Formatting-101)Patchouli Wiki$() 了解更多關於控制字符的內容。", + "patchouli.gui.lexicon.editor.info": "這是 Patchouli 書本項目的編輯器。它用於開發或翻譯。如果你是玩家，則它對你沒有用。$(br2)請參考 $(l:https://github.com/Vazkii/Patchouli/wiki/Text-Formatting-101)Patchouli wiki$() 以獲得可用的控制代碼。", "patchouli.gui.lexicon.shift_for_recipe": "Shift 點擊以顯示合成", "patchouli.gui.lexicon.index": "總目錄", "patchouli.gui.lexicon.index.info": "本書所有章節的索引。$(br2)你可以通過簡單地輸入你的查詢以搜索索引或任何其他類別。然後會出現一個搜索欄來幫助你。", "patchouli.gui.lexicon.shapeless": "無序合成", "patchouli.gui.lexicon.no_results": "沒有結果", "patchouli.gui.lexicon.sad": ":(", - "patchouli.gui.lexicon.no_entries": "無條目", + "patchouli.gui.lexicon.no_entries": "無項目", "patchouli.gui.lexicon.locked": "（已鎖定）", "patchouli.gui.lexicon.reloaded": "本書已重新載入，耗時 %d ms。", "patchouli.gui.lexicon.add_bookmark": "新增書簽", @@ -98,4 +98,4 @@ "patchouli.gui.lexicon.button.history": "瀏覽歷史" "patchouli.gui.lexicon.button.mark_all_read": "全部標示為已讀取", "patchouli.gui.lexicon.button.mark_category_read": "標示這個類別為已讀取" -} \ No newline at end of file +} From fa465ee302ecf9dac3b0239429bfd1e636832cc1 Mon Sep 17 00:00:00 2001 From: Jimmy-sheep Date: Sat, 18 Feb 2023 23:34:52 +0800 Subject: [PATCH 03/14] Update zh_tw.json --- Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json index bd3acf9d..cbc7528a 100644 --- a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json +++ b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json @@ -35,7 +35,7 @@ "patchouli.gui.lexicon.chapters": "章節", "patchouli.gui.lexicon.editor": "書本編輯器", "patchouli.gui.lexicon.editor.mock_header": "測試頁首", - "patchouli.gui.lexicon.editor.info": "這是 Patchouli 書本項目的編輯器。它用於開發或翻譯。如果你是玩家，則它對你沒有用。$(br2)請參考 $(l:https://github.com/Vazkii/Patchouli/wiki/Text-Formatting-101)Patchouli wiki$() 以獲得可用的控制代碼。", + "patchouli.gui.lexicon.editor.info": "這是 Patchouli 書本項目的編輯器。它用於開發或翻譯。如果你是玩家，則它對你沒有用。$(br2)請參考 $(l:https://github.com/Vazkii/Patchouli/wiki/Text-Formatting-101)Patchouli wiki$() 以取得可用的控制代碼。", "patchouli.gui.lexicon.shift_for_recipe": "Shift 點擊以顯示合成", "patchouli.gui.lexicon.index": "總目錄", "patchouli.gui.lexicon.index.info": "本書所有章節的索引。$(br2)你可以通過簡單地輸入你的查詢以搜索索引或任何其他類別。然後會出現一個搜索欄來幫助你。", From 1b9dc9636373c75183972503a8aaffcbc33494ec Mon Sep 17 00:00:00 2001 From: Jimmy-sheep Date: Sat, 18 Feb 2023 23:42:34 +0800 Subject: [PATCH 04/14] Update zh_tw.json --- .../resources/assets/patchouli/lang/zh_tw.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json index cbc7528a..667df947 100644 --- a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json +++ b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json @@ -35,17 +35,17 @@ "patchouli.gui.lexicon.chapters": "章節", "patchouli.gui.lexicon.editor": "書本編輯器", "patchouli.gui.lexicon.editor.mock_header": "測試頁首", - "patchouli.gui.lexicon.editor.info": "這是 Patchouli 書本項目的編輯器。它用於開發或翻譯。如果你是玩家，則它對你沒有用。$(br2)請參考 $(l:https://github.com/Vazkii/Patchouli/wiki/Text-Formatting-101)Patchouli wiki$() 以取得可用的控制代碼。", + "patchouli.gui.lexicon.editor.info": "這是 Patchouli 書本項目的編輯器。它用於開發或翻譯。如果你是玩家，則它對你沒有用。$(br2)請參考 $(l:https://github.com/Vazkii/Patchouli/wiki/Text-Formatting-101)Patchouli wiki$() 以獲得可用的控制代碼。", "patchouli.gui.lexicon.shift_for_recipe": "Shift 點擊以顯示合成", "patchouli.gui.lexicon.index": "總目錄", - "patchouli.gui.lexicon.index.info": "本書所有章節的索引。$(br2)你可以通過簡單地輸入你的查詢以搜索索引或任何其他類別。然後會出現一個搜索欄來幫助你。", + "patchouli.gui.lexicon.index.info": "本書所有章節的索引。$(br2)你可以通過簡單地輸入你的查詢以搜尋索引或任何其他類別。然後會出現一個搜尋列來幫助你。", "patchouli.gui.lexicon.shapeless": "無序合成", "patchouli.gui.lexicon.no_results": "沒有結果", "patchouli.gui.lexicon.sad": ":(", "patchouli.gui.lexicon.no_entries": "無項目", "patchouli.gui.lexicon.locked": "（已鎖定）", "patchouli.gui.lexicon.reloaded": "本書已重新載入，耗時 %d ms。", - "patchouli.gui.lexicon.add_bookmark": "新增書簽", + "patchouli.gui.lexicon.add_bookmark": "新增書籤", "patchouli.gui.lexicon.remove_bookmark": "（Shift 並點擊以清除）", "patchouli.gui.lexicon.multiblock_bookmark": "可視化多方塊結構", "patchouli.gui.lexicon.relations": "相關章節", @@ -60,12 +60,12 @@ "patchouli.gui.lexicon.toast.info": "新章節已解鎖", "patchouli.gui.lexicon.external_link": "（外部連結）", "patchouli.gui.lexicon.loading_error": "加載時遇到錯誤！", - "patchouli.gui.lexicon.loading_error_hover": "（鼠標指針懸停在這裡以顯示更多信息）", + "patchouli.gui.lexicon.loading_error_hover": "（暫留以查看資訊）", "patchouli.gui.lexicon.loading_error_log": "請檢查記錄檔以取得更多", "patchouli.gui.lexicon.dev_edition": "編輯者", "patchouli.gui.lexicon.edition_str": "%s 版本", "patchouli.gui.lexicon.added_by": "由 %s 新增", - "patchouli.gui.lexicon.sneak": "潛行以查看", + "patchouli.gui.lexicon.sneak": "潛行以檢視", "patchouli.gui.lexicon.view": "檢視項目", "patchouli.gui.lexicon.keybind": "快捷鍵：%s", "patchouli.gui.lexicon.keybind_missing": "沒有這個快捷鍵：%s", @@ -96,6 +96,6 @@ "patchouli.gui.lexicon.button.visualize": "可視化", "patchouli.gui.lexicon.button.visualize.info": "（再次點擊以清除）", "patchouli.gui.lexicon.button.history": "瀏覽歷史" - "patchouli.gui.lexicon.button.mark_all_read": "全部標示為已讀取", - "patchouli.gui.lexicon.button.mark_category_read": "標示這個類別為已讀取" + "patchouli.gui.lexicon.button.mark_all_read": "全部標示為已讀", + "patchouli.gui.lexicon.button.mark_category_read": "標示這個類別為已讀" } From a6c33c305af4fa46401507e4da43e63b58430230 Mon Sep 17 00:00:00 2001 From: Jimmy-sheep Date: Sun, 19 Feb 2023 16:06:26 +0800 Subject: [PATCH 05/14] Fix the translation --- Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json index 667df947..9e549725 100644 --- a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json +++ b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json @@ -25,7 +25,7 @@ "patchouli.subtitle.book_open": "翻開", "patchouli.subtitle.book_flip": "翻頁", - "patchouli.gui.lexicon.landing_info": "（預留位置登陸文字，請在你的 book.json 檔案中中自行定義！）", + "patchouli.gui.lexicon.landing_info": "（預留登陸文字，請在你的 book.json 檔案中中自行定義！）", "patchouli.gui.lexicon.progress_meter": "解鎖進度：", "patchouli.gui.lexicon.progress_tooltip": "%d/%d 已解鎖", "patchouli.gui.lexicon.progress_tooltip.secret1": "包含 1 個隱藏頁", From 001707842873229ec29da2f30e6f9f0ae69f7f78 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 10 Jul 2023 18:47:13 -0700 Subject: [PATCH 06/14] Set 1.19.4 hotfix version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 19d9d92c..6b46fd3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,6 +8,6 @@ org.gradle.jvmargs=-Xmx1G \ --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED mc_version=1.19.4 -build_number=80 +build_number=79.1 group=vazkii.patchouli mod_name=Patchouli From d119d2893559857c5f8bf28cc804bb0e459cbe86 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 10 Jul 2023 18:48:57 -0700 Subject: [PATCH 07/14] Disable doc push --- .github/workflows/{deploy_docs.yml => deploy_docs.yml.disabled} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{deploy_docs.yml => deploy_docs.yml.disabled} (100%) diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml.disabled similarity index 100% rename from .github/workflows/deploy_docs.yml rename to .github/workflows/deploy_docs.yml.disabled From 12f89b0fe3da2dbbbd5d8edf87b3fffa4cf0bee2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 10 Jul 2023 18:20:05 -0700 Subject: [PATCH 08/14] Fix book recipe type being broken. In the original commit message, I claimed outputBook was always null, but that was a lie, I just can't read. Restore calling getResultItem and add comments/safety checks about why what we're doing is safe. Back out "Refine commit 8224fcf29781f7820c38b172645c3d14ead96b3d by dropping the method entirely" Original commit changeset: f994182f635f --- .../common/recipe/BookRecipeSerializer.java | 3 ++- .../common/recipe/ShapedBookRecipe.java | 21 +++++++++++++++---- .../common/recipe/ShapelessBookRecipe.java | 21 +++++++++++++++---- 3 files changed, 36 insertions(+), 9 deletions(-) diff --git a/Xplat/src/main/java/vazkii/patchouli/common/recipe/BookRecipeSerializer.java b/Xplat/src/main/java/vazkii/patchouli/common/recipe/BookRecipeSerializer.java index a628a247..23fd0f2b 100644 --- a/Xplat/src/main/java/vazkii/patchouli/common/recipe/BookRecipeSerializer.java +++ b/Xplat/src/main/java/vazkii/patchouli/common/recipe/BookRecipeSerializer.java @@ -13,10 +13,11 @@ import vazkii.patchouli.common.item.PatchouliItems; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.function.BiFunction; -public record BookRecipeSerializer, U extends T> (RecipeSerializer compose, BiFunction converter) implements RecipeSerializer { +public record BookRecipeSerializer, U extends T> (RecipeSerializer compose, BiFunction converter) implements RecipeSerializer { @Override @NotNull public U fromJson(@NotNull ResourceLocation id, @NotNull JsonObject json) { diff --git a/Xplat/src/main/java/vazkii/patchouli/common/recipe/ShapedBookRecipe.java b/Xplat/src/main/java/vazkii/patchouli/common/recipe/ShapedBookRecipe.java index f17e6bed..e56adaa7 100644 --- a/Xplat/src/main/java/vazkii/patchouli/common/recipe/ShapedBookRecipe.java +++ b/Xplat/src/main/java/vazkii/patchouli/common/recipe/ShapedBookRecipe.java @@ -1,12 +1,18 @@ package vazkii.patchouli.common.recipe; +import com.google.common.base.Preconditions; + +import net.minecraft.core.RegistryAccess; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.CraftingBookCategory; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.ShapedRecipe; import vazkii.patchouli.api.PatchouliAPI; +import org.jetbrains.annotations.Nullable; + /** * Recipe type for shaped book recipes. * The format is the same as vanilla shaped recipes, but the @@ -15,10 +21,17 @@ public class ShapedBookRecipe extends ShapedRecipe { public static final RecipeSerializer SERIALIZER = new BookRecipeSerializer<>(RecipeSerializer.SHAPED_RECIPE, ShapedBookRecipe::new); - public ShapedBookRecipe(ShapedRecipe compose, ResourceLocation outputBook) { - super(compose.getId(), compose.getGroup(), CraftingBookCategory.MISC, - compose.getWidth(), compose.getHeight(), compose.getIngredients(), - PatchouliAPI.get().getBookStack(outputBook)); + public ShapedBookRecipe(ShapedRecipe compose, @Nullable ResourceLocation outputBook) { + super(compose.getId(), compose.getGroup(), CraftingBookCategory.MISC, compose.getWidth(), compose.getHeight(), compose.getIngredients(), getOutputBook(compose, outputBook)); + } + + private static ItemStack getOutputBook(ShapedRecipe compose, @Nullable ResourceLocation outputBook) { + Preconditions.checkArgument(compose.getClass() == ShapedRecipe.class, "Must be exactly ShapedRecipe"); + if (outputBook != null) { + return PatchouliAPI.get().getBookStack(outputBook); + } + // The vanilla ShapedRecipe implementation never uses the passed RegistryAccess, so this is ok. + return compose.getResultItem(RegistryAccess.EMPTY); } @Override diff --git a/Xplat/src/main/java/vazkii/patchouli/common/recipe/ShapelessBookRecipe.java b/Xplat/src/main/java/vazkii/patchouli/common/recipe/ShapelessBookRecipe.java index b7232d69..4fb8ff54 100644 --- a/Xplat/src/main/java/vazkii/patchouli/common/recipe/ShapelessBookRecipe.java +++ b/Xplat/src/main/java/vazkii/patchouli/common/recipe/ShapelessBookRecipe.java @@ -1,12 +1,18 @@ package vazkii.patchouli.common.recipe; +import com.google.common.base.Preconditions; + +import net.minecraft.core.RegistryAccess; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.CraftingBookCategory; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.ShapelessRecipe; import vazkii.patchouli.api.PatchouliAPI; +import org.jetbrains.annotations.Nullable; + /** * Recipe type for shapeless book recipes. * The format is the same as vanilla shapeless recipes, but the @@ -15,10 +21,17 @@ public class ShapelessBookRecipe extends ShapelessRecipe { public static final RecipeSerializer SERIALIZER = new BookRecipeSerializer<>(RecipeSerializer.SHAPELESS_RECIPE, ShapelessBookRecipe::new); - public ShapelessBookRecipe(ShapelessRecipe compose, ResourceLocation outputBook) { - super(compose.getId(), compose.getGroup(), CraftingBookCategory.MISC, - PatchouliAPI.get().getBookStack(outputBook), - compose.getIngredients()); + public ShapelessBookRecipe(ShapelessRecipe compose, @Nullable ResourceLocation outputBook) { + super(compose.getId(), compose.getGroup(), CraftingBookCategory.MISC, getOutputBook(compose, outputBook), compose.getIngredients()); + } + + private static ItemStack getOutputBook(ShapelessRecipe compose, @Nullable ResourceLocation outputBook) { + Preconditions.checkArgument(compose.getClass() == ShapelessRecipe.class, "Must be exactly ShapelessRecipe"); + if (outputBook != null) { + return PatchouliAPI.get().getBookStack(outputBook); + } + // The vanilla ShapelessRecipe implementation never uses the passed RegistryAccess, so this is ok. + return compose.getResultItem(RegistryAccess.EMPTY); } @Override From 5e2c9698f0ab179542607b0f94a8748cebf42b4f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 10 Jul 2023 18:52:07 -0700 Subject: [PATCH 09/14] Bump to 79.2 after releasing 79.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6b46fd3e..46a48771 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,6 +8,6 @@ org.gradle.jvmargs=-Xmx1G \ --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED mc_version=1.19.4 -build_number=79.1 +build_number=79.2 group=vazkii.patchouli mod_name=Patchouli From d7397871eff7d50f7836cf7cae6f80ad23e13b71 Mon Sep 17 00:00:00 2001 From: Jimmy-sheep Date: Sat, 18 Nov 2023 23:29:46 +0800 Subject: [PATCH 10/14] Update zh_tw.json Fix typo --- Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json index 9e549725..8f34e6cf 100644 --- a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json +++ b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json @@ -25,7 +25,7 @@ "patchouli.subtitle.book_open": "翻開", "patchouli.subtitle.book_flip": "翻頁", - "patchouli.gui.lexicon.landing_info": "（預留登陸文字，請在你的 book.json 檔案中中自行定義！）", + "patchouli.gui.lexicon.landing_info": "（預留登陸文字，請在你的 book.json 檔案中自行定義！）", "patchouli.gui.lexicon.progress_meter": "解鎖進度：", "patchouli.gui.lexicon.progress_tooltip": "%d/%d 已解鎖", "patchouli.gui.lexicon.progress_tooltip.secret1": "包含 1 個隱藏頁", From 0a6bbd837aa8e0cca12542391251f0a703b5a92d Mon Sep 17 00:00:00 2001 From: Jimmy-sheep Date: Sat, 18 Nov 2023 23:32:15 +0800 Subject: [PATCH 11/14] Little fix translation --- Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json index 8f34e6cf..0b98612e 100644 --- a/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json +++ b/Xplat/src/main/resources/assets/patchouli/lang/zh_tw.json @@ -96,6 +96,6 @@ "patchouli.gui.lexicon.button.visualize": "可視化", "patchouli.gui.lexicon.button.visualize.info": "（再次點擊以清除）", "patchouli.gui.lexicon.button.history": "瀏覽歷史" - "patchouli.gui.lexicon.button.mark_all_read": "全部標示為已讀", - "patchouli.gui.lexicon.button.mark_category_read": "標示這個類別為已讀" + "patchouli.gui.lexicon.button.mark_all_read": "全部標記為已讀", + "patchouli.gui.lexicon.button.mark_category_read": "標記這個類別為已讀" } From d27753496d514225858bcabd0d862561cce72de8 Mon Sep 17 00:00:00 2001 From: Polarni Date: Tue, 21 Nov 2023 19:21:59 +0100 Subject: [PATCH 12/14] Create cs_cz.json (#698) * Create cs_cz.json Czech localization * Update cs_cz.json A really small correction in the text. --- .../assets/patchouli/lang/cs_cz.json | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 Xplat/src/main/resources/assets/patchouli/lang/cs_cz.json diff --git a/Xplat/src/main/resources/assets/patchouli/lang/cs_cz.json b/Xplat/src/main/resources/assets/patchouli/lang/cs_cz.json new file mode 100644 index 00000000..ab43f526 --- /dev/null +++ b/Xplat/src/main/resources/assets/patchouli/lang/cs_cz.json @@ -0,0 +1,101 @@ +{ + "item.patchouli.guide_book": "Průvodce", + "item.patchouli.guide_book.undefined": "Neplatná kniha: není definováno ID", + "item.patchouli.guide_book.invalid": "Neplatná kniha: %s", + + "item.patchouli.comprehensive_test_book.name": "Komplexní zkušební kniha", + "item.patchouli.comprehensive_test_book.landing": "Doufejme, že se stane komplexní testovací knihou pro celou Patchouli, namísto změti náhodných špaget, které máme teď.", + + "item.patchouli:test_book_1.name": "Testovací kniha 1", + "item.patchouli:test_book_1.landing": "Ne tak zábavný uvítací text, ale je tu.", + + "item.patchouli:test_book_2.name": "Testovací kniha 2", + "item.patchouli:test_book_2.landing": "Uvítací text! Dokonce podporuje $(2)barvy$() a $(4)jiné $(bold)formátování$()!", + + "item.patchouli:test_completion.name": "Zkušební kniha na základě pokroku", + "item.patchouli:test_completion.landing": "Tato kniha mění barvy, když odemknete záznamy!", + + "item.patchouli:intro_book.name": "Patchouli", + "item.patchouli:intro_book.subtitle": "Dokumentace pro všechny", + "item.patchouli:intro_book.landing": "S $(item)Patchouli$() můžete vytvářet snadno čitelné a postupně odemykatelné $(thing)knihy$() pro mody a modpacky!", + + "item.patchouli:pamphlet.name": "Testovací brožura", + "item.patchouli:pamphlet.landing": "Testovací brožura je kniha pouze s jednou kategorií.", + + "patchouli.subtitle.book_open": "Otevření knihy", + "patchouli.subtitle.book_flip": "Otočení stránky", + + "patchouli.gui.lexicon.landing_info": "(Vzorový text úvodní strany, definujte svůj vlastní v json souboru vaší knihy!)", + "patchouli.gui.lexicon.progress_meter": "Postup odemykání", + "patchouli.gui.lexicon.progress_tooltip": "%d/%d odemčeno", + "patchouli.gui.lexicon.progress_tooltip.secret1": "Plus 1 tajemství", + "patchouli.gui.lexicon.progress_tooltip.secret": "Plus %d tajemství", + "patchouli.gui.lexicon.progress_tooltip.info": "Dokončete postup a odemkněte další!", + "patchouli.gui.lexicon.categories": "Kategorie", + "patchouli.gui.lexicon.chapters": "Kapitoly", + "patchouli.gui.lexicon.editor": "Knižní editor", + "patchouli.gui.lexicon.editor.mock_header": "Maketa hlavičky", + "patchouli.gui.lexicon.editor.info": "Toto je editor pro záznamy v knize Patchouli. Je určen pro vývoj nebo překlad. Pokud jste hráč, nemá pro vás žádné využití.$(br2)Použitelné formátovací kódy naleznete na webu $(l:https://vazkiimods.github.io/Patchouli/docs/patchouli-basics/text-formatting)Patchouli Wiki (EN)$().", + "patchouli.gui.lexicon.shift_for_recipe": "Shift-klik pro recept", + "patchouli.gui.lexicon.index": "Rejstřík záznamů", + "patchouli.gui.lexicon.index.info": "Rejstřík všech kapitol, které jsou v této knize k dispozici.$(br2)V indexu nebo v jakékoli jiné kategorii můžete vyhledávat pouhým zadáním dotazu klávesama. Poté se zobrazí vyhledávací panel, který vám pomůže.", + "patchouli.gui.lexicon.shapeless": "Bez přesného tvaru", + "patchouli.gui.lexicon.no_results": "Žádné výsledky", + "patchouli.gui.lexicon.sad": ":(", + "patchouli.gui.lexicon.no_entries": "Žádné záznamy", + "patchouli.gui.lexicon.locked": "(Zamčeno)", + "patchouli.gui.lexicon.reloaded": "Knihy se obnovily v %d ms.", + "patchouli.gui.lexicon.add_bookmark": "Přidat záložku", + "patchouli.gui.lexicon.remove_bookmark": "(Shift-Click pro smazání)", + "patchouli.gui.lexicon.multiblock_bookmark": "Vizualizovaná struktura", + "patchouli.gui.lexicon.relations": "Související kapitoly", + "patchouli.gui.lexicon.not_anchored": "Pravým kliknutím na blok zakotvíte Strukturu", + "patchouli.gui.lexicon.structure_complete": "Dokončeno!", + "patchouli.gui.lexicon.needs_air": "(Vyčistit bloky označené červeně)", + "patchouli.gui.lexicon.visualize_letter": "V", + "patchouli.gui.lexicon.seconds": "%ss", + "patchouli.gui.lexicon.history": "Historie čtení", + "patchouli.gui.lexicon.history.info": "V této části je uloženo několik předchozích kapitol, které jste navštívili.$(br2)Kapitoly se automaticky přidávají a odebírají při procházení knihy. Pokud si přejete mít na ně odkaz delší dobu, můžete si je uložit do záložek.$(br2)$(o)Tip: Zkuste kliknout na tlačítko kapitoly pomocí klávesy Shift!$()", + "patchouli.gui.lexicon.toast": "Nová kapitola", + "patchouli.gui.lexicon.toast.info": "Nová kapitola odemknuta", + "patchouli.gui.lexicon.external_link": "(Externí odkaz)", + "patchouli.gui.lexicon.loading_error": "Chyba načítání!", + "patchouli.gui.lexicon.loading_error_hover": "(Pro informace najedete myší)", + "patchouli.gui.lexicon.loading_error_log": "Další informace najdete v logu", + "patchouli.gui.lexicon.dev_edition": "Edice Autora", + "patchouli.gui.lexicon.edition_str": "%s edice", + "patchouli.gui.lexicon.added_by": "Přidaů %s", + "patchouli.gui.lexicon.sneak": "Pro náhled se skrčte", + "patchouli.gui.lexicon.view": "Zobrazit záznam", + "patchouli.gui.lexicon.keybind": "Klávesa: %s", + "patchouli.gui.lexicon.keybind_missing": "Taková klávesová zkratka neexistuje: %s", + "patchouli.gui.lexicon.objective": "Cíl", + "patchouli.gui.lexicon.incomplete": "Nedokončeno", + "patchouli.gui.lexicon.complete": "Dokončeno!", + "patchouli.gui.lexicon.mark_complete": "Označit jako dokončené", + "patchouli.gui.lexicon.mark_incomplete": "Označit jako nedokončené", + + "patchouli.gui.lexicon.button.prev_page": "Předchozí", + "patchouli.gui.lexicon.button.next_page": "Další", + "patchouli.gui.lexicon.button.back": "Zpátky", + "patchouli.gui.lexicon.button.back.info": "Shift-Click pro návrat na hlavní stránku", + "patchouli.gui.lexicon.button.resize": "Změna velikosti UI", + "patchouli.gui.lexicon.button.toggle_mock_header": "Přepínání makety hlavičky", + "patchouli.gui.lexicon.button.resize.size0": "Výchozí", + "patchouli.gui.lexicon.button.resize.size1": "Malá", + "patchouli.gui.lexicon.button.resize.size2": "Střední", + "patchouli.gui.lexicon.button.resize.size3": "Středně velká", + "patchouli.gui.lexicon.button.resize.size4": "Velká", + "patchouli.gui.lexicon.button.resize.size5": "Obrovská", + "patchouli.gui.lexicon.button.resize.verybig.message": "Jak velký je váš monitor?", + "patchouli.gui.lexicon.button.resize.verybig.container": "%s?", + "patchouli.gui.lexicon.button.editor": "Editor", + "patchouli.gui.lexicon.button.editor.info": "(Shift-Click pro znovunačtení)", + "patchouli.gui.lexicon.button.advancements": "Pokroky", + "patchouli.gui.lexicon.button.config": "Konfigurace", + "patchouli.gui.lexicon.button.visualize": "Vizualizace", + "patchouli.gui.lexicon.button.visualize.info": "(Pro smazání klikni znovu)", + "patchouli.gui.lexicon.button.history": "Historie", + "patchouli.gui.lexicon.button.mark_all_read": "Označit vše jako přečtené", + "patchouli.gui.lexicon.button.mark_category_read": "Označte tuto kategorii jako přečtenou" +} From 0ff63c1c5073bba41b455d7ec6c8e949fa4b8ec5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 21 Nov 2023 12:22:48 -0600 Subject: [PATCH 13/14] Revert "Create cs_cz.json (#698)" (#699) This reverts commit d27753496d514225858bcabd0d862561cce72de8. --- .../assets/patchouli/lang/cs_cz.json | 101 ------------------ 1 file changed, 101 deletions(-) delete mode 100644 Xplat/src/main/resources/assets/patchouli/lang/cs_cz.json diff --git a/Xplat/src/main/resources/assets/patchouli/lang/cs_cz.json b/Xplat/src/main/resources/assets/patchouli/lang/cs_cz.json deleted file mode 100644 index ab43f526..00000000 --- a/Xplat/src/main/resources/assets/patchouli/lang/cs_cz.json +++ /dev/null @@ -1,101 +0,0 @@ -{ - "item.patchouli.guide_book": "Průvodce", - "item.patchouli.guide_book.undefined": "Neplatná kniha: není definováno ID", - "item.patchouli.guide_book.invalid": "Neplatná kniha: %s", - - "item.patchouli.comprehensive_test_book.name": "Komplexní zkušební kniha", - "item.patchouli.comprehensive_test_book.landing": "Doufejme, že se stane komplexní testovací knihou pro celou Patchouli, namísto změti náhodných špaget, které máme teď.", - - "item.patchouli:test_book_1.name": "Testovací kniha 1", - "item.patchouli:test_book_1.landing": "Ne tak zábavný uvítací text, ale je tu.", - - "item.patchouli:test_book_2.name": "Testovací kniha 2", - "item.patchouli:test_book_2.landing": "Uvítací text! Dokonce podporuje $(2)barvy$() a $(4)jiné $(bold)formátování$()!", - - "item.patchouli:test_completion.name": "Zkušební kniha na základě pokroku", - "item.patchouli:test_completion.landing": "Tato kniha mění barvy, když odemknete záznamy!", - - "item.patchouli:intro_book.name": "Patchouli", - "item.patchouli:intro_book.subtitle": "Dokumentace pro všechny", - "item.patchouli:intro_book.landing": "S $(item)Patchouli$() můžete vytvářet snadno čitelné a postupně odemykatelné $(thing)knihy$() pro mody a modpacky!", - - "item.patchouli:pamphlet.name": "Testovací brožura", - "item.patchouli:pamphlet.landing": "Testovací brožura je kniha pouze s jednou kategorií.", - - "patchouli.subtitle.book_open": "Otevření knihy", - "patchouli.subtitle.book_flip": "Otočení stránky", - - "patchouli.gui.lexicon.landing_info": "(Vzorový text úvodní strany, definujte svůj vlastní v json souboru vaší knihy!)", - "patchouli.gui.lexicon.progress_meter": "Postup odemykání", - "patchouli.gui.lexicon.progress_tooltip": "%d/%d odemčeno", - "patchouli.gui.lexicon.progress_tooltip.secret1": "Plus 1 tajemství", - "patchouli.gui.lexicon.progress_tooltip.secret": "Plus %d tajemství", - "patchouli.gui.lexicon.progress_tooltip.info": "Dokončete postup a odemkněte další!", - "patchouli.gui.lexicon.categories": "Kategorie", - "patchouli.gui.lexicon.chapters": "Kapitoly", - "patchouli.gui.lexicon.editor": "Knižní editor", - "patchouli.gui.lexicon.editor.mock_header": "Maketa hlavičky", - "patchouli.gui.lexicon.editor.info": "Toto je editor pro záznamy v knize Patchouli. Je určen pro vývoj nebo překlad. Pokud jste hráč, nemá pro vás žádné využití.$(br2)Použitelné formátovací kódy naleznete na webu $(l:https://vazkiimods.github.io/Patchouli/docs/patchouli-basics/text-formatting)Patchouli Wiki (EN)$().", - "patchouli.gui.lexicon.shift_for_recipe": "Shift-klik pro recept", - "patchouli.gui.lexicon.index": "Rejstřík záznamů", - "patchouli.gui.lexicon.index.info": "Rejstřík všech kapitol, které jsou v této knize k dispozici.$(br2)V indexu nebo v jakékoli jiné kategorii můžete vyhledávat pouhým zadáním dotazu klávesama. Poté se zobrazí vyhledávací panel, který vám pomůže.", - "patchouli.gui.lexicon.shapeless": "Bez přesného tvaru", - "patchouli.gui.lexicon.no_results": "Žádné výsledky", - "patchouli.gui.lexicon.sad": ":(", - "patchouli.gui.lexicon.no_entries": "Žádné záznamy", - "patchouli.gui.lexicon.locked": "(Zamčeno)", - "patchouli.gui.lexicon.reloaded": "Knihy se obnovily v %d ms.", - "patchouli.gui.lexicon.add_bookmark": "Přidat záložku", - "patchouli.gui.lexicon.remove_bookmark": "(Shift-Click pro smazání)", - "patchouli.gui.lexicon.multiblock_bookmark": "Vizualizovaná struktura", - "patchouli.gui.lexicon.relations": "Související kapitoly", - "patchouli.gui.lexicon.not_anchored": "Pravým kliknutím na blok zakotvíte Strukturu", - "patchouli.gui.lexicon.structure_complete": "Dokončeno!", - "patchouli.gui.lexicon.needs_air": "(Vyčistit bloky označené červeně)", - "patchouli.gui.lexicon.visualize_letter": "V", - "patchouli.gui.lexicon.seconds": "%ss", - "patchouli.gui.lexicon.history": "Historie čtení", - "patchouli.gui.lexicon.history.info": "V této části je uloženo několik předchozích kapitol, které jste navštívili.$(br2)Kapitoly se automaticky přidávají a odebírají při procházení knihy. Pokud si přejete mít na ně odkaz delší dobu, můžete si je uložit do záložek.$(br2)$(o)Tip: Zkuste kliknout na tlačítko kapitoly pomocí klávesy Shift!$()", - "patchouli.gui.lexicon.toast": "Nová kapitola", - "patchouli.gui.lexicon.toast.info": "Nová kapitola odemknuta", - "patchouli.gui.lexicon.external_link": "(Externí odkaz)", - "patchouli.gui.lexicon.loading_error": "Chyba načítání!", - "patchouli.gui.lexicon.loading_error_hover": "(Pro informace najedete myší)", - "patchouli.gui.lexicon.loading_error_log": "Další informace najdete v logu", - "patchouli.gui.lexicon.dev_edition": "Edice Autora", - "patchouli.gui.lexicon.edition_str": "%s edice", - "patchouli.gui.lexicon.added_by": "Přidaů %s", - "patchouli.gui.lexicon.sneak": "Pro náhled se skrčte", - "patchouli.gui.lexicon.view": "Zobrazit záznam", - "patchouli.gui.lexicon.keybind": "Klávesa: %s", - "patchouli.gui.lexicon.keybind_missing": "Taková klávesová zkratka neexistuje: %s", - "patchouli.gui.lexicon.objective": "Cíl", - "patchouli.gui.lexicon.incomplete": "Nedokončeno", - "patchouli.gui.lexicon.complete": "Dokončeno!", - "patchouli.gui.lexicon.mark_complete": "Označit jako dokončené", - "patchouli.gui.lexicon.mark_incomplete": "Označit jako nedokončené", - - "patchouli.gui.lexicon.button.prev_page": "Předchozí", - "patchouli.gui.lexicon.button.next_page": "Další", - "patchouli.gui.lexicon.button.back": "Zpátky", - "patchouli.gui.lexicon.button.back.info": "Shift-Click pro návrat na hlavní stránku", - "patchouli.gui.lexicon.button.resize": "Změna velikosti UI", - "patchouli.gui.lexicon.button.toggle_mock_header": "Přepínání makety hlavičky", - "patchouli.gui.lexicon.button.resize.size0": "Výchozí", - "patchouli.gui.lexicon.button.resize.size1": "Malá", - "patchouli.gui.lexicon.button.resize.size2": "Střední", - "patchouli.gui.lexicon.button.resize.size3": "Středně velká", - "patchouli.gui.lexicon.button.resize.size4": "Velká", - "patchouli.gui.lexicon.button.resize.size5": "Obrovská", - "patchouli.gui.lexicon.button.resize.verybig.message": "Jak velký je váš monitor?", - "patchouli.gui.lexicon.button.resize.verybig.container": "%s?", - "patchouli.gui.lexicon.button.editor": "Editor", - "patchouli.gui.lexicon.button.editor.info": "(Shift-Click pro znovunačtení)", - "patchouli.gui.lexicon.button.advancements": "Pokroky", - "patchouli.gui.lexicon.button.config": "Konfigurace", - "patchouli.gui.lexicon.button.visualize": "Vizualizace", - "patchouli.gui.lexicon.button.visualize.info": "(Pro smazání klikni znovu)", - "patchouli.gui.lexicon.button.history": "Historie", - "patchouli.gui.lexicon.button.mark_all_read": "Označit vše jako přečtené", - "patchouli.gui.lexicon.button.mark_category_read": "Označte tuto kategorii jako přečtenou" -} From 83f54a1ec533d9333986131fde34ae0fd122711e Mon Sep 17 00:00:00 2001 From: Jimmy-sheep Date: Thu, 23 Nov 2023 19:11:52 +0800 Subject: [PATCH 14/14] Rename deploy_docs.yml.disabled to deploy_docs.yml --- .github/workflows/{deploy_docs.yml.disabled => deploy_docs.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{deploy_docs.yml.disabled => deploy_docs.yml} (100%) diff --git a/.github/workflows/deploy_docs.yml.disabled b/.github/workflows/deploy_docs.yml similarity index 100% rename from .github/workflows/deploy_docs.yml.disabled rename to .github/workflows/deploy_docs.yml