From bd99bd7eef8b1fca125b9324514323737ac6bcdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=AF=E6=A8=B1=E4=BC=9A=E4=B8=8D=E4=BC=9A=E6=A2=A6?= =?UTF-8?q?=E5=88=B0=E5=A5=87=E8=BF=B9?= Date: Fri, 8 May 2026 15:56:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E2=80=9Ctrims=20expanded?= =?UTF-8?q?=E2=80=9D=E6=B1=89=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trimsexpanded/lang/en_us.json | 31 +++++++++++++++++++ .../trimsexpanded/lang/zh_cn.json | 31 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/en_us.json create mode 100644 projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/zh_cn.json diff --git a/projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/en_us.json b/projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/en_us.json new file mode 100644 index 000000000000..642ec6ce271b --- /dev/null +++ b/projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/en_us.json @@ -0,0 +1,31 @@ +{ + "trim_material.trimsexpanded.amberpotato": "Amber Material", + "trim_material.trimsexpanded.armadillo": "Armadillo Scute Material", + "trim_material.trimsexpanded.breeze": "Breeze Material", + "trim_material.trimsexpanded.chorus": "Chorus Material", + "trim_material.trimsexpanded.coal": "Coal Material", + "trim_material.trimsexpanded.dragon": "Dragon's Breath Material", + "trim_material.trimsexpanded.echo": "Echo Material", + "trim_material.trimsexpanded.ender": "Ender Material", + "trim_material.trimsexpanded.flame": "Flame Material", + "trim_material.trimsexpanded.glowstone": "Glowstone Material", + "trim_material.trimsexpanded.leather": "Leather Material", + "trim_material.trimsexpanded.netherbrick": "Nether Brick Material", + "trim_material.trimsexpanded.prismarine": "Prismarine Material", + "trim_material.trimsexpanded.rabbit": "Rabbit Material", + "trim_material.trimsexpanded.rainbow": "Rainbow Material", + "trim_material.trimsexpanded.slime": "Slime Material", + + "trim_pattern.trimsexpanded.plated": "Plated Armor Trim", + "trim_pattern.trimsexpanded.danger": "Danger Armor Trim", + "trim_pattern.trimsexpanded.shell": "Shell Armor Trim", + "trim_pattern.trimsexpanded.margin": "Margin Armor Trim", + "trim_pattern.trimsexpanded.verdant": "Verdant Armor Trim", + "trim_pattern.trimsexpanded.heart": "Heart Armor Trim", + "trim_pattern.trimsexpanded.drip": "Drip Armor Trim", + "trim_pattern.trimsexpanded.suspicious": "Suspicious Armor Trim", + "trim_pattern.trimsexpanded.pride": "Pride Armor Trim", + + "advancements.adventure.craft_hidden_armor_trim.title": "Inspired Fashion", + "advancements.adventure.craft_hidden_armor_trim.description": "Acquire each of the hidden craft-exclusive smithing templates: Drip, Suspicious, Pride" +} diff --git a/projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/zh_cn.json b/projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/zh_cn.json new file mode 100644 index 000000000000..cfd4a12c27ba --- /dev/null +++ b/projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/zh_cn.json @@ -0,0 +1,31 @@ +{ + "trim_material.trimsexpanded.amberpotato": "琥珀质", + "trim_material.trimsexpanded.armadillo": "犰狳鳞甲质", + "trim_material.trimsexpanded.breeze": "旋风棒质", + "trim_material.trimsexpanded.chorus": "爆裂紫颂果质", + "trim_material.trimsexpanded.coal": "煤炭质", + "trim_material.trimsexpanded.dragon": "龙息质", + "trim_material.trimsexpanded.echo": "回响碎片质", + "trim_material.trimsexpanded.ender": "末影珍珠质", + "trim_material.trimsexpanded.flame": "火焰弹质", + "trim_material.trimsexpanded.glowstone": "荧石粉质", + "trim_material.trimsexpanded.leather": "皮革质", + "trim_material.trimsexpanded.netherbrick": "下界砖质", + "trim_material.trimsexpanded.prismarine": "海晶碎片质", + "trim_material.trimsexpanded.rabbit": "兔子皮质", + "trim_material.trimsexpanded.rainbow": "彩虹质", + "trim_material.trimsexpanded.slime": "粘液球质", + + "trim_pattern.trimsexpanded.plated": "镀金盔甲纹饰", + "trim_pattern.trimsexpanded.danger": "威胁盔甲纹饰", + "trim_pattern.trimsexpanded.shell": "贝壳盔甲纹饰", + "trim_pattern.trimsexpanded.margin": "边缘盔甲纹饰", + "trim_pattern.trimsexpanded.verdant": "翠绿盔甲纹饰", + "trim_pattern.trimsexpanded.heart": "爱恋盔甲纹饰", + "trim_pattern.trimsexpanded.drip": "滴落盔甲纹饰", + "trim_pattern.trimsexpanded.suspicious": "诡谲盔甲纹饰", + "trim_pattern.trimsexpanded.pride": "骄傲盔甲纹饰", + + "advancements.adventure.craft_hidden_armor_trim.title": "创意穿搭", + "advancements.adventure.craft_hidden_armor_trim.description": "用别的材料而不是陶片合成以下锻造模板：滴落、诡谲、骄傲" +} \ No newline at end of file From c11697b46160f1470a8d4c25922bbcdb91ff387b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=AF=E6=A8=B1=E4=BC=9A=E4=B8=8D=E4=BC=9A=E6=A2=A6?= =?UTF-8?q?=E5=88=B0=E5=A5=87=E8=BF=B9?= Date: Fri, 8 May 2026 16:12:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?trims=20expanded=20=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trims-expanded-datapack/trimsexpanded/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/zh_cn.json b/projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/zh_cn.json index cfd4a12c27ba..64f49d98bf19 100644 --- a/projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/zh_cn.json +++ b/projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/zh_cn.json @@ -27,5 +27,5 @@ "trim_pattern.trimsexpanded.pride": "骄傲盔甲纹饰", "advancements.adventure.craft_hidden_armor_trim.title": "创意穿搭", - "advancements.adventure.craft_hidden_armor_trim.description": "用别的材料而不是陶片合成以下锻造模板：滴落、诡谲、骄傲" + "advancements.adventure.craft_hidden_armor_trim.description": "获得所有隐藏的锻造模板：滴落、诡谲、骄傲" } \ No newline at end of file From 5c56119e0adf89b3bc302248a1451abfd6514c20 Mon Sep 17 00:00:00 2001 From: "cfpa-bot[bot]" <181747+cfpa-bot[bot]@users.noreply.github.com> Date: Fri, 8 May 2026 16:31:22 +0800 Subject: [PATCH 3/4] chore: migrate to new path structure --- .../trims-expanded-datapack/1.21}/trimsexpanded/lang/en_us.json | 0 .../trims-expanded-datapack/1.21}/trimsexpanded/lang/zh_cn.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename projects/{1.21/assets/trims-expanded-datapack => assets/trims-expanded-datapack/1.21}/trimsexpanded/lang/en_us.json (100%) rename projects/{1.21/assets/trims-expanded-datapack => assets/trims-expanded-datapack/1.21}/trimsexpanded/lang/zh_cn.json (100%) diff --git a/projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/en_us.json b/projects/assets/trims-expanded-datapack/1.21/trimsexpanded/lang/en_us.json similarity index 100% rename from projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/en_us.json rename to projects/assets/trims-expanded-datapack/1.21/trimsexpanded/lang/en_us.json diff --git a/projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/zh_cn.json b/projects/assets/trims-expanded-datapack/1.21/trimsexpanded/lang/zh_cn.json similarity index 100% rename from projects/1.21/assets/trims-expanded-datapack/trimsexpanded/lang/zh_cn.json rename to projects/assets/trims-expanded-datapack/1.21/trimsexpanded/lang/zh_cn.json From 6b7a1d949b3998b53c320dd009c2e0be7649e20e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=AF=E6=A8=B1=E4=BC=9A=E4=B8=8D=E4=BC=9A=E6=A2=A6?= =?UTF-8?q?=E5=88=B0=E5=A5=87=E8=BF=B9?= Date: Fri, 15 May 2026 12:54:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=89=E5=A4=84?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.21/trimsexpanded/lang/zh_cn.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/assets/trims-expanded-datapack/1.21/trimsexpanded/lang/zh_cn.json b/projects/assets/trims-expanded-datapack/1.21/trimsexpanded/lang/zh_cn.json index 64f49d98bf19..7d0d37ec9033 100644 --- a/projects/assets/trims-expanded-datapack/1.21/trimsexpanded/lang/zh_cn.json +++ b/projects/assets/trims-expanded-datapack/1.21/trimsexpanded/lang/zh_cn.json @@ -17,11 +17,11 @@ "trim_material.trimsexpanded.slime": "粘液球质", "trim_pattern.trimsexpanded.plated": "镀金盔甲纹饰", - "trim_pattern.trimsexpanded.danger": "威胁盔甲纹饰", + "trim_pattern.trimsexpanded.danger": "危机盔甲纹饰", "trim_pattern.trimsexpanded.shell": "贝壳盔甲纹饰", "trim_pattern.trimsexpanded.margin": "边缘盔甲纹饰", - "trim_pattern.trimsexpanded.verdant": "翠绿盔甲纹饰", - "trim_pattern.trimsexpanded.heart": "爱恋盔甲纹饰", + "trim_pattern.trimsexpanded.verdant": "青翠盔甲纹饰", + "trim_pattern.trimsexpanded.heart": "爱心盔甲纹饰", "trim_pattern.trimsexpanded.drip": "滴落盔甲纹饰", "trim_pattern.trimsexpanded.suspicious": "诡谲盔甲纹饰", "trim_pattern.trimsexpanded.pride": "骄傲盔甲纹饰",