From 8c9de377a7430d5301fbe5f1a5b470b75c1981a3 Mon Sep 17 00:00:00 2001 From: Dawnwalker <49862610+Dawnwalker666@users.noreply.github.com> Date: Tue, 20 May 2025 19:55:51 +0800 Subject: [PATCH 1/5] Update zh_cn.json The number of zh_cn.json lines is strictly equal to en_us.json --- .../assets/actuallyadditions/lang/zh_cn.json | 47 ++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/actuallyadditions/lang/zh_cn.json b/src/main/resources/assets/actuallyadditions/lang/zh_cn.json index d2674e988..b2a06c6c2 100644 --- a/src/main/resources/assets/actuallyadditions/lang/zh_cn.json +++ b/src/main/resources/assets/actuallyadditions/lang/zh_cn.json @@ -443,6 +443,9 @@ "tooltip.actuallyadditions.item_filling_wand.selected_block.none": "无", "tooltip.actuallyadditions.coffeeCup.noEffect": "无效果", "tooltip.actuallyadditions.item_tag.no_tag": "使用铁砧设置标签.", + "tooltip.actuallyadditions.coal_generator_stats": "产生 %d CF (%d CF/t 在 %d ticks)", + "tooltip.actuallyadditions.placer_augment": "从快捷栏中放置方块: %d ", + "tooltip.actuallyadditions.drill.augments": "安装升级: %s", "_comment": "Gui信息", "info.actuallyadditions.gui.animals": "动物", "info.actuallyadditions.gui.enoughToBreed": "数量足够繁殖!", @@ -979,6 +982,7 @@ "booklet.actuallyadditions.chapter.trialsIntro": "挑战介绍", "booklet.actuallyadditions.chapter.trialsIntro.text.1": "挑战是一系列有趣的项目，你可以从中得到灵感来决定下一步应该修什么。一旦你完成了一项挑战，你可以按下右下角按钮来标记已完成挑战，这样它的名字就会变成绿色。其实目前还没有办法实际检查一项挑战是否被真正完成，挑战只是一个个人目标。想要访问挑战页面，只需要点击手册右上角的书签即可。", "booklet.actuallyadditions.chapter.trialsIntro.text.2": "记住挑战的完成仅限于使用Minecraft和Actually Additions的东西。", + "_comment": "联网", "actuallyadditions.networking.spawn_laser.failed": "激光生成失败: %s", "actuallyadditions.networking.spawn_laser_particle.failed": "无法生成激光粒子: %s", "actuallyadditions.networking.tile_update.failed": "更新方块实体失败: %s", @@ -997,5 +1001,46 @@ "container.actuallyadditions.item_tag": "物品标签", "key.actualladditions.crafting_stick_open.desc": "打开手持工作台", - "key.actuallyadditions.category": "实用拓展" + "key.actuallyadditions.category": "实用拓展", + + "actuallyadditions.configuration.doUpdateCheck": "更新检查", + "actuallyadditions.configuration.doBatDrops": "蝙蝠掉落物", + "actuallyadditions.configuration.advancedInfoTooltips": "进阶提示信息", + "actuallyadditions.configuration.hideEnergyOverlay": "游戏内隐藏能源信息", + "actuallyadditions.configuration.generateFlax": "生成亚麻", + "actuallyadditions.configuration.doCatDrops": "猫的掉落物", + "actuallyadditions.configuration.generateCanola": "生成油菜", + "actuallyadditions.configuration.generateQuartz": "生成石英", + "actuallyadditions.configuration.reconstructorPower": "原子再构机能源", + "actuallyadditions.configuration.leafGeneratorCPPerLeaf": "咀叶发电机消耗每块树叶可产生CP", + "actuallyadditions.configuration.villageAndDungeonLoot": "村庄和地牢战利品", + "actuallyadditions.configuration.drillExtraWhitelist": "手钻额外白名单", + "actuallyadditions.configuration.solidXPOrbs": "固化经验", + "actuallyadditions.configuration.tillingWorms": "耕种时蚯蚓生成", + "actuallyadditions.configuration.advancedInfo": "进阶信息", + "actuallyadditions.configuration.fluidLaserTransferRate": "流体激光传输速率", + "actuallyadditions.configuration.itemsSettings": "物品设置", + "actuallyadditions.configuration.superDuperHardRecipes": "极难模式合成表", + "actuallyadditions.configuration.relayConfigurator": "中继器配置", + "actuallyadditions.configuration.waterBowlSpilling": "一碗水可以被泼出", + "actuallyadditions.configuration.oilGeneratorTransfer": "原油发电机产电速率", + "actuallyadditions.configuration.laserRelayLoss": "激光中继器能量损耗", + "actuallyadditions.configuration.farmerConfigurator": "农场配置", + "actuallyadditions.configuration.leafGeneratorCooldown": "咀叶发电机冷却时间", + "actuallyadditions.configuration.redstoneConfigurator": "红石配置", + "actuallyadditions.configuration.verticalDiggerBlacklist": "垂直挖矿机黑名单", + "actuallyadditions.configuration.versionSpecificUpdateChecker": "特殊版本更新检查", + "actuallyadditions.configuration.other": "其他", + "actuallyadditions.configuration.generateCoffee": "生成咖啡", + "actuallyadditions.configuration.wormDeathTime": "蚯蚓死亡时间", + "actuallyadditions.configuration.farmerArea": "农场生效区域", + "actuallyadditions.configuration.leafGeneratorArea": "咀叶发电机生效区域", + "actuallyadditions.configuration.minerLensEnergy": "矿工透镜耗能", + "actuallyadditions.configuration.worldgenSettings": "世界生成设置", + "actuallyadditions.configuration.giveBookletOnFirstCraft": "第一次合成后给一本指导手册", + "actuallyadditions.configuration.waterBowl": "一碗水", + "actuallyadditions.configuration.machineSettings": "机器设置", + "actuallyadditions.configuration.tinyCoal": "小块煤炭", + "actuallyadditions.configuration.noColoredItemNames": "物品名字不显示彩色", + "actuallyadditions.configuration.verticalDiggerExtraWhitelist": "垂直挖矿机额外名单" } From e9186007e29bb51f8228c78e843637abe6e37497 Mon Sep 17 00:00:00 2001 From: Dawnwalker <49862610+Dawnwalker666@users.noreply.github.com> Date: Wed, 20 Aug 2025 13:15:18 +0800 Subject: [PATCH 2/5] Apply suggestions from code review Co-authored-by: ZetaY <34602681+ZHAY10086@users.noreply.github.com> --- .../assets/actuallyadditions/lang/zh_cn.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/resources/assets/actuallyadditions/lang/zh_cn.json b/src/main/resources/assets/actuallyadditions/lang/zh_cn.json index b2a06c6c2..7d14dd2bf 100644 --- a/src/main/resources/assets/actuallyadditions/lang/zh_cn.json +++ b/src/main/resources/assets/actuallyadditions/lang/zh_cn.json @@ -443,9 +443,9 @@ "tooltip.actuallyadditions.item_filling_wand.selected_block.none": "无", "tooltip.actuallyadditions.coffeeCup.noEffect": "无效果", "tooltip.actuallyadditions.item_tag.no_tag": "使用铁砧设置标签.", - "tooltip.actuallyadditions.coal_generator_stats": "产生 %d CF (%d CF/t 在 %d ticks)", - "tooltip.actuallyadditions.placer_augment": "从快捷栏中放置方块: %d ", - "tooltip.actuallyadditions.drill.augments": "安装升级: %s", + "tooltip.actuallyadditions.coal_generator_stats": "产出 %d CF （%d CF/t，持续 %d ticks）", + "tooltip.actuallyadditions.placer_augment": "放置%d号快捷栏中的方块 ", + "tooltip.actuallyadditions.drill.augments": "已安装升级：%s", "_comment": "Gui信息", "info.actuallyadditions.gui.animals": "动物", "info.actuallyadditions.gui.enoughToBreed": "数量足够繁殖!", @@ -1006,18 +1006,18 @@ "actuallyadditions.configuration.doUpdateCheck": "更新检查", "actuallyadditions.configuration.doBatDrops": "蝙蝠掉落物", "actuallyadditions.configuration.advancedInfoTooltips": "进阶提示信息", - "actuallyadditions.configuration.hideEnergyOverlay": "游戏内隐藏能源信息", + "actuallyadditions.configuration.hideEnergyOverlay": "隐藏能量信息叠加层", "actuallyadditions.configuration.generateFlax": "生成亚麻", "actuallyadditions.configuration.doCatDrops": "猫的掉落物", "actuallyadditions.configuration.generateCanola": "生成油菜", "actuallyadditions.configuration.generateQuartz": "生成石英", - "actuallyadditions.configuration.reconstructorPower": "原子再构机能源", - "actuallyadditions.configuration.leafGeneratorCPPerLeaf": "咀叶发电机消耗每块树叶可产生CP", + "actuallyadditions.configuration.reconstructorPower": "原子再构机能量容量", + "actuallyadditions.configuration.leafGeneratorCPPerLeaf": "咀叶发电机每消耗一块树叶产生的CP", "actuallyadditions.configuration.villageAndDungeonLoot": "村庄和地牢战利品", "actuallyadditions.configuration.drillExtraWhitelist": "手钻额外白名单", "actuallyadditions.configuration.solidXPOrbs": "固化经验", - "actuallyadditions.configuration.tillingWorms": "耕种时蚯蚓生成", - "actuallyadditions.configuration.advancedInfo": "进阶信息", + "actuallyadditions.configuration.tillingWorms": "耕地时生成蚯蚓", + "actuallyadditions.configuration.advancedInfo": "高级信息", "actuallyadditions.configuration.fluidLaserTransferRate": "流体激光传输速率", "actuallyadditions.configuration.itemsSettings": "物品设置", "actuallyadditions.configuration.superDuperHardRecipes": "极难模式合成表", @@ -1029,18 +1029,18 @@ "actuallyadditions.configuration.leafGeneratorCooldown": "咀叶发电机冷却时间", "actuallyadditions.configuration.redstoneConfigurator": "红石配置", "actuallyadditions.configuration.verticalDiggerBlacklist": "垂直挖矿机黑名单", - "actuallyadditions.configuration.versionSpecificUpdateChecker": "特殊版本更新检查", + "actuallyadditions.configuration.versionSpecificUpdateChecker": "游戏版本特定的更新检查", "actuallyadditions.configuration.other": "其他", "actuallyadditions.configuration.generateCoffee": "生成咖啡", "actuallyadditions.configuration.wormDeathTime": "蚯蚓死亡时间", - "actuallyadditions.configuration.farmerArea": "农场生效区域", - "actuallyadditions.configuration.leafGeneratorArea": "咀叶发电机生效区域", + "actuallyadditions.configuration.farmerArea": "农场工作范围", + "actuallyadditions.configuration.leafGeneratorArea": "咀叶发电机工作范围", "actuallyadditions.configuration.minerLensEnergy": "矿工透镜耗能", "actuallyadditions.configuration.worldgenSettings": "世界生成设置", - "actuallyadditions.configuration.giveBookletOnFirstCraft": "第一次合成后给一本指导手册", + "actuallyadditions.configuration.giveBookletOnFirstCraft": "第一次合成后给予指导手册", "actuallyadditions.configuration.waterBowl": "一碗水", "actuallyadditions.configuration.machineSettings": "机器设置", "actuallyadditions.configuration.tinyCoal": "小块煤炭", - "actuallyadditions.configuration.noColoredItemNames": "物品名字不显示彩色", + "actuallyadditions.configuration.noColoredItemNames": "不显示彩色物品名称", "actuallyadditions.configuration.verticalDiggerExtraWhitelist": "垂直挖矿机额外名单" } From 5133f43f0e8b57f06698c9e68ff95d55606c9e41 Mon Sep 17 00:00:00 2001 From: Dawnwalker <49862610+Dawnwalker666@users.noreply.github.com> Date: Wed, 20 Aug 2025 14:33:29 +0800 Subject: [PATCH 3/5] Apply suggestions from code review Co-authored-by: ZetaY <34602681+ZHAY10086@users.noreply.github.com> --- .../assets/actuallyadditions/lang/zh_cn.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/assets/actuallyadditions/lang/zh_cn.json b/src/main/resources/assets/actuallyadditions/lang/zh_cn.json index 7d14dd2bf..e749b1523 100644 --- a/src/main/resources/assets/actuallyadditions/lang/zh_cn.json +++ b/src/main/resources/assets/actuallyadditions/lang/zh_cn.json @@ -982,7 +982,7 @@ "booklet.actuallyadditions.chapter.trialsIntro": "挑战介绍", "booklet.actuallyadditions.chapter.trialsIntro.text.1": "挑战是一系列有趣的项目，你可以从中得到灵感来决定下一步应该修什么。一旦你完成了一项挑战，你可以按下右下角按钮来标记已完成挑战，这样它的名字就会变成绿色。其实目前还没有办法实际检查一项挑战是否被真正完成，挑战只是一个个人目标。想要访问挑战页面，只需要点击手册右上角的书签即可。", "booklet.actuallyadditions.chapter.trialsIntro.text.2": "记住挑战的完成仅限于使用Minecraft和Actually Additions的东西。", - "_comment": "联网", + "_comment": "网络相关", "actuallyadditions.networking.spawn_laser.failed": "激光生成失败: %s", "actuallyadditions.networking.spawn_laser_particle.failed": "无法生成激光粒子: %s", "actuallyadditions.networking.tile_update.failed": "更新方块实体失败: %s", @@ -1021,13 +1021,13 @@ "actuallyadditions.configuration.fluidLaserTransferRate": "流体激光传输速率", "actuallyadditions.configuration.itemsSettings": "物品设置", "actuallyadditions.configuration.superDuperHardRecipes": "极难模式合成表", - "actuallyadditions.configuration.relayConfigurator": "中继器配置", - "actuallyadditions.configuration.waterBowlSpilling": "一碗水可以被泼出", - "actuallyadditions.configuration.oilGeneratorTransfer": "原油发电机产电速率", + "actuallyadditions.configuration.relayConfigurator": "中继器配置器", + "actuallyadditions.configuration.waterBowlSpilling": "碗中的水会被泼出", + "actuallyadditions.configuration.oilGeneratorTransfer": "原油发电机输出速率", "actuallyadditions.configuration.laserRelayLoss": "激光中继器能量损耗", - "actuallyadditions.configuration.farmerConfigurator": "农场配置", + "actuallyadditions.configuration.farmerConfigurator": "农场配置器", "actuallyadditions.configuration.leafGeneratorCooldown": "咀叶发电机冷却时间", - "actuallyadditions.configuration.redstoneConfigurator": "红石配置", + "actuallyadditions.configuration.redstoneConfigurator": "红石配置器", "actuallyadditions.configuration.verticalDiggerBlacklist": "垂直挖矿机黑名单", "actuallyadditions.configuration.versionSpecificUpdateChecker": "游戏版本特定的更新检查", "actuallyadditions.configuration.other": "其他", From c551d018113f1845ab857f5f236556b2a27c7c4c Mon Sep 17 00:00:00 2001 From: Dawnwalker <49862610+Dawnwalker666@users.noreply.github.com> Date: Wed, 20 Aug 2025 14:34:12 +0800 Subject: [PATCH 4/5] Apply suggestions from code review Co-authored-by: ZetaY <34602681+ZHAY10086@users.noreply.github.com> --- src/main/resources/assets/actuallyadditions/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/actuallyadditions/lang/zh_cn.json b/src/main/resources/assets/actuallyadditions/lang/zh_cn.json index e749b1523..97da62a7f 100644 --- a/src/main/resources/assets/actuallyadditions/lang/zh_cn.json +++ b/src/main/resources/assets/actuallyadditions/lang/zh_cn.json @@ -1005,7 +1005,7 @@ "actuallyadditions.configuration.doUpdateCheck": "更新检查", "actuallyadditions.configuration.doBatDrops": "蝙蝠掉落物", - "actuallyadditions.configuration.advancedInfoTooltips": "进阶提示信息", + "actuallyadditions.configuration.advancedInfoTooltips": "进阶高级信息", "actuallyadditions.configuration.hideEnergyOverlay": "隐藏能量信息叠加层", "actuallyadditions.configuration.generateFlax": "生成亚麻", "actuallyadditions.configuration.doCatDrops": "猫的掉落物", From f4bd39789cbdeecc797e8465cd739af867d3d985 Mon Sep 17 00:00:00 2001 From: Dawnwalker <49862610+Dawnwalker666@users.noreply.github.com> Date: Wed, 20 Aug 2025 15:13:15 +0800 Subject: [PATCH 5/5] Apply suggestions from code review Co-authored-by: ZetaY <34602681+ZHAY10086@users.noreply.github.com> --- src/main/resources/assets/actuallyadditions/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/actuallyadditions/lang/zh_cn.json b/src/main/resources/assets/actuallyadditions/lang/zh_cn.json index 97da62a7f..474637c62 100644 --- a/src/main/resources/assets/actuallyadditions/lang/zh_cn.json +++ b/src/main/resources/assets/actuallyadditions/lang/zh_cn.json @@ -1005,7 +1005,7 @@ "actuallyadditions.configuration.doUpdateCheck": "更新检查", "actuallyadditions.configuration.doBatDrops": "蝙蝠掉落物", - "actuallyadditions.configuration.advancedInfoTooltips": "进阶高级信息", + "actuallyadditions.configuration.advancedInfoTooltips": "高级提示信息", "actuallyadditions.configuration.hideEnergyOverlay": "隐藏能量信息叠加层", "actuallyadditions.configuration.generateFlax": "生成亚麻", "actuallyadditions.configuration.doCatDrops": "猫的掉落物",