From f5a1791df5660dfc89e8497b253e2f82de2d010d Mon Sep 17 00:00:00 2001 From: creederyj Date: Mon, 9 May 2022 19:31:21 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=20pretty-pipes=20?= =?UTF-8?q?=E6=A8=A1=E7=BB=84=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pretty-pipes/prettypipes/lang/zh_cn.json | 51 ++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json b/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json index 4659b91de747..70c6196ac2da 100644 --- a/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json +++ b/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json @@ -37,7 +37,56 @@ "info.prettypipes.extraction_module": "从相邻物品栏中提取物品\n过滤和抽取量会随等级而异\n更高级可以防止过量发送物品", "info.prettypipes.filter_module": "限制从管道流入相邻物品栏\n过滤量因等级而异", "info.prettypipes.speed_module": "提高物品离开相邻物品栏的速度\n速度因等级而异", + "info.prettypipes.low_priority_module": "降低相邻物品栏的接收优先级\n无论距离如何，较低的优先级会使物品优先进入其他物品栏。", + "info.prettypipes.high_priority_module": "增加相邻物品栏的接收优先级\n无论距离如何，较高的优先级会使物品优先进入这个物品栏。", + "info.prettypipes.retrieval_module": "从网络中的其他库存中提取物品\n过滤和抽取量会随等级而异\n更高级可以防止过量发送物品", + "info.prettypipes.stack_size_module": "限制可以流入相邻物品栏的物品数量\n自动防止过量发送物品", + "info.prettypipes.damage_filter_modifier": "使所有过滤槽按物品耐久过滤", + "info.prettypipes.nbt_filter_modifier": "使所有过滤槽按物品数据（NBT）过滤", + "info.prettypipes.tag_filter_modifier": "使所有过滤槽按标签过滤\n标签可以从过滤槽中的物品中选择", + "info.prettypipes.mod_filter_modifier": "使所有过滤槽槽按mod过滤", + "info.prettypipes.redstone_module": "允许使用红石信号禁用管道\n作用于物品提取与检索", + "info.prettypipes.item_terminal": "允许查看和发送管道系统中的所有物品\n附有将物品输入管道的物品槽", + "info.prettypipes.crafting_terminal": "允许发送制作配方的材料\n如果安装了 JEI，则支持自动填充", + "info.prettypipes.pressurizer": "大幅提高整个管道系统中的物品传输速度\n传送每个物品都消耗 FE（或 RF）", + "info.prettypipes.filter_increase_modifier": "向管道添加额外的过滤槽\n过滤槽槽将被所有过滤模块使用", + "info.prettypipes.crafting_module": "允许使用连接的方块自动将物品制作成其他物品\n不会自动从方块中提取\n输入和输出插槽因层而异\n如果已安装 JEI，则支持自动填充", + "info.prettypipes.random_sorting_modifier": "使提取的物品随机选择目的地\n优先模块将被忽略", + "info.prettypipes.round_robin_sorting_modifier": "使提取的物品循环选择目的地\n排序基于距离和优先级", + "block.prettypipes.pipe": "管道", + "block.prettypipes.item_terminal": "物品终端", + "block.prettypipes.crafting_terminal": "合成终端", + "block.prettypipes.pressurizer": "管道加压器", "itemGroup.prettypipes": "更好的管道", + "container.prettypipes.pipe": "管道", "container.prettypipes.item_terminal": "物品终端", - "container.prettypipes.crafting_terminal": "合成终端" + "container.prettypipes.crafting_terminal": "合成终端", + "container.prettypipes.pressurizer": "管道加压器", + "info.prettypipes.whitelist": "白名单", + "info.prettypipes.blacklist": "黑名单", + "info.prettypipes.shift": "按住 Shift 查看更多信息", + "info.prettypipes.populate": "全选", + "info.prettypipes.populate.description": "过滤来自相邻物品栏的物品", + "info.prettypipes.max_stack_size": "最大物品堆叠数量", + "info.prettypipes.limit_to_max_on": "限制于一堆", + "info.prettypipes.limit_to_max_off": "不要限制于一堆", + "info.prettypipes.request": "发送", + "info.prettypipes.not_found": "没有发现%s", + "info.prettypipes.hold_alt": "按住 Alt 请求", + "info.prettypipes.sending": "正在发送 %s %s", + "info.prettypipes.sending_ingredients": "正在发送%s组材料", + "info.prettypipes.order": "按%s排序", + "info.prettypipes.order.amount": "数量", + "info.prettypipes.order.name": "名字", + "info.prettypipes.order.mod": "模组", + "info.prettypipes.ascending": "上升", + "info.prettypipes.descending": "下降", + "info.prettypipes.sync_jei.on": "同步JEI搜索", + "info.prettypipes.sync_jei.off": "关闭同步JEI搜索", + "info.prettypipes.energy": "%s / %s FE", + "info.prettypipes.crafting": "等待", + "info.prettypipes.cancel_all": "取消", + "info.prettypipes.cancel_all.desc": "停止等待当前的合成输出\n不从方块中移除输入", + "info.prettypipes.no_pipe_connected": "终端需要接入管道系统中", + "info.prettypipes.too_many_pipes_connected": "终端一次只能连接入到一根管道" } \ No newline at end of file From 611b49e073d494189bf0fc97025510877d44f546 Mon Sep 17 00:00:00 2001 From: creederyj Date: Mon, 9 May 2022 20:10:34 +0800 Subject: [PATCH 02/18] Update zh_cn.json --- projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json b/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json index 70c6196ac2da..86728d61b3a7 100644 --- a/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json +++ b/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json @@ -44,7 +44,7 @@ "info.prettypipes.damage_filter_modifier": "使所有过滤槽按物品耐久过滤", "info.prettypipes.nbt_filter_modifier": "使所有过滤槽按物品数据（NBT）过滤", "info.prettypipes.tag_filter_modifier": "使所有过滤槽按标签过滤\n标签可以从过滤槽中的物品中选择", - "info.prettypipes.mod_filter_modifier": "使所有过滤槽槽按mod过滤", + "info.prettypipes.mod_filter_modifier": "使所有过滤槽槽按mod名称过滤", "info.prettypipes.redstone_module": "允许使用红石信号禁用管道\n作用于物品提取与检索", "info.prettypipes.item_terminal": "允许查看和发送管道系统中的所有物品\n附有将物品输入管道的物品槽", "info.prettypipes.crafting_terminal": "允许发送制作配方的材料\n如果安装了 JEI，则支持自动填充", @@ -89,4 +89,4 @@ "info.prettypipes.cancel_all.desc": "停止等待当前的合成输出\n不从方块中移除输入", "info.prettypipes.no_pipe_connected": "终端需要接入管道系统中", "info.prettypipes.too_many_pipes_connected": "终端一次只能连接入到一根管道" -} \ No newline at end of file +} From 9dfb887f9705f3796fdbdacd53b243cc780bb27f Mon Sep 17 00:00:00 2001 From: creederyj Date: Mon, 9 May 2022 22:26:30 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=20wireless-chargers=20?= =?UTF-8?q?=E6=A8=A1=E7=BB=84=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.18/assets/wireless-chargers/en_us.json | 25 +++++++++++++++++++ .../1.18/assets/wireless-chargers/zh_cn.json | 25 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 projects/1.18/assets/wireless-chargers/en_us.json create mode 100644 projects/1.18/assets/wireless-chargers/zh_cn.json diff --git a/projects/1.18/assets/wireless-chargers/en_us.json b/projects/1.18/assets/wireless-chargers/en_us.json new file mode 100644 index 000000000000..5ab9e453ec03 --- /dev/null +++ b/projects/1.18/assets/wireless-chargers/en_us.json @@ -0,0 +1,25 @@ +{ + "block.wirelesschargers.advanced_wireless_block_charger": "Advanced Wireless Block Charger", + "block.wirelesschargers.advanced_wireless_player_charger": "Advanced Wireless Player Charger", + "block.wirelesschargers.basic_wireless_block_charger": "Basic Wireless Block Charger", + "block.wirelesschargers.basic_wireless_player_charger": "Basic Wireless Player Charger", + "itemGroup.wirelesschargers": "Wireless Chargers", + "wirelesschargers.advancement.no_more_batteries.description": "Craft an advanced wireless player charger", + "wirelesschargers.advancement.no_more_batteries.title": "No More Batteries", + "wirelesschargers.advancement.no_more_cables.description": "Craft an advanced wireless block charger", + "wirelesschargers.advancement.no_more_cables.title": "No More Cables", + "wirelesschargers.advancement.wireless_charging.description": "Craft a wireless charger", + "wirelesschargers.advancement.wireless_charging.title": "Wireless Charging", + "wirelesschargers.charger.info.blocks": "Charges blocks in a %1$dx%1$dx%1$d area.", + "wirelesschargers.charger.info.players": "Charges players' items in a %1$dx%1$dx%1$d area.", + "wirelesschargers.charger.info.redstone_mode": "Redstone mode: %s", + "wirelesschargers.charger.info.stored_energy": "Energy stored: %1$d / %2$d", + "wirelesschargers.charger.info.transfer_rate_blocks": "Charging rate: %d per block", + "wirelesschargers.charger.info.transfer_rate_players": "Charging rate: %d per player", + "wirelesschargers.screen.highlight_area": "Highlight area: %s", + "wirelesschargers.screen.redstone": "Redstone mode: %s", + "wirelesschargers.screen.redstone_disabled": "Disabled", + "wirelesschargers.screen.redstone_high": "High", + "wirelesschargers.screen.redstone_low": "Low", + "wirelesschargers.screen.stored_energy": "Energy stored: %1$d / %2$d" +} \ No newline at end of file diff --git a/projects/1.18/assets/wireless-chargers/zh_cn.json b/projects/1.18/assets/wireless-chargers/zh_cn.json new file mode 100644 index 000000000000..52dfef6326ad --- /dev/null +++ b/projects/1.18/assets/wireless-chargers/zh_cn.json @@ -0,0 +1,25 @@ +{ + "block.wirelesschargers.advanced_wireless_block_charger": "高级无线充电器（方块）", + "block.wirelesschargers.advanced_wireless_player_charger": "无线充电器（玩家）", + "block.wirelesschargers.basic_wireless_block_charger": "基础无线充电器（方块）", + "block.wirelesschargers.basic_wireless_player_charger": "基础无线充电器（玩家）", + "itemGroup.wirelesschargers": "无线充电器", + "wirelesschargers.advancement.no_more_batteries.description": "打造先进的无线充电器", + "wirelesschargers.advancement.no_more_batteries.title": "不再需要电池", + "wirelesschargers.advancement.no_more_cables.description": "打造先进的无线充电器", + "wirelesschargers.advancement.no_more_cables.title": "不再有电缆", + "wirelesschargers.advancement.wireless_charging.description": "制作无线充电器", + "wirelesschargers.advancement.wireless_charging.title": "无线充电", + "wirelesschargers.charger.info.blocks": "只能在 %1$dx%1$dx%1$d 的范围给方块充电.", + "wirelesschargers.charger.info.players": "只能在 %1$dx%1$dx%1$d 的范围给玩家物品充电.", + "wirelesschargers.charger.info.redstone_mode": "红石模式: %s", + "wirelesschargers.charger.info.stored_energy": "储存的能量: %1$d / %2$d", + "wirelesschargers.charger.info.transfer_rate_blocks": "充电速率: 每个方块%d", + "wirelesschargers.charger.info.transfer_rate_players": "充电速率: 每个玩家%d", + "wirelesschargers.screen.highlight_area": "显示区域: %s", + "wirelesschargers.screen.redstone": "红石模式: %s", + "wirelesschargers.screen.redstone_disabled": "关闭", + "wirelesschargers.screen.redstone_high": "红石模式：高", + "wirelesschargers.screen.redstone_low": "红石模式：低", + "wirelesschargers.screen.stored_energy": "储存的能量: %1$d / %2$d" +} \ No newline at end of file From 9894e309b5a76d350053eb55cc98a129ed037332 Mon Sep 17 00:00:00 2001 From: creederyj Date: Mon, 9 May 2022 22:31:29 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E6=8F=90=E4=BA=A4=20super-circuit-maker?= =?UTF-8?q?=20=E6=A8=A1=E7=BB=84=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../super-circuit-maker/lang/en_us.json | 51 +++++++++++++++++++ .../super-circuit-maker/lang/zh_cn.json | 45 ++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 projects/1.18/assets/super-circuit-maker/lang/en_us.json create mode 100644 projects/1.18/assets/super-circuit-maker/lang/zh_cn.json diff --git a/projects/1.18/assets/super-circuit-maker/lang/en_us.json b/projects/1.18/assets/super-circuit-maker/lang/en_us.json new file mode 100644 index 000000000000..69b1856caf56 --- /dev/null +++ b/projects/1.18/assets/super-circuit-maker/lang/en_us.json @@ -0,0 +1,51 @@ +{ + "itemGroup.supercircuitmaker": "Super Circuit Maker", + + "block.supercircuitmaker.circuit": "Circuit", + "block.supercircuitmaker.inspector": "Inspector", + "item.supercircuitmaker.screwdriver": "Screwdriver", + "item.supercircuitmaker.palette": "Palette and Brush", + "item.supercircuitmaker.tiny_redstone": "Tiny Pile of Redstone Dust", + "item.supercircuitmaker.tiny_rgb_redstone": "Tiny Pile of RGB Redstone Dust", + "item.supercircuitmaker.randomizer": "Glowstone Exciter", + "item.supercircuitmaker.delay": "Quartz Resonator", + "item.supercircuitmaker.pulsar": "Ender Pulsar", + "item.supercircuitmaker.note": "Booper", + "item.supercircuitmaker.lamp": "Miniature Lamp", + "item.supercircuitmaker.button": "Miniature Button", + "item.supercircuitmaker.adder": "Adder", + "item.supercircuitmaker.subtractor": "Subtractor", + "item.supercircuitmaker.multiplier": "Multiplier", + "item.supercircuitmaker.divider": "Divider", + "item.supercircuitmaker.constant": "Constant", + "item.supercircuitmaker.platform": "Support Platform", + "item.supercircuitmaker.redstone_stick": "Redstone-Coated Stick", + "item.supercircuitmaker.rgb_redstone_stick": "RGB Redstone-Coated Stick", + + "container.supercircuitmaker.delay": "Quartz Resonator: ", + "container.supercircuitmaker.pulsar": "Ender Pulsar: ", + "container.supercircuitmaker.timing.dec_10s": "-10s", + "container.supercircuitmaker.timing.dec_1s": "-1s", + "container.supercircuitmaker.timing.inc_1s": "+1s", + "container.supercircuitmaker.timing.inc_10s": "+10s", + "container.supercircuitmaker.timing.dec_10t": "-10t", + "container.supercircuitmaker.timing.dec_1t": "-1t", + "container.supercircuitmaker.timing.inc_1t": "+1t", + "container.supercircuitmaker.timing.inc_10t": "+10t", + + "container.supercircuitmaker.constant": "Constant: ", + "container.supercircuitmaker.constant.dec_20": "-20", + "container.supercircuitmaker.constant.dec_1": "-1", + "container.supercircuitmaker.constant.inc_1": "+1", + "container.supercircuitmaker.constant.inc_20": "+20", + + "subtitles.supercircuitmaker.place": "BOOP", + + "key.supercircuitmaker": "Super Circuit Maker", + "key.supercircuitmaker.open_palette": "Open Palette", + "key.supercircuitmaker.component_placement_modifier": "Component Placement Modifier", + + "msg.supercircuitmaker.inspector.learned": "Learned!", + "msg.supercircuitmaker.inspector.mode_state": "Selected mode: Match block state", + "msg.supercircuitmaker.inspector.mode_block": "Selected mode: Match block type" +} \ No newline at end of file diff --git a/projects/1.18/assets/super-circuit-maker/lang/zh_cn.json b/projects/1.18/assets/super-circuit-maker/lang/zh_cn.json new file mode 100644 index 000000000000..85e7f2d21652 --- /dev/null +++ b/projects/1.18/assets/super-circuit-maker/lang/zh_cn.json @@ -0,0 +1,45 @@ +{ + "itemGroup.supercircuitmaker": "超级电路", + "block.supercircuitmaker.circuit": "红石电路板", + "block.supercircuitmaker.inspector": "检查器", + "item.supercircuitmaker.screwdriver": "螺丝刀", + "item.supercircuitmaker.palette": "调色板与刷子", + "item.supercircuitmaker.tiny_redstone": "小撮红石", + "item.supercircuitmaker.tiny_rgb_redstone": "小撮 RGB 红石", + "item.supercircuitmaker.randomizer": "萤石激化器", + "item.supercircuitmaker.delay": "石英共振器", + "item.supercircuitmaker.pulsar": "末影脉冲装置", + "item.supercircuitmaker.note": "Booper", + "item.supercircuitmaker.lamp": "微型灯", + "item.supercircuitmaker.button": "微型按钮", + "item.supercircuitmaker.adder": "加法器", + "item.supercircuitmaker.subtractor": "减法器", + "item.supercircuitmaker.multiplier": "乘法器", + "item.supercircuitmaker.divider": "除法器", + "item.supercircuitmaker.constant": "常量", + "item.supercircuitmaker.platform": "支撑平台", + "item.supercircuitmaker.redstone_stick": "红石涂层棒", + "item.supercircuitmaker.rgb_redstone_stick": "RGB 红石涂层棒", + "container.supercircuitmaker.delay": "石英共振器: ", + "container.supercircuitmaker.pulsar": "末影脉冲装置: ", + "container.supercircuitmaker.timing.dec_10s": "-10s", + "container.supercircuitmaker.timing.dec_1s": "-1s", + "container.supercircuitmaker.timing.inc_1s": "+1s", + "container.supercircuitmaker.timing.inc_10s": "+10s", + "container.supercircuitmaker.timing.dec_10t": "-10t", + "container.supercircuitmaker.timing.dec_1t": "-1t", + "container.supercircuitmaker.timing.inc_1t": "+1t", + "container.supercircuitmaker.timing.inc_10t": "+10t", + "container.supercircuitmaker.constant": "Constant: ", + "container.supercircuitmaker.constant.dec_20": "-20", + "container.supercircuitmaker.constant.dec_1": "-1", + "container.supercircuitmaker.constant.inc_1": "+1", + "container.supercircuitmaker.constant.inc_20": "+20", + "subtitles.supercircuitmaker.place": "BOOP", + "key.supercircuitmaker": "超级电路", + "key.supercircuitmaker.open_palette": "打开调色板", + "key.supercircuitmaker.component_placement_modifier": "组件放置修改器", + "msg.supercircuitmaker.inspector.learned": "Learned!", + "msg.supercircuitmaker.inspector.mode_state": "选择模式:匹配方块状态", + "msg.supercircuitmaker.inspector.mode_block": "选择模式:匹配方块类型" +} \ No newline at end of file From d84701081995e34cf1324b2388d04bda7bd5319d Mon Sep 17 00:00:00 2001 From: creederyj Date: Mon, 9 May 2022 22:38:04 +0800 Subject: [PATCH 05/18] move --- .../assets/super-circuit-maker/lang/{ => rscircuits}/en_us.json | 0 .../assets/super-circuit-maker/lang/{ => rscircuits}/zh_cn.json | 0 .../assets/wireless-chargers/{ => wirelesschargers}/en_us.json | 0 .../assets/wireless-chargers/{ => wirelesschargers}/zh_cn.json | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename projects/1.18/assets/super-circuit-maker/lang/{ => rscircuits}/en_us.json (100%) rename projects/1.18/assets/super-circuit-maker/lang/{ => rscircuits}/zh_cn.json (100%) rename projects/1.18/assets/wireless-chargers/{ => wirelesschargers}/en_us.json (100%) rename projects/1.18/assets/wireless-chargers/{ => wirelesschargers}/zh_cn.json (100%) diff --git a/projects/1.18/assets/super-circuit-maker/lang/en_us.json b/projects/1.18/assets/super-circuit-maker/lang/rscircuits/en_us.json similarity index 100% rename from projects/1.18/assets/super-circuit-maker/lang/en_us.json rename to projects/1.18/assets/super-circuit-maker/lang/rscircuits/en_us.json diff --git a/projects/1.18/assets/super-circuit-maker/lang/zh_cn.json b/projects/1.18/assets/super-circuit-maker/lang/rscircuits/zh_cn.json similarity index 100% rename from projects/1.18/assets/super-circuit-maker/lang/zh_cn.json rename to projects/1.18/assets/super-circuit-maker/lang/rscircuits/zh_cn.json diff --git a/projects/1.18/assets/wireless-chargers/en_us.json b/projects/1.18/assets/wireless-chargers/wirelesschargers/en_us.json similarity index 100% rename from projects/1.18/assets/wireless-chargers/en_us.json rename to projects/1.18/assets/wireless-chargers/wirelesschargers/en_us.json diff --git a/projects/1.18/assets/wireless-chargers/zh_cn.json b/projects/1.18/assets/wireless-chargers/wirelesschargers/zh_cn.json similarity index 100% rename from projects/1.18/assets/wireless-chargers/zh_cn.json rename to projects/1.18/assets/wireless-chargers/wirelesschargers/zh_cn.json From 9e06f6f61c20e926529d9bd61e76aa16c761b211 Mon Sep 17 00:00:00 2001 From: creederyj Date: Mon, 9 May 2022 23:02:52 +0800 Subject: [PATCH 06/18] move --- .../{lang/rscircuits => rscircuits/lang}/en_us.json | 0 .../{lang/rscircuits => rscircuits/lang}/zh_cn.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename projects/1.18/assets/super-circuit-maker/{lang/rscircuits => rscircuits/lang}/en_us.json (100%) rename projects/1.18/assets/super-circuit-maker/{lang/rscircuits => rscircuits/lang}/zh_cn.json (100%) diff --git a/projects/1.18/assets/super-circuit-maker/lang/rscircuits/en_us.json b/projects/1.18/assets/super-circuit-maker/rscircuits/lang/en_us.json similarity index 100% rename from projects/1.18/assets/super-circuit-maker/lang/rscircuits/en_us.json rename to projects/1.18/assets/super-circuit-maker/rscircuits/lang/en_us.json diff --git a/projects/1.18/assets/super-circuit-maker/lang/rscircuits/zh_cn.json b/projects/1.18/assets/super-circuit-maker/rscircuits/lang/zh_cn.json similarity index 100% rename from projects/1.18/assets/super-circuit-maker/lang/rscircuits/zh_cn.json rename to projects/1.18/assets/super-circuit-maker/rscircuits/lang/zh_cn.json From 4d7ece0fa82c24cd27614f473c907bd523cf2f89 Mon Sep 17 00:00:00 2001 From: creederyj Date: Mon, 9 May 2022 23:06:58 +0800 Subject: [PATCH 07/18] move --- .../{rscircuits => supercircuitmaker}/lang/en_us.json | 0 .../{rscircuits => supercircuitmaker}/lang/zh_cn.json | 0 .../wireless-chargers/wirelesschargers/{ => lang}/en_us.json | 0 .../wireless-chargers/wirelesschargers/{ => lang}/zh_cn.json | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename projects/1.18/assets/super-circuit-maker/{rscircuits => supercircuitmaker}/lang/en_us.json (100%) rename projects/1.18/assets/super-circuit-maker/{rscircuits => supercircuitmaker}/lang/zh_cn.json (100%) rename projects/1.18/assets/wireless-chargers/wirelesschargers/{ => lang}/en_us.json (100%) rename projects/1.18/assets/wireless-chargers/wirelesschargers/{ => lang}/zh_cn.json (100%) diff --git a/projects/1.18/assets/super-circuit-maker/rscircuits/lang/en_us.json b/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/en_us.json similarity index 100% rename from projects/1.18/assets/super-circuit-maker/rscircuits/lang/en_us.json rename to projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/en_us.json diff --git a/projects/1.18/assets/super-circuit-maker/rscircuits/lang/zh_cn.json b/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json similarity index 100% rename from projects/1.18/assets/super-circuit-maker/rscircuits/lang/zh_cn.json rename to projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json diff --git a/projects/1.18/assets/wireless-chargers/wirelesschargers/en_us.json b/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/en_us.json similarity index 100% rename from projects/1.18/assets/wireless-chargers/wirelesschargers/en_us.json rename to projects/1.18/assets/wireless-chargers/wirelesschargers/lang/en_us.json diff --git a/projects/1.18/assets/wireless-chargers/wirelesschargers/zh_cn.json b/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json similarity index 100% rename from projects/1.18/assets/wireless-chargers/wirelesschargers/zh_cn.json rename to projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json From 42d9dd52ec845fe10a4b7a9297625e1607759228 Mon Sep 17 00:00:00 2001 From: creederyj Date: Mon, 9 May 2022 23:10:37 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E8=8D=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../super-circuit-maker/supercircuitmaker/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json b/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json index 85e7f2d21652..d197e959d5ca 100644 --- a/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json +++ b/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json @@ -6,7 +6,7 @@ "item.supercircuitmaker.palette": "调色板与刷子", "item.supercircuitmaker.tiny_redstone": "小撮红石", "item.supercircuitmaker.tiny_rgb_redstone": "小撮 RGB 红石", - "item.supercircuitmaker.randomizer": "萤石激化器", + "item.supercircuitmaker.randomizer": "荧石激化器", "item.supercircuitmaker.delay": "石英共振器", "item.supercircuitmaker.pulsar": "末影脉冲装置", "item.supercircuitmaker.note": "Booper", From 0a413fb88578400f8e646ae31211434b671dd20b Mon Sep 17 00:00:00 2001 From: n0099 Date: Tue, 10 May 2022 08:14:08 +0800 Subject: [PATCH 09/18] Apply suggestions from code review --- .../pretty-pipes/prettypipes/lang/zh_cn.json | 4 ++-- .../supercircuitmaker/lang/zh_cn.json | 8 ++++---- .../wirelesschargers/lang/zh_cn.json | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json b/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json index 86728d61b3a7..4ea4a3f9b6f1 100644 --- a/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json +++ b/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json @@ -64,7 +64,7 @@ "container.prettypipes.pressurizer": "管道加压器", "info.prettypipes.whitelist": "白名单", "info.prettypipes.blacklist": "黑名单", - "info.prettypipes.shift": "按住 Shift 查看更多信息", + "info.prettypipes.shift": "按住Shift查看更多信息", "info.prettypipes.populate": "全选", "info.prettypipes.populate.description": "过滤来自相邻物品栏的物品", "info.prettypipes.max_stack_size": "最大物品堆叠数量", @@ -72,7 +72,7 @@ "info.prettypipes.limit_to_max_off": "不要限制于一堆", "info.prettypipes.request": "发送", "info.prettypipes.not_found": "没有发现%s", - "info.prettypipes.hold_alt": "按住 Alt 请求", + "info.prettypipes.hold_alt": "按住Alt请求", "info.prettypipes.sending": "正在发送 %s %s", "info.prettypipes.sending_ingredients": "正在发送%s组材料", "info.prettypipes.order": "按%s排序", diff --git a/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json b/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json index d197e959d5ca..5e492599eaa5 100644 --- a/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json +++ b/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json @@ -5,7 +5,7 @@ "item.supercircuitmaker.screwdriver": "螺丝刀", "item.supercircuitmaker.palette": "调色板与刷子", "item.supercircuitmaker.tiny_redstone": "小撮红石", - "item.supercircuitmaker.tiny_rgb_redstone": "小撮 RGB 红石", + "item.supercircuitmaker.tiny_rgb_redstone": "小撮RGB红石", "item.supercircuitmaker.randomizer": "荧石激化器", "item.supercircuitmaker.delay": "石英共振器", "item.supercircuitmaker.pulsar": "末影脉冲装置", @@ -19,7 +19,7 @@ "item.supercircuitmaker.constant": "常量", "item.supercircuitmaker.platform": "支撑平台", "item.supercircuitmaker.redstone_stick": "红石涂层棒", - "item.supercircuitmaker.rgb_redstone_stick": "RGB 红石涂层棒", + "item.supercircuitmaker.rgb_redstone_stick": "RGB红石涂层棒", "container.supercircuitmaker.delay": "石英共振器: ", "container.supercircuitmaker.pulsar": "末影脉冲装置: ", "container.supercircuitmaker.timing.dec_10s": "-10s", @@ -40,6 +40,6 @@ "key.supercircuitmaker.open_palette": "打开调色板", "key.supercircuitmaker.component_placement_modifier": "组件放置修改器", "msg.supercircuitmaker.inspector.learned": "Learned!", - "msg.supercircuitmaker.inspector.mode_state": "选择模式:匹配方块状态", - "msg.supercircuitmaker.inspector.mode_block": "选择模式:匹配方块类型" + "msg.supercircuitmaker.inspector.mode_state": "选择模式：匹配方块状态", + "msg.supercircuitmaker.inspector.mode_block": "选择模式：匹配方块类型" } \ No newline at end of file diff --git a/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json b/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json index 52dfef6326ad..b8b2a0de46d6 100644 --- a/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json +++ b/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json @@ -12,14 +12,14 @@ "wirelesschargers.advancement.wireless_charging.title": "无线充电", "wirelesschargers.charger.info.blocks": "只能在 %1$dx%1$dx%1$d 的范围给方块充电.", "wirelesschargers.charger.info.players": "只能在 %1$dx%1$dx%1$d 的范围给玩家物品充电.", - "wirelesschargers.charger.info.redstone_mode": "红石模式: %s", - "wirelesschargers.charger.info.stored_energy": "储存的能量: %1$d / %2$d", - "wirelesschargers.charger.info.transfer_rate_blocks": "充电速率: 每个方块%d", - "wirelesschargers.charger.info.transfer_rate_players": "充电速率: 每个玩家%d", - "wirelesschargers.screen.highlight_area": "显示区域: %s", - "wirelesschargers.screen.redstone": "红石模式: %s", + "wirelesschargers.charger.info.redstone_mode": "红石模式：%s", + "wirelesschargers.charger.info.stored_energy": "储存的能量：%1$d / %2$d", + "wirelesschargers.charger.info.transfer_rate_blocks": "充电速率：每个方块%d", + "wirelesschargers.charger.info.transfer_rate_players": "充电速率：每个玩家%d", + "wirelesschargers.screen.highlight_area": "显示区域：%s", + "wirelesschargers.screen.redstone": "红石模式：%s", "wirelesschargers.screen.redstone_disabled": "关闭", "wirelesschargers.screen.redstone_high": "红石模式：高", "wirelesschargers.screen.redstone_low": "红石模式：低", - "wirelesschargers.screen.stored_energy": "储存的能量: %1$d / %2$d" + "wirelesschargers.screen.stored_energy": "储存的能量：%1$d / %2$d" } \ No newline at end of file From c8163728d5b58024387cdd5fc5d55469fe3cb70a Mon Sep 17 00:00:00 2001 From: creederyj Date: Tue, 10 May 2022 08:51:06 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json | 4 ++-- .../super-circuit-maker/supercircuitmaker/lang/zh_cn.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json b/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json index 4ea4a3f9b6f1..814198a76e50 100644 --- a/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json +++ b/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json @@ -68,8 +68,8 @@ "info.prettypipes.populate": "全选", "info.prettypipes.populate.description": "过滤来自相邻物品栏的物品", "info.prettypipes.max_stack_size": "最大物品堆叠数量", - "info.prettypipes.limit_to_max_on": "限制于一堆", - "info.prettypipes.limit_to_max_off": "不要限制于一堆", + "info.prettypipes.limit_to_max_on": "限制堆叠数", + "info.prettypipes.limit_to_max_off": "不限制堆叠数", "info.prettypipes.request": "发送", "info.prettypipes.not_found": "没有发现%s", "info.prettypipes.hold_alt": "按住Alt请求", diff --git a/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json b/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json index 5e492599eaa5..314133a9d0ee 100644 --- a/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json +++ b/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json @@ -30,7 +30,7 @@ "container.supercircuitmaker.timing.dec_1t": "-1t", "container.supercircuitmaker.timing.inc_1t": "+1t", "container.supercircuitmaker.timing.inc_10t": "+10t", - "container.supercircuitmaker.constant": "Constant: ", + "container.supercircuitmaker.constant": "常量: ", "container.supercircuitmaker.constant.dec_20": "-20", "container.supercircuitmaker.constant.dec_1": "-1", "container.supercircuitmaker.constant.inc_1": "+1", From b2c483724593b809f89f3edc74a8f25c2ba783da Mon Sep 17 00:00:00 2001 From: creederyj Date: Tue, 10 May 2022 12:12:09 +0800 Subject: [PATCH 11/18] =?UTF-8?q?framedblocks=20=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framedblocks/framedblocks/lang/zh_cn.json | 73 ++++++++++++++++++- .../framedblocks/framedblocks/lang/zh_cn.json | 73 ++++++++++++++++++- 2 files changed, 144 insertions(+), 2 deletions(-) diff --git a/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json b/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json index 9e26dfeeb6e6..e2ac48b6fe51 100644 --- a/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json +++ b/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json @@ -1 +1,72 @@ -{} \ No newline at end of file +{ + "block.framedblocks.framed_bars": "栏杆框架", + "block.framedblocks.framed_bouncy_cube": "黏液框架方块", + "block.framedblocks.framed_button": "按钮框架", + "block.framedblocks.framed_chest": "箱子框架", + "block.framedblocks.framed_collapsible_block": "折叠框架方块", + "block.framedblocks.framed_corner_pillar": "角柱框架", + "block.framedblocks.framed_corner_slope": "斜棱角框架", + "block.framedblocks.framed_cube": "框架方块", + "block.framedblocks.framed_door": "门框架", + "block.framedblocks.framed_double_corner": "双斜角框架", + "block.framedblocks.framed_double_panel": "双面板框架", + "block.framedblocks.framed_double_prism_corner": "带棱双斜角框架", + "block.framedblocks.framed_double_slab": "双半砖框架", + "block.framedblocks.framed_double_slope": "双斜面框架", + "block.framedblocks.framed_double_slope_slab": "双斜面半砖框架", + "block.framedblocks.framed_double_threeway_corner": "三切面双斜角框架", + "block.framedblocks.framed_elevated_slope_slab": "高斜面框架", + "block.framedblocks.framed_fence": "栅栏框架", + "block.framedblocks.framed_floor_board": "地毯框架", + "block.framedblocks.framed_flower_pot": "花盆框架", + "block.framedblocks.framed_gate": "栅栏门框架", + "block.framedblocks.framed_half_pillar": "半柱框架", + "block.framedblocks.framed_half_stairs": "半楼梯框架", + "block.framedblocks.framed_inner_corner_slope": "内切斜角框架", + "block.framedblocks.framed_inner_prism_corner": "带棱斜角框架", + "block.framedblocks.framed_inner_threeway_corner": "三切面斜角框架", + "block.framedblocks.framed_inv_double_slope_slab": "倒双斜面半砖框架", + "block.framedblocks.framed_ladder": "梯子框架", + "block.framedblocks.framed_lattice_block": "格栏框架", + "block.framedblocks.framed_lever": "拉杆框架", + "block.framedblocks.framed_pane": "平面框架", + "block.framedblocks.framed_panel": "面板框架", + "block.framedblocks.framed_pillar": "柱框架", + "block.framedblocks.framed_post": "杆框架", + "block.framedblocks.framed_pressure_plate": "压力板框架", + "block.framedblocks.framed_prism": "棱角框架", + "block.framedblocks.framed_prism_corner": "斜角框架", + "block.framedblocks.framed_rail_slope": "斜铁轨框架", + "block.framedblocks.framed_secret_storage": "贮藏箱框架", + "block.framedblocks.framed_sign": "告示牌框架", + "block.framedblocks.framed_slab": "半砖框架", + "block.framedblocks.framed_slab_corner": "角半砖框架", + "block.framedblocks.framed_slab_edge": "边半砖框架", + "block.framedblocks.framed_slope": "斜面框架", + "block.framedblocks.framed_slope_slab": "斜半砖框架", + "block.framedblocks.framed_sloped_prism": "带棱角框架", + "block.framedblocks.framed_soul_torch": "灵魂火把框架", + "block.framedblocks.framed_stairs": "楼梯框架", + "block.framedblocks.framed_threeway_corner": "三棱斜角框架", + "block.framedblocks.framed_torch": "火把框架", + "block.framedblocks.framed_trapdoor": "活板门框架", + "block.framedblocks.framed_vertical_stairs": "垂直楼梯框架", + "block.framedblocks.framed_wall": "墙框架", + "block.framedblocks.framed_wall_sign": "告示牌框架", + "desc.framed_blocks:blueprint_block": "包含方块：%s", + "desc.framed_blocks:blueprint_camo": "伪装方块：%s", + "desc.framed_blocks:blueprint_cant_copy": "此方块目前无法复制！", + "desc.framed_blocks:blueprint_illuminated": "发光：%s", + "desc.framed_blocks:blueprint_illuminated_false": "false", + "desc.framed_blocks:blueprint_illuminated_true": "true", + "desc.framed_blocks:blueprint_invalid": "失效", + "desc.framed_blocks:blueprint_none": "无", + "item.framedblocks.framed_blueprint": "框架蓝图", + "item.framedblocks.framed_hammer": "框架锤", + "item.framedblocks.framed_wrench": "框架扳手", + "itemGroup.framed_blocks": "框架方块", + "msg.framedblocks.blacklisted": "这个方块被列入黑名单！", + "msg.framedblocks.block_entity": "带有方块实体的方块不能插入到框架方块中！", + "title.framedblocks:framed_chest": "箱子框架", + "title.framedblocks:framed_secret_storage": "贮藏箱框架" + } \ No newline at end of file diff --git a/projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json b/projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json index 9e26dfeeb6e6..e2ac48b6fe51 100644 --- a/projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json +++ b/projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json @@ -1 +1,72 @@ -{} \ No newline at end of file +{ + "block.framedblocks.framed_bars": "栏杆框架", + "block.framedblocks.framed_bouncy_cube": "黏液框架方块", + "block.framedblocks.framed_button": "按钮框架", + "block.framedblocks.framed_chest": "箱子框架", + "block.framedblocks.framed_collapsible_block": "折叠框架方块", + "block.framedblocks.framed_corner_pillar": "角柱框架", + "block.framedblocks.framed_corner_slope": "斜棱角框架", + "block.framedblocks.framed_cube": "框架方块", + "block.framedblocks.framed_door": "门框架", + "block.framedblocks.framed_double_corner": "双斜角框架", + "block.framedblocks.framed_double_panel": "双面板框架", + "block.framedblocks.framed_double_prism_corner": "带棱双斜角框架", + "block.framedblocks.framed_double_slab": "双半砖框架", + "block.framedblocks.framed_double_slope": "双斜面框架", + "block.framedblocks.framed_double_slope_slab": "双斜面半砖框架", + "block.framedblocks.framed_double_threeway_corner": "三切面双斜角框架", + "block.framedblocks.framed_elevated_slope_slab": "高斜面框架", + "block.framedblocks.framed_fence": "栅栏框架", + "block.framedblocks.framed_floor_board": "地毯框架", + "block.framedblocks.framed_flower_pot": "花盆框架", + "block.framedblocks.framed_gate": "栅栏门框架", + "block.framedblocks.framed_half_pillar": "半柱框架", + "block.framedblocks.framed_half_stairs": "半楼梯框架", + "block.framedblocks.framed_inner_corner_slope": "内切斜角框架", + "block.framedblocks.framed_inner_prism_corner": "带棱斜角框架", + "block.framedblocks.framed_inner_threeway_corner": "三切面斜角框架", + "block.framedblocks.framed_inv_double_slope_slab": "倒双斜面半砖框架", + "block.framedblocks.framed_ladder": "梯子框架", + "block.framedblocks.framed_lattice_block": "格栏框架", + "block.framedblocks.framed_lever": "拉杆框架", + "block.framedblocks.framed_pane": "平面框架", + "block.framedblocks.framed_panel": "面板框架", + "block.framedblocks.framed_pillar": "柱框架", + "block.framedblocks.framed_post": "杆框架", + "block.framedblocks.framed_pressure_plate": "压力板框架", + "block.framedblocks.framed_prism": "棱角框架", + "block.framedblocks.framed_prism_corner": "斜角框架", + "block.framedblocks.framed_rail_slope": "斜铁轨框架", + "block.framedblocks.framed_secret_storage": "贮藏箱框架", + "block.framedblocks.framed_sign": "告示牌框架", + "block.framedblocks.framed_slab": "半砖框架", + "block.framedblocks.framed_slab_corner": "角半砖框架", + "block.framedblocks.framed_slab_edge": "边半砖框架", + "block.framedblocks.framed_slope": "斜面框架", + "block.framedblocks.framed_slope_slab": "斜半砖框架", + "block.framedblocks.framed_sloped_prism": "带棱角框架", + "block.framedblocks.framed_soul_torch": "灵魂火把框架", + "block.framedblocks.framed_stairs": "楼梯框架", + "block.framedblocks.framed_threeway_corner": "三棱斜角框架", + "block.framedblocks.framed_torch": "火把框架", + "block.framedblocks.framed_trapdoor": "活板门框架", + "block.framedblocks.framed_vertical_stairs": "垂直楼梯框架", + "block.framedblocks.framed_wall": "墙框架", + "block.framedblocks.framed_wall_sign": "告示牌框架", + "desc.framed_blocks:blueprint_block": "包含方块：%s", + "desc.framed_blocks:blueprint_camo": "伪装方块：%s", + "desc.framed_blocks:blueprint_cant_copy": "此方块目前无法复制！", + "desc.framed_blocks:blueprint_illuminated": "发光：%s", + "desc.framed_blocks:blueprint_illuminated_false": "false", + "desc.framed_blocks:blueprint_illuminated_true": "true", + "desc.framed_blocks:blueprint_invalid": "失效", + "desc.framed_blocks:blueprint_none": "无", + "item.framedblocks.framed_blueprint": "框架蓝图", + "item.framedblocks.framed_hammer": "框架锤", + "item.framedblocks.framed_wrench": "框架扳手", + "itemGroup.framed_blocks": "框架方块", + "msg.framedblocks.blacklisted": "这个方块被列入黑名单！", + "msg.framedblocks.block_entity": "带有方块实体的方块不能插入到框架方块中！", + "title.framedblocks:framed_chest": "箱子框架", + "title.framedblocks:framed_secret_storage": "贮藏箱框架" + } \ No newline at end of file From 6f7bb089dc5db075f0f3d551aedae9bb47f6bcbe Mon Sep 17 00:00:00 2001 From: creederyj Date: Tue, 10 May 2022 14:03:49 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.16/assets/framedblocks/framedblocks/lang/en_us.json | 3 ++- projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json | 1 + projects/1.18/assets/framedblocks/framedblocks/lang/en_us.json | 1 + projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/1.16/assets/framedblocks/framedblocks/lang/en_us.json b/projects/1.16/assets/framedblocks/framedblocks/lang/en_us.json index 291e322e14b4..366d2f6fb889 100644 --- a/projects/1.16/assets/framedblocks/framedblocks/lang/en_us.json +++ b/projects/1.16/assets/framedblocks/framedblocks/lang/en_us.json @@ -50,6 +50,7 @@ "block.framedblocks.framed_threeway_corner": "Framed Threeway Corner", "block.framedblocks.framed_torch": "Framed Torch", "block.framedblocks.framed_trapdoor": "Framed Trapdoor", + "block.framedblocks.framed_vertical_half_stairs": "Framed Vertical Half Stairs", "block.framedblocks.framed_vertical_stairs": "Framed Vertical Stairs", "block.framedblocks.framed_wall": "Framed Wall", "block.framedblocks.framed_wall_sign": "Framed Sign", @@ -66,7 +67,7 @@ "item.framedblocks.framed_wrench": "Framed Wrench", "itemGroup.framed_blocks": "FramedBlocks", "msg.framedblocks.blacklisted": "This block is blacklisted!", - "msg.framedblocks.tile_entity": "Blocks with TileEntities cannot be inserted into framed blocks!", + "msg.framedblocks.block_entity": "Blocks with BlockEntities cannot be inserted into framed blocks!", "title.framedblocks:framed_chest": "Framed Chest", "title.framedblocks:framed_secret_storage": "Framed Secret Storage" } \ No newline at end of file diff --git a/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json b/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json index e2ac48b6fe51..906cc59d5003 100644 --- a/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json +++ b/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json @@ -50,6 +50,7 @@ "block.framedblocks.framed_threeway_corner": "三棱斜角框架", "block.framedblocks.framed_torch": "火把框架", "block.framedblocks.framed_trapdoor": "活板门框架", + "block.framedblocks.framed_vertical_half_stairs": "垂直半楼梯框架", "block.framedblocks.framed_vertical_stairs": "垂直楼梯框架", "block.framedblocks.framed_wall": "墙框架", "block.framedblocks.framed_wall_sign": "告示牌框架", diff --git a/projects/1.18/assets/framedblocks/framedblocks/lang/en_us.json b/projects/1.18/assets/framedblocks/framedblocks/lang/en_us.json index 0583dc7cd3f6..366d2f6fb889 100644 --- a/projects/1.18/assets/framedblocks/framedblocks/lang/en_us.json +++ b/projects/1.18/assets/framedblocks/framedblocks/lang/en_us.json @@ -50,6 +50,7 @@ "block.framedblocks.framed_threeway_corner": "Framed Threeway Corner", "block.framedblocks.framed_torch": "Framed Torch", "block.framedblocks.framed_trapdoor": "Framed Trapdoor", + "block.framedblocks.framed_vertical_half_stairs": "Framed Vertical Half Stairs", "block.framedblocks.framed_vertical_stairs": "Framed Vertical Stairs", "block.framedblocks.framed_wall": "Framed Wall", "block.framedblocks.framed_wall_sign": "Framed Sign", diff --git a/projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json b/projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json index e2ac48b6fe51..906cc59d5003 100644 --- a/projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json +++ b/projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json @@ -50,6 +50,7 @@ "block.framedblocks.framed_threeway_corner": "三棱斜角框架", "block.framedblocks.framed_torch": "火把框架", "block.framedblocks.framed_trapdoor": "活板门框架", + "block.framedblocks.framed_vertical_half_stairs": "垂直半楼梯框架", "block.framedblocks.framed_vertical_stairs": "垂直楼梯框架", "block.framedblocks.framed_wall": "墙框架", "block.framedblocks.framed_wall_sign": "告示牌框架", From fca2756452aed07ae18ac3f6864f3ac1232f6130 Mon Sep 17 00:00:00 2001 From: creederyj Date: Tue, 10 May 2022 14:22:49 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E6=A0=A1=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.16/assets/framedblocks/framedblocks/lang/en_us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.16/assets/framedblocks/framedblocks/lang/en_us.json b/projects/1.16/assets/framedblocks/framedblocks/lang/en_us.json index 366d2f6fb889..6e8e404abe2f 100644 --- a/projects/1.16/assets/framedblocks/framedblocks/lang/en_us.json +++ b/projects/1.16/assets/framedblocks/framedblocks/lang/en_us.json @@ -67,7 +67,7 @@ "item.framedblocks.framed_wrench": "Framed Wrench", "itemGroup.framed_blocks": "FramedBlocks", "msg.framedblocks.blacklisted": "This block is blacklisted!", - "msg.framedblocks.block_entity": "Blocks with BlockEntities cannot be inserted into framed blocks!", + "msg.framedblocks.tile_entity": "Blocks with BlockEntities cannot be inserted into framed blocks!", "title.framedblocks:framed_chest": "Framed Chest", "title.framedblocks:framed_secret_storage": "Framed Secret Storage" } \ No newline at end of file From d90acb41831445f99a6f316d9afaa0ecf19389fe Mon Sep 17 00:00:00 2001 From: creederyj Date: Tue, 10 May 2022 14:26:22 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E8=BF=99=E5=9B=9E=E5=AF=B9=E4=BA=86?= =?UTF-8?q?=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json b/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json index 906cc59d5003..dbf60b487dc2 100644 --- a/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json +++ b/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json @@ -67,7 +67,7 @@ "item.framedblocks.framed_wrench": "框架扳手", "itemGroup.framed_blocks": "框架方块", "msg.framedblocks.blacklisted": "这个方块被列入黑名单！", - "msg.framedblocks.block_entity": "带有方块实体的方块不能插入到框架方块中！", + "msg.framedblocks.tile_entity": "带有方块实体的方块不能插入到框架方块中！", "title.framedblocks:framed_chest": "箱子框架", "title.framedblocks:framed_secret_storage": "贮藏箱框架" } \ No newline at end of file From aa852e1f363563d30c8135b809e481a6f3ac1f11 Mon Sep 17 00:00:00 2001 From: creederyj Date: Wed, 11 May 2022 09:09:49 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E8=B0=A2=E8=B0=A2=E5=AE=A1=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framedblocks/framedblocks/lang/zh_cn.json | 8 ++++---- .../pretty-pipes/prettypipes/lang/zh_cn.json | 8 ++++---- .../supercircuitmaker/lang/zh_cn.json | 2 +- .../wirelesschargers/lang/zh_cn.json | 20 +++++++++---------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json b/projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json index 906cc59d5003..feb8d51fa5f1 100644 --- a/projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json +++ b/projects/1.18/assets/framedblocks/framedblocks/lang/zh_cn.json @@ -39,11 +39,11 @@ "block.framedblocks.framed_rail_slope": "斜铁轨框架", "block.framedblocks.framed_secret_storage": "贮藏箱框架", "block.framedblocks.framed_sign": "告示牌框架", - "block.framedblocks.framed_slab": "半砖框架", - "block.framedblocks.framed_slab_corner": "角半砖框架", - "block.framedblocks.framed_slab_edge": "边半砖框架", + "block.framedblocks.framed_slab": "台阶框架", + "block.framedblocks.framed_slab_corner": "角台阶框架", + "block.framedblocks.framed_slab_edge": "半台阶框架", "block.framedblocks.framed_slope": "斜面框架", - "block.framedblocks.framed_slope_slab": "斜半砖框架", + "block.framedblocks.framed_slope_slab": "斜台阶框架", "block.framedblocks.framed_sloped_prism": "带棱角框架", "block.framedblocks.framed_soul_torch": "灵魂火把框架", "block.framedblocks.framed_stairs": "楼梯框架", diff --git a/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json b/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json index 814198a76e50..6b08604c4edc 100644 --- a/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json +++ b/projects/1.18/assets/pretty-pipes/prettypipes/lang/zh_cn.json @@ -68,8 +68,8 @@ "info.prettypipes.populate": "全选", "info.prettypipes.populate.description": "过滤来自相邻物品栏的物品", "info.prettypipes.max_stack_size": "最大物品堆叠数量", - "info.prettypipes.limit_to_max_on": "限制堆叠数", - "info.prettypipes.limit_to_max_off": "不限制堆叠数", + "info.prettypipes.limit_to_max_on": "限制组数", + "info.prettypipes.limit_to_max_off": "不限制组数", "info.prettypipes.request": "发送", "info.prettypipes.not_found": "没有发现%s", "info.prettypipes.hold_alt": "按住Alt请求", @@ -79,8 +79,8 @@ "info.prettypipes.order.amount": "数量", "info.prettypipes.order.name": "名字", "info.prettypipes.order.mod": "模组", - "info.prettypipes.ascending": "上升", - "info.prettypipes.descending": "下降", + "info.prettypipes.ascending": "升序", + "info.prettypipes.descending": "降序", "info.prettypipes.sync_jei.on": "同步JEI搜索", "info.prettypipes.sync_jei.off": "关闭同步JEI搜索", "info.prettypipes.energy": "%s / %s FE", diff --git a/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json b/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json index 314133a9d0ee..9fc6188ceb4d 100644 --- a/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json +++ b/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json @@ -38,7 +38,7 @@ "subtitles.supercircuitmaker.place": "BOOP", "key.supercircuitmaker": "超级电路", "key.supercircuitmaker.open_palette": "打开调色板", - "key.supercircuitmaker.component_placement_modifier": "组件放置修改器", + "key.supercircuitmaker.component_placement_modifier": "元件放置修饰符", "msg.supercircuitmaker.inspector.learned": "Learned!", "msg.supercircuitmaker.inspector.mode_state": "选择模式：匹配方块状态", "msg.supercircuitmaker.inspector.mode_block": "选择模式：匹配方块类型" diff --git a/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json b/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json index b8b2a0de46d6..bfccfa1d8775 100644 --- a/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json +++ b/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json @@ -4,22 +4,22 @@ "block.wirelesschargers.basic_wireless_block_charger": "基础无线充电器（方块）", "block.wirelesschargers.basic_wireless_player_charger": "基础无线充电器（玩家）", "itemGroup.wirelesschargers": "无线充电器", - "wirelesschargers.advancement.no_more_batteries.description": "打造先进的无线充电器", - "wirelesschargers.advancement.no_more_batteries.title": "不再需要电池", - "wirelesschargers.advancement.no_more_cables.description": "打造先进的无线充电器", - "wirelesschargers.advancement.no_more_cables.title": "不再有电缆", + "wirelesschargers.advancement.no_more_batteries.description": "制作高级无线充电器", + "wirelesschargers.advancement.no_more_batteries.title": "不需要电池", + "wirelesschargers.advancement.no_more_cables.description": "制作高级无线充电器", + "wirelesschargers.advancement.no_more_cables.title": "不需要电缆", "wirelesschargers.advancement.wireless_charging.description": "制作无线充电器", "wirelesschargers.advancement.wireless_charging.title": "无线充电", - "wirelesschargers.charger.info.blocks": "只能在 %1$dx%1$dx%1$d 的范围给方块充电.", - "wirelesschargers.charger.info.players": "只能在 %1$dx%1$dx%1$d 的范围给玩家物品充电.", + "wirelesschargers.charger.info.blocks": "只能在 %1$dx%1$dx%1$d 的范围给方块充电。", + "wirelesschargers.charger.info.players": "只能在 %1$dx%1$dx%1$d 的范围给玩家的物品充电。", "wirelesschargers.charger.info.redstone_mode": "红石模式：%s", "wirelesschargers.charger.info.stored_energy": "储存的能量：%1$d / %2$d", - "wirelesschargers.charger.info.transfer_rate_blocks": "充电速率：每个方块%d", - "wirelesschargers.charger.info.transfer_rate_players": "充电速率：每个玩家%d", + "wirelesschargers.charger.info.transfer_rate_blocks": "充电速率：%d每个方块", + "wirelesschargers.charger.info.transfer_rate_players": "充电速率：%d每个玩家", "wirelesschargers.screen.highlight_area": "显示区域：%s", "wirelesschargers.screen.redstone": "红石模式：%s", "wirelesschargers.screen.redstone_disabled": "关闭", - "wirelesschargers.screen.redstone_high": "红石模式：高", - "wirelesschargers.screen.redstone_low": "红石模式：低", + "wirelesschargers.screen.redstone_high": "高", + "wirelesschargers.screen.redstone_low": "低", "wirelesschargers.screen.stored_energy": "储存的能量：%1$d / %2$d" } \ No newline at end of file From 7b3f1cbcaf1fbe55abca8746a95e7e1c6756a4bd Mon Sep 17 00:00:00 2001 From: creederyj Date: Wed, 11 May 2022 09:31:50 +0800 Subject: [PATCH 16/18] 1 --- .../super-circuit-maker/supercircuitmaker/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json b/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json index 9fc6188ceb4d..4a192115e1f8 100644 --- a/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json +++ b/projects/1.18/assets/super-circuit-maker/supercircuitmaker/lang/zh_cn.json @@ -36,7 +36,7 @@ "container.supercircuitmaker.constant.inc_1": "+1", "container.supercircuitmaker.constant.inc_20": "+20", "subtitles.supercircuitmaker.place": "BOOP", - "key.supercircuitmaker": "超级电路", + "key.supercircuitmaker": "Super Circuit Maker", "key.supercircuitmaker.open_palette": "打开调色板", "key.supercircuitmaker.component_placement_modifier": "元件放置修饰符", "msg.supercircuitmaker.inspector.learned": "Learned!", From a1d6776f20971ec57e97bfd9ea4a7e57134d75af Mon Sep 17 00:00:00 2001 From: creederyj Date: Wed, 11 May 2022 09:46:37 +0800 Subject: [PATCH 17/18] 2 --- .../1.16/assets/framedblocks/framedblocks/lang/zh_cn.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json b/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json index dbf60b487dc2..d07b49653d5b 100644 --- a/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json +++ b/projects/1.16/assets/framedblocks/framedblocks/lang/zh_cn.json @@ -39,11 +39,11 @@ "block.framedblocks.framed_rail_slope": "斜铁轨框架", "block.framedblocks.framed_secret_storage": "贮藏箱框架", "block.framedblocks.framed_sign": "告示牌框架", - "block.framedblocks.framed_slab": "半砖框架", - "block.framedblocks.framed_slab_corner": "角半砖框架", - "block.framedblocks.framed_slab_edge": "边半砖框架", + "block.framedblocks.framed_slab": "台阶框架", + "block.framedblocks.framed_slab_corner": "角台阶框架", + "block.framedblocks.framed_slab_edge": "半台阶框架", "block.framedblocks.framed_slope": "斜面框架", - "block.framedblocks.framed_slope_slab": "斜半砖框架", + "block.framedblocks.framed_slope_slab": "斜台阶框架", "block.framedblocks.framed_sloped_prism": "带棱角框架", "block.framedblocks.framed_soul_torch": "灵魂火把框架", "block.framedblocks.framed_stairs": "楼梯框架", From 0ed7755647ac6d315e932b5c875f7dd9472cfbfc Mon Sep 17 00:00:00 2001 From: creederyj Date: Wed, 11 May 2022 13:12:04 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wirelesschargers/lang/en_us.json | 25 ------------------- .../wirelesschargers/lang/zh_cn.json | 25 ------------------- 2 files changed, 50 deletions(-) delete mode 100644 projects/1.18/assets/wireless-chargers/wirelesschargers/lang/en_us.json delete mode 100644 projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json diff --git a/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/en_us.json b/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/en_us.json deleted file mode 100644 index 5ab9e453ec03..000000000000 --- a/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/en_us.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "block.wirelesschargers.advanced_wireless_block_charger": "Advanced Wireless Block Charger", - "block.wirelesschargers.advanced_wireless_player_charger": "Advanced Wireless Player Charger", - "block.wirelesschargers.basic_wireless_block_charger": "Basic Wireless Block Charger", - "block.wirelesschargers.basic_wireless_player_charger": "Basic Wireless Player Charger", - "itemGroup.wirelesschargers": "Wireless Chargers", - "wirelesschargers.advancement.no_more_batteries.description": "Craft an advanced wireless player charger", - "wirelesschargers.advancement.no_more_batteries.title": "No More Batteries", - "wirelesschargers.advancement.no_more_cables.description": "Craft an advanced wireless block charger", - "wirelesschargers.advancement.no_more_cables.title": "No More Cables", - "wirelesschargers.advancement.wireless_charging.description": "Craft a wireless charger", - "wirelesschargers.advancement.wireless_charging.title": "Wireless Charging", - "wirelesschargers.charger.info.blocks": "Charges blocks in a %1$dx%1$dx%1$d area.", - "wirelesschargers.charger.info.players": "Charges players' items in a %1$dx%1$dx%1$d area.", - "wirelesschargers.charger.info.redstone_mode": "Redstone mode: %s", - "wirelesschargers.charger.info.stored_energy": "Energy stored: %1$d / %2$d", - "wirelesschargers.charger.info.transfer_rate_blocks": "Charging rate: %d per block", - "wirelesschargers.charger.info.transfer_rate_players": "Charging rate: %d per player", - "wirelesschargers.screen.highlight_area": "Highlight area: %s", - "wirelesschargers.screen.redstone": "Redstone mode: %s", - "wirelesschargers.screen.redstone_disabled": "Disabled", - "wirelesschargers.screen.redstone_high": "High", - "wirelesschargers.screen.redstone_low": "Low", - "wirelesschargers.screen.stored_energy": "Energy stored: %1$d / %2$d" -} \ No newline at end of file diff --git a/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json b/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json deleted file mode 100644 index bfccfa1d8775..000000000000 --- a/projects/1.18/assets/wireless-chargers/wirelesschargers/lang/zh_cn.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "block.wirelesschargers.advanced_wireless_block_charger": "高级无线充电器（方块）", - "block.wirelesschargers.advanced_wireless_player_charger": "无线充电器（玩家）", - "block.wirelesschargers.basic_wireless_block_charger": "基础无线充电器（方块）", - "block.wirelesschargers.basic_wireless_player_charger": "基础无线充电器（玩家）", - "itemGroup.wirelesschargers": "无线充电器", - "wirelesschargers.advancement.no_more_batteries.description": "制作高级无线充电器", - "wirelesschargers.advancement.no_more_batteries.title": "不需要电池", - "wirelesschargers.advancement.no_more_cables.description": "制作高级无线充电器", - "wirelesschargers.advancement.no_more_cables.title": "不需要电缆", - "wirelesschargers.advancement.wireless_charging.description": "制作无线充电器", - "wirelesschargers.advancement.wireless_charging.title": "无线充电", - "wirelesschargers.charger.info.blocks": "只能在 %1$dx%1$dx%1$d 的范围给方块充电。", - "wirelesschargers.charger.info.players": "只能在 %1$dx%1$dx%1$d 的范围给玩家的物品充电。", - "wirelesschargers.charger.info.redstone_mode": "红石模式：%s", - "wirelesschargers.charger.info.stored_energy": "储存的能量：%1$d / %2$d", - "wirelesschargers.charger.info.transfer_rate_blocks": "充电速率：%d每个方块", - "wirelesschargers.charger.info.transfer_rate_players": "充电速率：%d每个玩家", - "wirelesschargers.screen.highlight_area": "显示区域：%s", - "wirelesschargers.screen.redstone": "红石模式：%s", - "wirelesschargers.screen.redstone_disabled": "关闭", - "wirelesschargers.screen.redstone_high": "高", - "wirelesschargers.screen.redstone_low": "低", - "wirelesschargers.screen.stored_energy": "储存的能量：%1$d / %2$d" -} \ No newline at end of file