From a618ca77de57d21d3d5dc6e4afec4baf6fffe37c Mon Sep 17 00:00:00 2001 From: Ju2Ju211 <116257229+Ju2Ju211@users.noreply.github.com> Date: Thu, 20 Oct 2022 16:51:31 +0800 Subject: [PATCH 01/13] =?UTF-8?q?iron=20generator=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/irongenerators/lang/en_us.json | 57 +++++++++++++++++++ .../assets/irongenerators/lang/zh_cn.json | 57 +++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 projects/1.18/assets/irongenerators/lang/en_us.json create mode 100644 projects/1.18/assets/irongenerators/lang/zh_cn.json diff --git a/projects/1.18/assets/irongenerators/lang/en_us.json b/projects/1.18/assets/irongenerators/lang/en_us.json new file mode 100644 index 000000000000..3d176856620b --- /dev/null +++ b/projects/1.18/assets/irongenerators/lang/en_us.json @@ -0,0 +1,57 @@ +{ + "item.moregenerators.netherstar_upgrade": "Netherstar Upgrade", + "block.moregenerators.iron_generator": "Iron Generator", + "block.irongenerators.refined_obsidian_generator": "Refined Obsidian Generator", + "block.moregenerators.certus_quartz_generator": "Certus Generator", + "item.moregenerators.emerald_upgrade": "Emerald Upgrade", + "block.moregenerators.icon": "Icon", + "subtitles.generatorambient": "", + "block.irongenerators.obsidian_generator": "Obsidian Generator", + "item.moregenerators.generator_upgrade_obsidianto_netheride": "Generator Upgrade: �8Obsidian �rto �7Netherite", + "block.moregenerators.osmium_generator": "Osmium Generator", + "block.moregenerators.gold_generator": "Gold Generator", + "block.irongenerators.certus_quartz_generator": "Certus Generator", + "block.moregenerators.copper_generator": "Copper Generator", + "block.moregenerators.steel_generator": "Steel Generator", + "block.moregenerators.skystone_generator": "Skystone Generator", + "item.moregenerators.diamond_upgrade": "Diamond Upgrade", + "block.irongenerators.infinity_generator": "The Everlasting Generator", + "item.moregenerators.flint_upgrade": "Flint Upgrade", + "block.irongenerators.skystone_generator": "Skystone Generator", + "block.irongenerators.signalum_generator": "Signalum Generator", + "block.irongenerators.stone_generator": "Stone Generator", + "block.irongenerators.iron_generator": "Iron Generator", + "block.irongenerators.dirt_generator": "Dirt Generator 9000!", + "block.moregenerators.diamond_generator": "Diamond Generator", + "block.irongenerators.netherrack_generator": "Netherrack Generator", + "block.irongenerators.invar_generator": "Invar Generator", + "block.moregenerators.lead_generator": "Lead Generator", + "item.moregenerators.generator_upgrade_diamondto_obsidian": "Generator Upgrade: �9Diamond �rto �8Obsidian", + "block.moregenerators.obsidian_generator": "Obsidian Generator", + "block.moregenerators.netherite_generator": "Netherite Generator", + "block.irongenerators.lead_generator": "Lead Generator", + "block.irongenerators.osmium_generator": "Osmium Generator", + "block.irongenerators.enderium_generator": "Enderium Generator", + "block.irongenerators.quartz_enriched_iron_generator": "Quartz Enriched Iron Generator", + "block.irongenerators.copper_generator": "Copper Generator", + "block.irongenerators.tin_generator": "Tin Generator", + "block.irongenerators.vibranium_generator": "Vibranium Generator", + "block.irongenerators.netherite_generator": "Netherite Generator", + "item.moregenerators.generator_upgrate_goldto_diamond": "Generator Upgrade: �6Gold �rto �9Diamond", + "block.irongenerators.unobtainium_generator": "Unobtainium Generator", + "block.moregenerators.tin_generator": "Tin Generator", + "block.irongenerators.gold_generator": "Gold Generator", + "block.moregenerators.stone_generator": "Stone Generator", + "block.irongenerators.steel_generator": "Steel Generator", + "block.irongenerators.platin_generator": "Platinum Generator", + "block.irongenerators.uranium_generator": "Uranium Generator", + "itemGroup.tabmore_generators": "Iron Generators", + "block.moregenerators.bronze_generator": "Bronze Generator", + "block.irongenerators.bronze_generator": "Bronze Generator", + "block.irongenerators.diamond_generator": "Diamond Generator", + "item.moregenerators.generator_upgrade_ironto_gold": "Generator Upgrade: Iron to �6Gold", + "block.moregenerators.refined_obsidian_generator": "Refined Obsidian Generator", + "subtitles.generator10s": "", + "block.irongenerators.allthemodium_generator": "Allthemodium Generator", + "item.moregenerators.generator_upgrade_stoneto_iron": "Generator Upgrade: �7Stone �rto Iron" +} \ No newline at end of file diff --git a/projects/1.18/assets/irongenerators/lang/zh_cn.json b/projects/1.18/assets/irongenerators/lang/zh_cn.json new file mode 100644 index 000000000000..3b6c78cde11d --- /dev/null +++ b/projects/1.18/assets/irongenerators/lang/zh_cn.json @@ -0,0 +1,57 @@ +{ + "item.moregenerators.netherstar_upgrade": "网络升级", + "block.moregenerators.iron_generator": "铁制发电机", + "block.irongenerators.refined_obsidian_generator": "强化黑曜石发电机", + "block.moregenerators.certus_quartz_generator": "赛特斯石英水晶发电机", + "item.moregenerators.emerald_upgrade": "Emerald升级", + "block.moregenerators.icon": "Icon", + "subtitles.generatorambient": "", + "block.irongenerators.obsidian_generator": "黑曜石发电机", + "item.moregenerators.generator_upgrade_obsidianto_netheride": "Generator Upgrade: �8Obsidian �rto �7Netherite", + "block.moregenerators.osmium_generator": "锇制发电机", + "block.moregenerators.gold_generator": "金制发电机", + "block.irongenerators.certus_quartz_generator": "赛特斯石英水晶发电机", + "block.moregenerators.copper_generator": "铜制发电机", + "block.moregenerators.steel_generator": "钢铁发电机", + "block.moregenerators.skystone_generator": "天空石发电机", + "item.moregenerators.diamond_upgrade": "钻石升级", + "block.irongenerators.infinity_generator": "永动机", + "item.moregenerators.flint_upgrade": "Flint升级", + "block.irongenerators.skystone_generator": "天空石发电机", + "block.irongenerators.signalum_generator": "信素发电机", + "block.irongenerators.stone_generator": "石头发电机", + "block.irongenerators.iron_generator": "铁制发电机", + "block.irongenerators.dirt_generator": "泥土发电机9000!", + "block.moregenerators.diamond_generator": "钻石发电机", + "block.irongenerators.netherrack_generator": "下界岩发电机", + "block.irongenerators.invar_generator": "殷钢发电机", + "block.moregenerators.lead_generator": "铅制发电机", + "item.moregenerators.generator_upgrade_diamondto_obsidian": "Generator Upgrade: �9Diamond �rto �8Obsidian", + "block.moregenerators.obsidian_generator": "黑曜石发电机", + "block.moregenerators.netherite_generator": "下界合金发电机", + "block.irongenerators.lead_generator": "铅制发电机", + "block.irongenerators.osmium_generator": "锇制发电机", + "block.irongenerators.enderium_generator": "末影发电机", + "block.irongenerators.quartz_enriched_iron_generator": "富石英铁发电机", + "block.irongenerators.copper_generator": "铜制发电机", + "block.irongenerators.tin_generator": "锡制发电机", + "block.irongenerators.vibranium_generator": "振金发电机", + "block.irongenerators.netherite_generator": "下界合金发电机", + "item.moregenerators.generator_upgrate_goldto_diamond": "Generator Upgrade: �6Gold �rto �9Diamond", + "block.irongenerators.unobtainium_generator": "难得素发电机", + "block.moregenerators.tin_generator": "锡制发电机", + "block.irongenerators.gold_generator": "金制发电机", + "block.moregenerators.stone_generator": "石头发电机", + "block.irongenerators.steel_generator": "钢铁发电机", + "block.irongenerators.platin_generator": "铂发电机", + "block.irongenerators.uranium_generator": "铀发电机", + "itemGroup.tabmore_generators": "铁制发电机", + "block.moregenerators.bronze_generator": "青铜发电机", + "block.irongenerators.bronze_generator": "青铜发电机", + "block.irongenerators.diamond_generator": "钻石发电机", + "item.moregenerators.generator_upgrade_ironto_gold": "Generator Upgrade: Iron to �6Gold", + "block.moregenerators.refined_obsidian_generator": "强化黑曜石发电机", + "subtitles.generator10s": "", + "block.irongenerators.allthemodium_generator": "ATM发电机", + "item.moregenerators.generator_upgrade_stoneto_iron": "Generator Upgrade: �7Stone �rto Iron" +} \ No newline at end of file From d66a5dad025b6c577e248445ac6c3e11f573bc9a Mon Sep 17 00:00:00 2001 From: "cfpa-bot[bot]" <101878103+cfpa-bot[bot]@users.noreply.github.com> Date: Thu, 20 Oct 2022 17:39:22 +0800 Subject: [PATCH 02/13] mv "projects/1.18/assets/irongenerators" "projects/1.18/assets/iron-generators/irongenerators" Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- .../assets/{ => iron-generators}/irongenerators/lang/en_us.json | 0 .../assets/{ => iron-generators}/irongenerators/lang/zh_cn.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename projects/1.18/assets/{ => iron-generators}/irongenerators/lang/en_us.json (100%) rename projects/1.18/assets/{ => iron-generators}/irongenerators/lang/zh_cn.json (100%) diff --git a/projects/1.18/assets/irongenerators/lang/en_us.json b/projects/1.18/assets/iron-generators/irongenerators/lang/en_us.json similarity index 100% rename from projects/1.18/assets/irongenerators/lang/en_us.json rename to projects/1.18/assets/iron-generators/irongenerators/lang/en_us.json diff --git a/projects/1.18/assets/irongenerators/lang/zh_cn.json b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json similarity index 100% rename from projects/1.18/assets/irongenerators/lang/zh_cn.json rename to projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json From 8389a16106dc5fd66f2e0c65e2629917aa1e1c0b Mon Sep 17 00:00:00 2001 From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com> Date: Tue, 25 Oct 2022 12:04:59 +0800 Subject: [PATCH 03/13] Apply suggestions from code review Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- .../irongenerators/lang/zh_cn.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json index 3b6c78cde11d..f27a678a56c7 100644 --- a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json +++ b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json @@ -1,10 +1,10 @@ { - "item.moregenerators.netherstar_upgrade": "网络升级", + "item.moregenerators.netherstar_upgrade": "下界之星升级", "block.moregenerators.iron_generator": "铁制发电机", "block.irongenerators.refined_obsidian_generator": "强化黑曜石发电机", "block.moregenerators.certus_quartz_generator": "赛特斯石英水晶发电机", - "item.moregenerators.emerald_upgrade": "Emerald升级", - "block.moregenerators.icon": "Icon", + "item.moregenerators.emerald_upgrade": "绿宝石升级", + "block.moregenerators.icon": "模组标志", "subtitles.generatorambient": "", "block.irongenerators.obsidian_generator": "黑曜石发电机", "item.moregenerators.generator_upgrade_obsidianto_netheride": "Generator Upgrade: �8Obsidian �rto �7Netherite", @@ -13,15 +13,15 @@ "block.irongenerators.certus_quartz_generator": "赛特斯石英水晶发电机", "block.moregenerators.copper_generator": "铜制发电机", "block.moregenerators.steel_generator": "钢铁发电机", - "block.moregenerators.skystone_generator": "天空石发电机", + "block.moregenerators.skystone_generator": "陨石发电机", "item.moregenerators.diamond_upgrade": "钻石升级", "block.irongenerators.infinity_generator": "永动机", - "item.moregenerators.flint_upgrade": "Flint升级", - "block.irongenerators.skystone_generator": "天空石发电机", + "item.moregenerators.flint_upgrade": "燧石升级", + "block.irongenerators.skystone_generator": "陨石发电机", "block.irongenerators.signalum_generator": "信素发电机", "block.irongenerators.stone_generator": "石头发电机", "block.irongenerators.iron_generator": "铁制发电机", - "block.irongenerators.dirt_generator": "泥土发电机9000!", + "block.irongenerators.dirt_generator": "泥土发电机9000！", "block.moregenerators.diamond_generator": "钻石发电机", "block.irongenerators.netherrack_generator": "下界岩发电机", "block.irongenerators.invar_generator": "殷钢发电机", @@ -45,7 +45,7 @@ "block.irongenerators.steel_generator": "钢铁发电机", "block.irongenerators.platin_generator": "铂发电机", "block.irongenerators.uranium_generator": "铀发电机", - "itemGroup.tabmore_generators": "铁制发电机", + "itemGroup.tabmore_generators": "铁发电机", "block.moregenerators.bronze_generator": "青铜发电机", "block.irongenerators.bronze_generator": "青铜发电机", "block.irongenerators.diamond_generator": "钻石发电机", From 10d3cf33bbd087fc1b873671d1463771e7e8d00f Mon Sep 17 00:00:00 2001 From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:16:29 +0800 Subject: [PATCH 04/13] Update projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- .../1.18/assets/iron-generators/irongenerators/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json index f27a678a56c7..f1f85758d275 100644 --- a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json +++ b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json @@ -7,7 +7,7 @@ "block.moregenerators.icon": "模组标志", "subtitles.generatorambient": "", "block.irongenerators.obsidian_generator": "黑曜石发电机", - "item.moregenerators.generator_upgrade_obsidianto_netheride": "Generator Upgrade: �8Obsidian �rto �7Netherite", + "item.moregenerators.generator_upgrade_obsidianto_netheride": "发电机升级：\u00A78黑曜石\u00A7r->\u00A77下界合金", "block.moregenerators.osmium_generator": "锇制发电机", "block.moregenerators.gold_generator": "金制发电机", "block.irongenerators.certus_quartz_generator": "赛特斯石英水晶发电机", From 8e3762445209d762bc947682e2773533d3429e2f Mon Sep 17 00:00:00 2001 From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:16:35 +0800 Subject: [PATCH 05/13] Update projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- .../1.18/assets/iron-generators/irongenerators/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json index f1f85758d275..c9306a952ba2 100644 --- a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json +++ b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json @@ -53,5 +53,5 @@ "block.moregenerators.refined_obsidian_generator": "强化黑曜石发电机", "subtitles.generator10s": "", "block.irongenerators.allthemodium_generator": "ATM发电机", - "item.moregenerators.generator_upgrade_stoneto_iron": "Generator Upgrade: �7Stone �rto Iron" + "item.moregenerators.generator_upgrade_stoneto_iron": "发电机升级：\u00A77石头\u00A7r->铁" } \ No newline at end of file From 8cf13571009d387dafe7c2c1069b79d2f7ea64d4 Mon Sep 17 00:00:00 2001 From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:16:45 +0800 Subject: [PATCH 06/13] Update projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json --- .../1.18/assets/iron-generators/irongenerators/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json index c9306a952ba2..d8f3329e477c 100644 --- a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json +++ b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json @@ -42,7 +42,7 @@ "block.moregenerators.tin_generator": "锡制发电机", "block.irongenerators.gold_generator": "金制发电机", "block.moregenerators.stone_generator": "石头发电机", - "block.irongenerators.steel_generator": "钢铁发电机", + "block.irongenerators.steel_generator": "钢制发电机", "block.irongenerators.platin_generator": "铂发电机", "block.irongenerators.uranium_generator": "铀发电机", "itemGroup.tabmore_generators": "铁发电机", From 3b1560adf3c12fe74018c9842b85e7b2a0b2a146 Mon Sep 17 00:00:00 2001 From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:16:55 +0800 Subject: [PATCH 07/13] Update projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json --- .../1.18/assets/iron-generators/irongenerators/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json index d8f3329e477c..e20978f1d3d2 100644 --- a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json +++ b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json @@ -12,7 +12,7 @@ "block.moregenerators.gold_generator": "金制发电机", "block.irongenerators.certus_quartz_generator": "赛特斯石英水晶发电机", "block.moregenerators.copper_generator": "铜制发电机", - "block.moregenerators.steel_generator": "钢铁发电机", + "block.moregenerators.steel_generator": "钢制发电机", "block.moregenerators.skystone_generator": "陨石发电机", "item.moregenerators.diamond_upgrade": "钻石升级", "block.irongenerators.infinity_generator": "永动机", From 7c27e79794e138cc229f5d521c585ab7cbb22902 Mon Sep 17 00:00:00 2001 From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:17:08 +0800 Subject: [PATCH 08/13] Update projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- .../1.18/assets/iron-generators/irongenerators/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json index e20978f1d3d2..72a222719eb8 100644 --- a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json +++ b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json @@ -49,7 +49,7 @@ "block.moregenerators.bronze_generator": "青铜发电机", "block.irongenerators.bronze_generator": "青铜发电机", "block.irongenerators.diamond_generator": "钻石发电机", - "item.moregenerators.generator_upgrade_ironto_gold": "Generator Upgrade: Iron to �6Gold", + "item.moregenerators.generator_upgrade_ironto_gold": "发电机升级：铁->\u00A76金", "block.moregenerators.refined_obsidian_generator": "强化黑曜石发电机", "subtitles.generator10s": "", "block.irongenerators.allthemodium_generator": "ATM发电机", From 8a8e51b1be39738d0e3166edba410b96442796c4 Mon Sep 17 00:00:00 2001 From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com> Date: Tue, 25 Oct 2022 16:17:33 +0800 Subject: [PATCH 09/13] Apply suggestions from code review Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- .../assets/iron-generators/irongenerators/lang/zh_cn.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json index 72a222719eb8..9d53eb1a2338 100644 --- a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json +++ b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json @@ -26,7 +26,7 @@ "block.irongenerators.netherrack_generator": "下界岩发电机", "block.irongenerators.invar_generator": "殷钢发电机", "block.moregenerators.lead_generator": "铅制发电机", - "item.moregenerators.generator_upgrade_diamondto_obsidian": "Generator Upgrade: �9Diamond �rto �8Obsidian", + "item.moregenerators.generator_upgrade_diamondto_obsidian": "发电机升级：\u00A79钻石\u00A7r->\u00A78黑曜石", "block.moregenerators.obsidian_generator": "黑曜石发电机", "block.moregenerators.netherite_generator": "下界合金发电机", "block.irongenerators.lead_generator": "铅制发电机", @@ -37,7 +37,7 @@ "block.irongenerators.tin_generator": "锡制发电机", "block.irongenerators.vibranium_generator": "振金发电机", "block.irongenerators.netherite_generator": "下界合金发电机", - "item.moregenerators.generator_upgrate_goldto_diamond": "Generator Upgrade: �6Gold �rto �9Diamond", + "item.moregenerators.generator_upgrate_goldto_diamond": "发电机升级：\u00A76金\u00A7r->\u00A79钻石", "block.irongenerators.unobtainium_generator": "难得素发电机", "block.moregenerators.tin_generator": "锡制发电机", "block.irongenerators.gold_generator": "金制发电机", From cbf229adcf4a89eb3379ace163c3d6f0b19b4877 Mon Sep 17 00:00:00 2001 From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com> Date: Fri, 11 Nov 2022 21:45:02 +0800 Subject: [PATCH 10/13] Update projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- .../1.18/assets/iron-generators/irongenerators/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json index 9d53eb1a2338..5408fb6b5994 100644 --- a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json +++ b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json @@ -10,7 +10,7 @@ "item.moregenerators.generator_upgrade_obsidianto_netheride": "发电机升级：\u00A78黑曜石\u00A7r->\u00A77下界合金", "block.moregenerators.osmium_generator": "锇制发电机", "block.moregenerators.gold_generator": "金制发电机", - "block.irongenerators.certus_quartz_generator": "赛特斯石英水晶发电机", + "block.irongenerators.certus_quartz_generator": "赛特斯石英发电机", "block.moregenerators.copper_generator": "铜制发电机", "block.moregenerators.steel_generator": "钢制发电机", "block.moregenerators.skystone_generator": "陨石发电机", From 29a4fe247d783873b890a0c0b08b4c65902feda8 Mon Sep 17 00:00:00 2001 From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com> Date: Fri, 11 Nov 2022 21:45:11 +0800 Subject: [PATCH 11/13] Update projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json Co-authored-by: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> --- .../1.18/assets/iron-generators/irongenerators/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json index 5408fb6b5994..9b913c350210 100644 --- a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json +++ b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json @@ -2,7 +2,7 @@ "item.moregenerators.netherstar_upgrade": "下界之星升级", "block.moregenerators.iron_generator": "铁制发电机", "block.irongenerators.refined_obsidian_generator": "强化黑曜石发电机", - "block.moregenerators.certus_quartz_generator": "赛特斯石英水晶发电机", + "block.moregenerators.certus_quartz_generator": "赛特斯石英发电机", "item.moregenerators.emerald_upgrade": "绿宝石升级", "block.moregenerators.icon": "模组标志", "subtitles.generatorambient": "", From 816fcd9686afe21fad43df451635f9340632d3f3 Mon Sep 17 00:00:00 2001 From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com> Date: Fri, 11 Nov 2022 21:46:31 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84`=E5=88=B6`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../irongenerators/lang/zh_cn.json | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json index 9b913c350210..63ce7552123f 100644 --- a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json +++ b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json @@ -1,6 +1,6 @@ { "item.moregenerators.netherstar_upgrade": "下界之星升级", - "block.moregenerators.iron_generator": "铁制发电机", + "block.moregenerators.iron_generator": "铁发电机", "block.irongenerators.refined_obsidian_generator": "强化黑曜石发电机", "block.moregenerators.certus_quartz_generator": "赛特斯石英发电机", "item.moregenerators.emerald_upgrade": "绿宝石升级", @@ -8,11 +8,11 @@ "subtitles.generatorambient": "", "block.irongenerators.obsidian_generator": "黑曜石发电机", "item.moregenerators.generator_upgrade_obsidianto_netheride": "发电机升级：\u00A78黑曜石\u00A7r->\u00A77下界合金", - "block.moregenerators.osmium_generator": "锇制发电机", - "block.moregenerators.gold_generator": "金制发电机", + "block.moregenerators.osmium_generator": "锇发电机", + "block.moregenerators.gold_generator": "金发电机", "block.irongenerators.certus_quartz_generator": "赛特斯石英发电机", - "block.moregenerators.copper_generator": "铜制发电机", - "block.moregenerators.steel_generator": "钢制发电机", + "block.moregenerators.copper_generator": "铜发电机", + "block.moregenerators.steel_generator": "钢发电机", "block.moregenerators.skystone_generator": "陨石发电机", "item.moregenerators.diamond_upgrade": "钻石升级", "block.irongenerators.infinity_generator": "永动机", @@ -25,24 +25,24 @@ "block.moregenerators.diamond_generator": "钻石发电机", "block.irongenerators.netherrack_generator": "下界岩发电机", "block.irongenerators.invar_generator": "殷钢发电机", - "block.moregenerators.lead_generator": "铅制发电机", + "block.moregenerators.lead_generator": "铅发电机", "item.moregenerators.generator_upgrade_diamondto_obsidian": "发电机升级：\u00A79钻石\u00A7r->\u00A78黑曜石", "block.moregenerators.obsidian_generator": "黑曜石发电机", "block.moregenerators.netherite_generator": "下界合金发电机", - "block.irongenerators.lead_generator": "铅制发电机", - "block.irongenerators.osmium_generator": "锇制发电机", + "block.irongenerators.lead_generator": "铅发电机", + "block.irongenerators.osmium_generator": "锇发电机", "block.irongenerators.enderium_generator": "末影发电机", "block.irongenerators.quartz_enriched_iron_generator": "富石英铁发电机", - "block.irongenerators.copper_generator": "铜制发电机", - "block.irongenerators.tin_generator": "锡制发电机", + "block.irongenerators.copper_generator": "铜发电机", + "block.irongenerators.tin_generator": "锡发电机", "block.irongenerators.vibranium_generator": "振金发电机", "block.irongenerators.netherite_generator": "下界合金发电机", "item.moregenerators.generator_upgrate_goldto_diamond": "发电机升级：\u00A76金\u00A7r->\u00A79钻石", "block.irongenerators.unobtainium_generator": "难得素发电机", - "block.moregenerators.tin_generator": "锡制发电机", - "block.irongenerators.gold_generator": "金制发电机", + "block.moregenerators.tin_generator": "锡发电机", + "block.irongenerators.gold_generator": "金发电机", "block.moregenerators.stone_generator": "石头发电机", - "block.irongenerators.steel_generator": "钢制发电机", + "block.irongenerators.steel_generator": "钢发电机", "block.irongenerators.platin_generator": "铂发电机", "block.irongenerators.uranium_generator": "铀发电机", "itemGroup.tabmore_generators": "铁发电机", @@ -54,4 +54,4 @@ "subtitles.generator10s": "", "block.irongenerators.allthemodium_generator": "ATM发电机", "item.moregenerators.generator_upgrade_stoneto_iron": "发电机升级：\u00A77石头\u00A7r->铁" -} \ No newline at end of file +} From 12f7964f097bcbd4e16a74be05505ac43e4908a2 Mon Sep 17 00:00:00 2001 From: Cactusstudent <97865546+Cactusstudent@users.noreply.github.com> Date: Mon, 14 Nov 2022 23:51:47 +0800 Subject: [PATCH 13/13] Update projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json --- .../1.18/assets/iron-generators/irongenerators/lang/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json index 63ce7552123f..0a8a38316ad9 100644 --- a/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json +++ b/projects/1.18/assets/iron-generators/irongenerators/lang/zh_cn.json @@ -20,7 +20,7 @@ "block.irongenerators.skystone_generator": "陨石发电机", "block.irongenerators.signalum_generator": "信素发电机", "block.irongenerators.stone_generator": "石头发电机", - "block.irongenerators.iron_generator": "铁制发电机", + "block.irongenerators.iron_generator": "铁发电机", "block.irongenerators.dirt_generator": "泥土发电机9000！", "block.moregenerators.diamond_generator": "钻石发电机", "block.irongenerators.netherrack_generator": "下界岩发电机",