From 9ec0ccf859ea5ad6ed2e3d26606bcfbd530762b6 Mon Sep 17 00:00:00 2001 From: Rasputin Date: Sun, 4 Dec 2022 17:50:03 +0800 Subject: [PATCH 1/7] =?UTF-8?q?packages=E7=BF=BB=E8=AF=91=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/packages/packages/lang/en_us.json | 62 +++++++++++++++++++ .../assets/packages/packages/lang/zh_cn.json | 62 +++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 projects/1.18-fabric/assets/packages/packages/lang/en_us.json create mode 100644 projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json diff --git a/projects/1.18-fabric/assets/packages/packages/lang/en_us.json b/projects/1.18-fabric/assets/packages/packages/lang/en_us.json new file mode 100644 index 000000000000..78d36518ec6a --- /dev/null +++ b/projects/1.18-fabric/assets/packages/packages/lang/en_us.json @@ -0,0 +1,62 @@ +{ + "itemGroup.packages.group": "Packages", + + "block.packages.package_maker": "Package Crafter", + "block.packages.package": "Package", + "block.packages.package.nonempty": "%s (%s)", + "block.packages.package.nonempty.reentrant": "(%s)", + "block.packages.package.nonempty.contents": "%sx %s", + + "packages.style_tooltip.hold_for_composition": "Hold [%s] for Composition", + "packages.style_tooltip.shift": "Shift", + "packages.style_tooltip.frame": "%s Frame", + "packages.style_tooltip.inner": "%s Core", + "packages.style_tooltip.both": "%s Frame and Core", + "packages.style_tooltip.color": "%s Front", + "packages.style_tooltip.color.white": "White", + "packages.style_tooltip.color.orange": "Orange", + "packages.style_tooltip.color.magenta": "Magenta", + "packages.style_tooltip.color.light_blue": "Light Blue", + "packages.style_tooltip.color.yellow": "Yellow", + "packages.style_tooltip.color.lime": "Lime", + "packages.style_tooltip.color.pink": "Pink", + "packages.style_tooltip.color.gray": "Gray", + "packages.style_tooltip.color.light_gray": "Light Gray", + "packages.style_tooltip.color.cyan": "Cyan", + "packages.style_tooltip.color.purple": "Purple", + "packages.style_tooltip.color.blue": "Blue", + "packages.style_tooltip.color.brown": "Brown", + "packages.style_tooltip.color.green": "Green", + "packages.style_tooltip.color.red": "Red", + "packages.style_tooltip.color.black": "Black", + + "packages.contents_tooltip.utimately": "-> %s", + + "packages.zzzzzzzzz.hello.1": "(NOTE TO PEOPLE POKING AROUND IN THIS FILE: the number of lines in the below slot-tooltip keys is dynamic.)", + "packages.zzzzzzzzz.hello.2": "(if you would like to add more lines, simply add more language keys with increasing numbers.)", + "packages.zzzzzzzzz.hello.3": "(setting the language key to the string ZZZ will cause it to act as an end-of-list signal, if you want to make it shorter)", + "packages.package_maker.frame": "Frame", + "packages.package_maker.frame.1": "Choose a theme for the border of the Package.", + "packages.package_maker.frame.2": "Automation can insert from the top.", + "packages.package_maker.inner": "Core", + "packages.package_maker.inner.1": "Choose a theme for the sides of the Package.", + "packages.package_maker.inner.2": "Automation can insert from the side.", + "packages.package_maker.dye": "Dye", + "packages.package_maker.dye.1": "Choose a color for the front of the Package.", + "packages.package_maker.dye.2": "Automation can insert from the top or side.", + "packages.package_maker.extra": "Extra", + "packages.package_maker.extra.1": "Add a copper ingot.", + "packages.package_maker.extra.2": "Automation can insert from the top or side.", + "packages.package_maker.output": "Result", + "packages.package_maker.output.1": "Automation can extract from the bottom.", + + "packages.package_maker.craft_button": "Create", + + "packages.subtitle.package_maker_craft": "Package Crafter used", + "packages.subtitle.insert_one": "Item inserted", + "packages.subtitle.take_one": "Item taken", + "packages.subtitle.insert_stack": "Items inserted", + "packages.subtitle.take_stack": "Items taken", + "packages.subtitle.insert_all": "Many items inserted", + "packages.subtitle.take_all": "Many items taken" +} \ No newline at end of file diff --git a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json new file mode 100644 index 000000000000..c45c5e35981b --- /dev/null +++ b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json @@ -0,0 +1,62 @@ +{ + "itemGroup.packages.group": "包裹", + + "block.packages.package_maker": "打包台", + "block.packages.package": "package", + "block.packages.package.nonempty": "%s (%s)", + "block.packages.package.nonempty.reentrant": "(%s)", + "block.packages.package.nonempty.contents": "%sx %s", + + "packages.style_tooltip.hold_for_composition": "按住[%s]查看详情", + "packages.style_tooltip.shift": "Shift", + "packages.style_tooltip.frame": "%s 框架", + "packages.style_tooltip.inner": "%s 内衬", + "packages.style_tooltip.both": "%s 框架和内衬", + "packages.style_tooltip.color": "%s 正面", + "packages.style_tooltip.color.white": "白色", + "packages.style_tooltip.color.orange": "橙色", + "packages.style_tooltip.color.magenta": "品红色", + "packages.style_tooltip.color.light_blue": "淡蓝色", + "packages.style_tooltip.color.yellow": "黄色", + "packages.style_tooltip.color.lime": "黄绿色", + "packages.style_tooltip.color.pink": "粉色", + "packages.style_tooltip.color.gray": "灰色", + "packages.style_tooltip.color.light_gray": "淡灰色", + "packages.style_tooltip.color.cyan": "青色", + "packages.style_tooltip.color.purple": "紫色", + "packages.style_tooltip.color.blue": "蓝色", + "packages.style_tooltip.color.brown": "棕色", + "packages.style_tooltip.color.green": "绿色", + "packages.style_tooltip.color.red": "红色", + "packages.style_tooltip.color.black": "黑色", + + "packages.contents_tooltip.utimately": "-> %s", + + "packages.zzzzzzzzz.hello.1": "（编辑本文件的人注意: 以下tooltip键的行数是动态的）", + "packages.zzzzzzzzz.hello.2": "（如果你想添加更多行，只需增加更多的语言键）", + "packages.zzzzzzzzz.hello.3": "（如果您想缩短字符串ZZZ的长度，将语言键设置为字符串ZZZ将使其充当列表结束信号）", + "packages.package_maker.frame": "框架", + "packages.package_maker.frame.1": "为包裹选择边框纹理。", + "packages.package_maker.frame.2": "自动化制作时可以从顶面输入。", + "packages.package_maker.inner": "内衬", + "packages.package_maker.inner.1": "为包裹选择内衬纹理", + "packages.package_maker.inner.2": "自动化制作时可以从侧面输入", + "packages.package_maker.dye": "染料", + "packages.package_maker.dye.1": "为包裹选择正面的颜色", + "packages.package_maker.dye.2": "自动化制作时可以从顶面和侧面输入", + "packages.package_maker.extra": "附加物", + "packages.package_maker.extra.1": "添加一个铜锭", + "packages.package_maker.extra.2": "自动化制作时可以从顶面和侧面输入", + "packages.package_maker.output": "成品", + "packages.package_maker.output.1": "自动化制作时可以从底部输出", + + "packages.package_maker.craft_button": "制作", + + "packages.subtitle.package_maker_craft": "打包台制作完成", + "packages.subtitle.insert_one": "放入物品", + "packages.subtitle.take_one": "取出物品", + "packages.subtitle.insert_stack": "放入一组物品", + "packages.subtitle.take_stack": "取出一组物品", + "packages.subtitle.insert_all": "放入多组物品", + "packages.subtitle.take_all": "取出多组物品" +} From b4db24bfca1cbd64704d5d36f2dad86d8470a115 Mon Sep 17 00:00:00 2001 From: Rasputin Date: Sun, 4 Dec 2022 17:53:23 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=B2=89=E8=89=B2->=E7=B2=89=E7=BA=A2?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json index c45c5e35981b..56ff6d874806 100644 --- a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json +++ b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json @@ -19,7 +19,7 @@ "packages.style_tooltip.color.light_blue": "淡蓝色", "packages.style_tooltip.color.yellow": "黄色", "packages.style_tooltip.color.lime": "黄绿色", - "packages.style_tooltip.color.pink": "粉色", + "packages.style_tooltip.color.pink": "粉红色", "packages.style_tooltip.color.gray": "灰色", "packages.style_tooltip.color.light_gray": "淡灰色", "packages.style_tooltip.color.cyan": "青色", From 498981ba64fc6808e8b8d3029d598ab71100d31e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=89=8D=E8=BF=9B?= Date: Sun, 4 Dec 2022 23:44:44 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=B8=80=E5=AE=A1?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84=E7=BF=BB=E8=AF=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/packages/packages/lang/zh_cn.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json index 56ff6d874806..274fc4725bbf 100644 --- a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json +++ b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json @@ -2,7 +2,7 @@ "itemGroup.packages.group": "包裹", "block.packages.package_maker": "打包台", - "block.packages.package": "package", + "block.packages.package": "包裹", "block.packages.package.nonempty": "%s (%s)", "block.packages.package.nonempty.reentrant": "(%s)", "block.packages.package.nonempty.contents": "%sx %s", @@ -34,7 +34,7 @@ "packages.zzzzzzzzz.hello.1": "（编辑本文件的人注意: 以下tooltip键的行数是动态的）", "packages.zzzzzzzzz.hello.2": "（如果你想添加更多行，只需增加更多的语言键）", - "packages.zzzzzzzzz.hello.3": "（如果您想缩短字符串ZZZ的长度，将语言键设置为字符串ZZZ将使其充当列表结束信号）", + "packages.zzzzzzzzz.hello.3": "（如果要截断某些文本，在下一个键的文本中包含字符串ZZZ）", "packages.package_maker.frame": "框架", "packages.package_maker.frame.1": "为包裹选择边框纹理。", "packages.package_maker.frame.2": "自动化制作时可以从顶面输入。", @@ -52,11 +52,11 @@ "packages.package_maker.craft_button": "制作", - "packages.subtitle.package_maker_craft": "打包台制作完成", - "packages.subtitle.insert_one": "放入物品", - "packages.subtitle.take_one": "取出物品", - "packages.subtitle.insert_stack": "放入一组物品", - "packages.subtitle.take_stack": "取出一组物品", - "packages.subtitle.insert_all": "放入多组物品", - "packages.subtitle.take_all": "取出多组物品" + "packages.subtitle.package_maker_craft": "‘打包台：制作完成’", + "packages.subtitle.insert_one": "‘打包台：放入物品’", + "packages.subtitle.take_one": "‘打包台：取出物品’", + "packages.subtitle.insert_stack": "‘打包台：放入一组物品’", + "packages.subtitle.take_stack": "‘打包台：取出一组物品’", + "packages.subtitle.insert_all": "‘打包台：放入多组物品’", + "packages.subtitle.take_all": "‘打包台：取出多组物品’" } From b9c6697ba91208a847f0aa398ce292f73166ee93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=89=8D=E8=BF=9B?= Date: Sun, 4 Dec 2022 23:48:36 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/packages/packages/lang/zh_cn.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json index 274fc4725bbf..085c76065ea4 100644 --- a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json +++ b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json @@ -52,11 +52,11 @@ "packages.package_maker.craft_button": "制作", - "packages.subtitle.package_maker_craft": "‘打包台：制作完成’", - "packages.subtitle.insert_one": "‘打包台：放入物品’", - "packages.subtitle.take_one": "‘打包台：取出物品’", - "packages.subtitle.insert_stack": "‘打包台：放入一组物品’", - "packages.subtitle.take_stack": "‘打包台：取出一组物品’", - "packages.subtitle.insert_all": "‘打包台：放入多组物品’", - "packages.subtitle.take_all": "‘打包台：取出多组物品’" + "packages.subtitle.package_maker_craft": "打包台：制作完成", + "packages.subtitle.insert_one": "打包台：放入物品", + "packages.subtitle.take_one": "打包台：取出物品’", + "packages.subtitle.insert_stack": "打包台：放入一组物品", + "packages.subtitle.take_stack": "打包台：取出一组物品", + "packages.subtitle.insert_all": "打包台：放入多组物品", + "packages.subtitle.take_all": "打包台：取出多组物品" } From 79e2c15bf5df28e787cd8514383d6b2fc5fad2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=89=8D=E8=BF=9B?= Date: Sun, 4 Dec 2022 23:53:30 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/packages/packages/lang/zh_cn.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json index 085c76065ea4..51b7c03fe9a8 100644 --- a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json +++ b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json @@ -53,10 +53,10 @@ "packages.package_maker.craft_button": "制作", "packages.subtitle.package_maker_craft": "打包台：制作完成", - "packages.subtitle.insert_one": "打包台：放入物品", - "packages.subtitle.take_one": "打包台：取出物品’", - "packages.subtitle.insert_stack": "打包台：放入一组物品", - "packages.subtitle.take_stack": "打包台：取出一组物品", - "packages.subtitle.insert_all": "打包台：放入多组物品", - "packages.subtitle.take_all": "打包台：取出多组物品" + "packages.subtitle.insert_one": "包裹：放入物品", + "packages.subtitle.take_one": "包裹：取出物品’", + "packages.subtitle.insert_stack": "包裹：放入一组物品", + "packages.subtitle.take_stack": "包裹：取出一组物品", + "packages.subtitle.insert_all": "包裹：放入多组物品", + "packages.subtitle.take_all": "包裹：取出多组物品" } From c1a519038e4cd7bfa3b6616f5dd7b7a1461773f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=89=8D=E8=BF=9B?= Date: Mon, 5 Dec 2022 00:01:29 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json index 51b7c03fe9a8..7bc3cf200f81 100644 --- a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json +++ b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json @@ -54,7 +54,7 @@ "packages.subtitle.package_maker_craft": "打包台：制作完成", "packages.subtitle.insert_one": "包裹：放入物品", - "packages.subtitle.take_one": "包裹：取出物品’", + "packages.subtitle.take_one": "包裹：取出物品", "packages.subtitle.insert_stack": "包裹：放入一组物品", "packages.subtitle.take_stack": "包裹：取出一组物品", "packages.subtitle.insert_all": "包裹：放入多组物品", From 79d2e5ca87ebe9f89db48c84d49ff9e497a2212f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=89=8D=E8=BF=9B?= Date: Tue, 6 Dec 2022 12:27:53 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=A8=A1=E7=BB=84=E5=90=8D=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json index 7bc3cf200f81..347eaa15e9ae 100644 --- a/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json +++ b/projects/1.18-fabric/assets/packages/packages/lang/zh_cn.json @@ -1,5 +1,5 @@ { - "itemGroup.packages.group": "包裹", + "itemGroup.packages.group": "自定义包裹", "block.packages.package_maker": "打包台", "block.packages.package": "包裹",