From b21dc35abb9bc9a2d2797ea5da5951cbdd3c8e32 Mon Sep 17 00:00:00 2001 From: Minecraft_hyr <107340726+Minecrafthyr@users.noreply.github.com> Date: Wed, 8 Nov 2023 18:05:30 +0800 Subject: [PATCH 1/2] Fix a bug in dirt_path.json (#761) The old file causes a bug when the side touches a block, it will cull and make a 16\*1 pixel gap. ![before](https://github.com/Fabulously-Optimized/fabulously-optimized/assets/107340726/5b383713-ef30-42a1-b19c-47233914cf68) I fixed it by removing the lower "down" face to fix it. ![remove_down](https://github.com/Fabulously-Optimized/fabulously-optimized/assets/107340726/0ad097a8-c0c5-4adb-be85-226527d36471) Other choices: - Removing the extra box. [dirt_path.json](https://github.com/Fabulously-Optimized/fabulously-optimized/files/13290645/dirt_path.json) - Removing the lower "down" face and add 4 faces inside cull like side [dirt_path.json](https://github.com/Fabulously-Optimized/fabulously-optimized/files/13290650/dirt_path.json) - Removing the lower "down" face and add 4 faces inside cull like down [dirt_path.json](https://github.com/Fabulously-Optimized/fabulously-optimized/files/13290651/dirt_path.json) --- .../minecraft/models/block/dirt_path.json | 60 +++++++++---------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/Resource Packs/Fast Better Grass/assets/minecraft/models/block/dirt_path.json b/Resource Packs/Fast Better Grass/assets/minecraft/models/block/dirt_path.json index a61039c57..e0f4cdbf6 100644 --- a/Resource Packs/Fast Better Grass/assets/minecraft/models/block/dirt_path.json +++ b/Resource Packs/Fast Better Grass/assets/minecraft/models/block/dirt_path.json @@ -1,34 +1,32 @@ { - "parent": "block/block", - "textures": { - "particle": "block/dirt", - "top": "block/dirt_path_top", - "bottom": "block/dirt" + "parent": "block/block", + "textures": { + "particle": "block/dirt", + "top": "block/dirt_path_top", + "bottom": "block/dirt" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 15, 16], + "faces": { + "down": { "uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [0, 0, 16, 16], "texture": "#top" }, + "north": { "uv": [0, 0, 16, 15], "texture": "#top", "cullface": "north" }, + "south": { "uv": [0, 0, 16, 15], "texture": "#top", "cullface": "south" }, + "west": { "uv": [0, 0, 16, 15], "texture": "#top", "cullface": "west" }, + "east": { "uv": [0, 0, 16, 15], "texture": "#top", "cullface": "east" } + } }, - - "elements": [ - { "from": [ -0.008, -1, -0.008 ], - "to": [ 16.008, 15, 16.008 ], - "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, - "north": { "uv": [ 0, 1, 16.008, 16.008 ], "texture": "#top", "cullface": "north" }, - "south": { "uv": [ 0, 1, 16.008, 16.008 ], "texture": "#top", "cullface": "south" }, - "west": { "uv": [ 0, 1, 16.008, 16.008 ], "texture": "#top", "cullface": "west" }, - "east": { "uv": [ 0, 1, 16.008, 16.008 ], "texture": "#top", "cullface": "east" } - } - }, - { - "from": [0, -0, 0], - "to": [16, -0.0001, 16], - "faces": { - "north": {"uv": [0, 0, 16, 0], "texture": "#bottom", "cullface": "down" }, - "east": {"uv": [0, 0, 16, 0], "texture": "#bottom", "cullface": "down" }, - "south": {"uv": [0, 0, 16, 0], "texture": "#bottom", "cullface": "down" }, - "west": {"uv": [0, 0, 16, 0], "texture": "#bottom", "cullface": "down" }, - "up": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down" }, - "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down" } - } - } - ] + { + "from": [-0.008, -1, -0.008], + "to": [16.008, 0, 16.008], + "faces": { + "north": { "uv": [0, 15, 16, 16], "texture": "#top", "cullface": "north" }, + "east": { "uv": [0, 15, 16, 16], "texture": "#top", "cullface": "east" }, + "south": { "uv": [0, 15, 16, 16], "texture": "#top" , "cullface": "south"}, + "west": { "uv": [0, 15, 16, 16], "texture": "#top", "cullface": "west" } + } + } + ] } From 310a70536958f8fee904180b1d542060496fd71a Mon Sep 17 00:00:00 2001 From: Madis Date: Wed, 8 Nov 2023 11:18:01 +0100 Subject: [PATCH 2/2] Cherrypick Chinese Traditional CRH translation --- .../assets/fo/lang/zh_tw.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Resource Packs/Chat Reporting Helper/assets/fo/lang/zh_tw.json b/Resource Packs/Chat Reporting Helper/assets/fo/lang/zh_tw.json index 33df46118..551a5c38e 100644 --- a/Resource Packs/Chat Reporting Helper/assets/fo/lang/zh_tw.json +++ b/Resource Packs/Chat Reporting Helper/assets/fo/lang/zh_tw.json @@ -1,6 +1,6 @@ { "fo.resourcePack.chatreportinghelper": "§7用簡單的短語和圖示解釋聊天檢舉§r", - "chat.tag.modified": "玩家訊息可以向 Mojang 檢舉，但它已被伺服器修改。原訊息：", + "chat.tag.modified": "玩家訊息可以向 Mojang 檢舉，但它已被伺服器修改過。原文：", "chat.tag.not_secure": "無法向 Mojang 檢舉的玩家訊息。", "chat.tag.system": "伺服器訊息或玩家訊息無法向 Mojang 檢舉。", "chat.tag.system_single_player": "伺服器訊息或玩家訊息無法向 Mojang 檢舉。", @@ -13,32 +13,32 @@ "gui.abuseReport.message": "您在哪裡觀察到不當行為？\n這有助於我們調查您所提交的個案。\n這些檢舉不會被伺服器管理員看到。", "gui.chatReport.describe": "分享詳細資料有助 Mojang 做出更準確、清楚的判斷。這份檢舉不會被伺服器管理員看到。", "gui.abuseReport.describe": "分享詳細資料有助 Mojang 做出更準確、清楚的判斷。這份檢舉不會被伺服器管理員看到。", - "options.onlyShowSecureChat": "隱藏被修改的訊息", + "options.onlyShowSecureChat": "隱藏被修改過的訊息", "options.onlyShowSecureChat.tooltip": "隱藏無法向 Mojang 檢舉的玩家聊天訊息。", - "gui.nochatreports.secure_chat": "隱藏不能向 Mojang 檢舉的玩家聊天訊息。由於這會影響 No Chat Reports 的訊息，因此被停用。", - "gui.nochatreports.verified_server": "這個伺服器已將聊天訊息設為無法向 Mojang 檢舉。", - "gui.nochatreports.no_reporting": "這個伺服器已將聊天訊息設為無法向 Mojang 檢舉。", + "gui.nochatreports.secure_chat": "隱藏無法向 Mojang 檢舉的玩家聊天訊息。由於這會影響 No Chat Reports 的訊息，因此被停用。", + "gui.nochatreports.verified_server": "此伺服器已將聊天訊息設為無法向 Mojang 檢舉。", + "gui.nochatreports.no_reporting": "此伺服器已將聊天訊息設為無法向 Mojang 檢舉。", "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports：§r%1$s\n若停用，玩家訊息將可以向 Mojang 檢舉並且聊天盾牌按鈕也會被隱藏。此選項不會影響其他 No Chat Reports 選項。", "gui.nochatreports.safety_status.secure": "其他玩家的訊息無法向 Mojang 檢舉。", "gui.nochatreports.safety_status.singleplayer": "在單人遊戲和由你開啟的區網世界中，訊息無法向 Mojang 檢舉。", "gui.nochatreports.safety_status.unintrusive": "其他玩家的訊息可能可以向 Mojang 檢舉。在社群交流畫面確認。", "gui.nochatreports.safety_status.insecure": "其他玩家的訊息可以向 Mojang 檢舉。", "gui.nochatreports.safety_status.insecure_signing": "你的訊息可以向 Mojang 檢舉。", - "gui.nochatreports.safety_status.realms": "其他玩家的訊息可向 Mojang 進行檢舉。Mojang 也會使用自動化聊天監控聊天，以找出違規行為。", + "gui.nochatreports.safety_status.realms": "其他玩家的訊息可以向 Mojang 檢舉。Mojang 也會使用自動化聊天監控聊天，以找出違規行為。", "gui.nochatreports.safety_status.unknown": "聊天檢舉狀態尚不清楚。傳送訊息以取得狀態。", - "gui.nochatreports.safety_status.undefined": "由於錯誤，聊天報告狀態未知。嘗試重新啟動遊戲。", + "gui.nochatreports.safety_status.undefined": "由於錯誤，聊天檢舉狀態未知。請嘗試重新啟動遊戲。", "gui.nochatreports.signing_status.allowed_realms": "在 Realms 上，你的訊息永遠可以向 Mojang 檢舉。Mojang 也會使用自動化聊天監控，以找出違規行為。", - "gui.nochatreports.signing_status.allowed": "你可以選擇是否要向 Mojang 檢舉你的訊息。", + "gui.nochatreports.signing_status.allowed": "你的訊息是否可以向 Mojang 檢舉取決於你的選擇。", "gui.nochatreports.signing_status.allowed_session": "你的訊息可以向 Mojang 檢舉。若要確認是否仍然需要這樣做，請再次加入伺服器。", "gui.nochatreports.signing_status.disabled_allowance_pending": "一旦你傳送訊息，你的訊息將可以向 Mojang 檢舉。", - "gui.nochatreports.signing_status.disabled": "你的訊息不可向 Mojang 檢舉。", + "gui.nochatreports.signing_status.disabled": "你的訊息無法向 Mojang 檢舉。", "gui.nochatreports.signing_status.disabled_offline": "您的訊息不可向 Mojang 檢舉。", - "gui.nochatreports.signing_mode.always.tooltip": "您總是喜歡可檢舉的訊息，就像是原版一樣。", + "gui.nochatreports.signing_mode.always.tooltip": "你總是喜歡可檢舉的訊息，就像是原版一樣。", "gui.nochatreports.signing_mode.never.tooltip": "你不允許可檢舉的訊息，所以如果伺服器需要此功能，你將無法聊天。", "gui.nochatreports.signing_mode.never_forced.tooltip": "你正在使用離線帳號或遇到網路問題。如果該伺服器要求可檢舉的訊息，你將無法聊天。", - "gui.nochatreports.signing_mode.prompt.tooltip": "你的訊息預設不可檢舉，當伺服器要求時會提醒你。", + "gui.nochatreports.signing_mode.prompt.tooltip": "你的訊息預設無法檢舉，當伺服器要求時會提醒你。", "gui.nochatreports.signing_mode.on_demand.tooltip": "僅在伺服器要求時，你的訊息才可向 Mojang 檢舉。", "gui.nochatreports.signing_required.contents": "此伺服器要求所有訊息都可以向 Mojang 檢舉。如果你不同意，你仍然可以使用任何與聊天無關的指令。\n\n點擊「允許簽章」以啟用聊天功能。", - "chat.nochatreports.disabled.signing_requested": "此伺服器要求玩家訊息可以向 Mojang 進行檢舉。使用提示畫面或聊天盾牌按鈕以接受並啟用聊天功能。", + "chat.nochatreports.disabled.signing_requested": "此伺服器要求玩家訊息可以向 Mojang 檢舉。使用提示畫面或聊天盾牌按鈕以接受並啟用聊天功能。", "gui.nochatreports.realms_warning.contents": "關於 Realms 的重要資訊：\n• 聊天訊息都可以向 Mojang 檢舉。\n• Mojang 會使用自動化聊天監控，以找出違規行為。\n• 髒話過濾器預設啟用。成年玩家可以在 minecraft.net 啟用查看顯示髒話。" } \ No newline at end of file