From a0b328844c35f81cc295a4c6f6a6937b52ab7a5a Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Sun, 4 Sep 2022 11:23:47 +0800 Subject: [PATCH 1/6] Create OFL.txt --- projects/1.18/assets/i18n/font/OFL.txt | 93 ++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 projects/1.18/assets/i18n/font/OFL.txt diff --git a/projects/1.18/assets/i18n/font/OFL.txt b/projects/1.18/assets/i18n/font/OFL.txt new file mode 100644 index 000000000000..c9857270ccdd --- /dev/null +++ b/projects/1.18/assets/i18n/font/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2012 Google Inc. All Rights Reserved. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. From 86284fb7b49737c5c3ee3a153e935554dc7fb801 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Sun, 4 Sep 2022 11:25:14 +0800 Subject: [PATCH 2/6] Add files via upload --- projects/1.18/assets/i18n/font/muii18ncompat.ttf | Bin 0 -> 4236 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 projects/1.18/assets/i18n/font/muii18ncompat.ttf diff --git a/projects/1.18/assets/i18n/font/muii18ncompat.ttf b/projects/1.18/assets/i18n/font/muii18ncompat.ttf new file mode 100644 index 0000000000000000000000000000000000000000..2b907a3a3bd9e48f1d6e3697cf88c7fbe9b6af8b GIT binary patch literal 4236 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 literal 0 HcmV?d00001 From 35268c67cb9e12078d9321af71d694fae7c6bf99 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Mon, 5 Sep 2022 23:32:47 +0800 Subject: [PATCH 3/6] Delete projects/1.18/assets/i18n/font directory --- projects/1.18/assets/i18n/font/OFL.txt | 93 ------------------ .../1.18/assets/i18n/font/muii18ncompat.ttf | Bin 4236 -> 0 bytes 2 files changed, 93 deletions(-) delete mode 100644 projects/1.18/assets/i18n/font/OFL.txt delete mode 100644 projects/1.18/assets/i18n/font/muii18ncompat.ttf diff --git a/projects/1.18/assets/i18n/font/OFL.txt b/projects/1.18/assets/i18n/font/OFL.txt deleted file mode 100644 index c9857270ccdd..000000000000 --- a/projects/1.18/assets/i18n/font/OFL.txt +++ /dev/null @@ -1,93 +0,0 @@ -Copyright 2012 Google Inc. All Rights Reserved. - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/projects/1.18/assets/i18n/font/muii18ncompat.ttf b/projects/1.18/assets/i18n/font/muii18ncompat.ttf deleted file mode 100644 index 2b907a3a3bd9e48f1d6e3697cf88c7fbe9b6af8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4236 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 From 4d0ceaffab36f5fb3f90841de34ef7f05decd4e4 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Tue, 6 Sep 2022 00:34:12 +0800 Subject: [PATCH 4/6] Update zh_cn.json --- .../extlights/lang/zh_cn.json | 94 +++++++++++++++---- 1 file changed, 76 insertions(+), 18 deletions(-) diff --git a/projects/1.18/assets/extended-lights-mod/extlights/lang/zh_cn.json b/projects/1.18/assets/extended-lights-mod/extlights/lang/zh_cn.json index 2dd76c46b4d2..a9a7b6b2230a 100644 --- a/projects/1.18/assets/extended-lights-mod/extlights/lang/zh_cn.json +++ b/projects/1.18/assets/extended-lights-mod/extlights/lang/zh_cn.json @@ -1,19 +1,77 @@ { - "item.extlights.glowstone_bulb": "荧石灯泡", - "item.extlights.blaze_tube": "烈焰发光管", - "block.extlights.light_modern_ceil_square_black": "面板灯 - 黑色混凝土（吊顶）", - "block.extlights.light_modern_ceil_square_white": "面板灯 - 白色混凝土（吊顶）", - "block.extlights.light_modern_wall_square_black": "方形灯 - 黑色混凝土（壁挂）", - "block.extlights.light_modern_wall_square_white": "方形灯 - 白色混凝土（壁挂）", - "block.extlights.light_modern_wall_torch_black": "户外光炬 - 黑色混凝土（壁挂）", - "block.extlights.light_modern_wall_torch_white": "户外光炬 - 白色混凝土（壁挂）", - "block.extlights.light_modern_ceil_tube_black": "灯管 - 黑色混凝土（吊顶）", - "block.extlights.light_modern_ceil_tube_white": "灯管 - 白色混凝土（吊顶）", - "block.extlights.light_modern_ground_panel_black": "面板花园灯 - 黑色混凝土（贴地）", - "block.extlights.light_modern_ground_panel_white": "面板花园灯 - 白色混凝土（贴地）", - "block.extlights.light_modern_ground_torch_black": "面板花园光炬 - 黑色混凝土（贴地）", - "block.extlights.light_modern_ground_torch_white": "面板花园光炬 - 白色混凝土（贴地）", - "block.extlights.light_modern_ground_tower_black": "指示灯 - 黑色混凝土（贴地）", - "block.extlights.light_modern_ground_tower_white": "指示灯 - 白色混凝土（贴地）", - "itemGroup.extlights": "灯具拓展" -} \ No newline at end of file + "item.extlights.glowstone_bulb": "荧石灯泡", + "item.extlights.blaze_tube": "烈焰发光管", + + "block.extlights.light_candle_support_iron": "铁蜡烛支架", + "block.extlights.light_candle_socket_iron": "带铁底座的蜡烛", + "block.extlights.light_candle_socket_iron_black": "带铁底座的黑色蜡烛", + "block.extlights.light_candle_socket_iron_blue": "带铁底座的蓝色蜡烛", + "block.extlights.light_candle_socket_iron_brown": "带铁底座的棕色蜡烛", + "block.extlights.light_candle_socket_iron_cyan": "带铁底座的青色蜡烛", + "block.extlights.light_candle_socket_iron_gray": "带铁底座的灰色蜡烛", + "block.extlights.light_candle_socket_iron_green": "带铁底座的绿色蜡烛", + "block.extlights.light_candle_socket_iron_light_blue": "带铁底座的淡蓝色蜡烛", + "block.extlights.light_candle_socket_iron_light_gray": "带铁底座的淡灰色蜡烛", + "block.extlights.light_candle_socket_iron_lime": "带铁底座的黄绿色蜡烛", + "block.extlights.light_candle_socket_iron_magenta": "带铁底座的品红色蜡烛", + "block.extlights.light_candle_socket_iron_orange": "带铁底座的橙色蜡烛", + "block.extlights.light_candle_socket_iron_pink": "带铁底座的粉红色蜡烛", + "block.extlights.light_candle_socket_iron_purple": "带铁底座的紫色蜡烛", + "block.extlights.light_candle_socket_iron_red": "带铁底座的红色蜡烛", + "block.extlights.light_candle_socket_iron_white": "带铁底座的白色蜡烛", + "block.extlights.light_candle_socket_iron_yellow": "带铁底座的黄色蜡烛", + "block.extlights.light_candle_support_gold": "金蜡烛支架", + "block.extlights.light_candle_socket_gold": "带金底座的蜡烛", + "block.extlights.light_candle_socket_gold_black": "带金底座的黑色蜡烛", + "block.extlights.light_candle_socket_gold_blue": "带金底座的蓝色蜡烛", + "block.extlights.light_candle_socket_gold_brown": "带金底座的棕色蜡烛", + "block.extlights.light_candle_socket_gold_cyan": "带金底座的青色蜡烛", + "block.extlights.light_candle_socket_gold_gray": "带金底座的灰色蜡烛", + "block.extlights.light_candle_socket_gold_green": "带金底座的绿色蜡烛", + "block.extlights.light_candle_socket_gold_light_blue": "带金底座的淡蓝色蜡烛", + "block.extlights.light_candle_socket_gold_light_gray": "带金底座的淡灰色蜡烛", + "block.extlights.light_candle_socket_gold_lime": "带金底座的黄绿色蜡烛", + "block.extlights.light_candle_socket_gold_magenta": "带金底座的品红色蜡烛", + "block.extlights.light_candle_socket_gold_orange": "带金底座的橙色蜡烛", + "block.extlights.light_candle_socket_gold_pink": "带金底座的粉红色蜡烛", + "block.extlights.light_candle_socket_gold_purple": "带金底座的紫色蜡烛", + "block.extlights.light_candle_socket_gold_red": "带金底座的红色蜡烛", + "block.extlights.light_candle_socket_gold_white": "带金底座的白色蜡烛", + "block.extlights.light_candle_socket_gold_yellow": "带金底座的黄色蜡烛", + + "block.extlights.beam_thin_iron": "细铁支柱", + "block.extlights.beam_post_iron": "铁支柱", + "block.extlights.beam_thick_iron": "粗铁支柱", + "block.extlights.beam_thin_gold": "细金支柱", + "block.extlights.beam_post_gold": "金支柱", + "block.extlights.beam_thick_gold": "粗金支柱", + + "block.extlights.light_lamp_bulb_iron": "球泡铁灯", + "block.extlights.light_lamp_bulb_gold": "球泡金灯", + + "block.extlights.light_lantern_bulb_iron": "球泡铁灯笼", + "block.extlights.light_lantern_fancy_iron": "华丽铁灯笼", + "block.extlights.light_lantern_caged_iron": "笼式铁灯笼", + "block.extlights.light_lantern_square_iron": "方形铁灯笼", + "block.extlights.light_lantern_bulb_gold": "球泡金灯笼", + "block.extlights.light_lantern_fancy_gold": "华丽金灯笼", + "block.extlights.light_lantern_caged_gold": "笼式金灯笼", + "block.extlights.light_lantern_square_gold": "方形金灯笼", + + "block.extlights.light_modern_ceil_square_black": "面板灯 - 黑色混凝土（吊顶）", + "block.extlights.light_modern_ceil_square_white": "面板灯 - 白色混凝土（吊顶）", + "block.extlights.light_modern_wall_square_black": "方形灯 - 黑色混凝土（壁挂）", + "block.extlights.light_modern_wall_square_white": "方形灯 - 白色混凝土（壁挂）", + "block.extlights.light_modern_wall_torch_black": "户外光炬 - 黑色混凝土（壁挂）", + "block.extlights.light_modern_wall_torch_white": "户外光炬 - 白色混凝土（壁挂）", + "block.extlights.light_modern_ceil_tube_black": "灯管 - 黑色混凝土（吊顶）", + "block.extlights.light_modern_ceil_tube_white": "灯管 - 白色混凝土（吊顶）", + "block.extlights.light_modern_ground_panel_black": "面板花园灯 - 黑色混凝土（贴地）", + "block.extlights.light_modern_ground_panel_white": "面板花园灯 - 白色混凝土（贴地）", + "block.extlights.light_modern_ground_torch_black": "面板花园光炬 - 黑色混凝土（贴地）", + "block.extlights.light_modern_ground_torch_white": "面板花园光炬 - 白色混凝土（贴地）", + "block.extlights.light_modern_ground_tower_black": "指示灯 - 黑色混凝土（贴地）", + "block.extlights.light_modern_ground_tower_white": "指示灯 - 白色混凝土（贴地）", + + "itemGroup.extlights": "灯具拓展" +} From 5a51fb9208472e2c3b5881a5a5e341967f1090a0 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Tue, 6 Sep 2022 00:34:59 +0800 Subject: [PATCH 5/6] Update zh_cn.json --- .../extlights/lang/zh_cn.json | 148 +++++++++--------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/projects/1.18/assets/extended-lights-mod/extlights/lang/zh_cn.json b/projects/1.18/assets/extended-lights-mod/extlights/lang/zh_cn.json index a9a7b6b2230a..a9d8033954ca 100644 --- a/projects/1.18/assets/extended-lights-mod/extlights/lang/zh_cn.json +++ b/projects/1.18/assets/extended-lights-mod/extlights/lang/zh_cn.json @@ -1,77 +1,77 @@ { - "item.extlights.glowstone_bulb": "荧石灯泡", - "item.extlights.blaze_tube": "烈焰发光管", - - "block.extlights.light_candle_support_iron": "铁蜡烛支架", - "block.extlights.light_candle_socket_iron": "带铁底座的蜡烛", - "block.extlights.light_candle_socket_iron_black": "带铁底座的黑色蜡烛", - "block.extlights.light_candle_socket_iron_blue": "带铁底座的蓝色蜡烛", - "block.extlights.light_candle_socket_iron_brown": "带铁底座的棕色蜡烛", - "block.extlights.light_candle_socket_iron_cyan": "带铁底座的青色蜡烛", - "block.extlights.light_candle_socket_iron_gray": "带铁底座的灰色蜡烛", - "block.extlights.light_candle_socket_iron_green": "带铁底座的绿色蜡烛", - "block.extlights.light_candle_socket_iron_light_blue": "带铁底座的淡蓝色蜡烛", - "block.extlights.light_candle_socket_iron_light_gray": "带铁底座的淡灰色蜡烛", - "block.extlights.light_candle_socket_iron_lime": "带铁底座的黄绿色蜡烛", - "block.extlights.light_candle_socket_iron_magenta": "带铁底座的品红色蜡烛", - "block.extlights.light_candle_socket_iron_orange": "带铁底座的橙色蜡烛", - "block.extlights.light_candle_socket_iron_pink": "带铁底座的粉红色蜡烛", - "block.extlights.light_candle_socket_iron_purple": "带铁底座的紫色蜡烛", - "block.extlights.light_candle_socket_iron_red": "带铁底座的红色蜡烛", - "block.extlights.light_candle_socket_iron_white": "带铁底座的白色蜡烛", - "block.extlights.light_candle_socket_iron_yellow": "带铁底座的黄色蜡烛", - "block.extlights.light_candle_support_gold": "金蜡烛支架", - "block.extlights.light_candle_socket_gold": "带金底座的蜡烛", - "block.extlights.light_candle_socket_gold_black": "带金底座的黑色蜡烛", - "block.extlights.light_candle_socket_gold_blue": "带金底座的蓝色蜡烛", - "block.extlights.light_candle_socket_gold_brown": "带金底座的棕色蜡烛", - "block.extlights.light_candle_socket_gold_cyan": "带金底座的青色蜡烛", - "block.extlights.light_candle_socket_gold_gray": "带金底座的灰色蜡烛", - "block.extlights.light_candle_socket_gold_green": "带金底座的绿色蜡烛", - "block.extlights.light_candle_socket_gold_light_blue": "带金底座的淡蓝色蜡烛", - "block.extlights.light_candle_socket_gold_light_gray": "带金底座的淡灰色蜡烛", - "block.extlights.light_candle_socket_gold_lime": "带金底座的黄绿色蜡烛", - "block.extlights.light_candle_socket_gold_magenta": "带金底座的品红色蜡烛", - "block.extlights.light_candle_socket_gold_orange": "带金底座的橙色蜡烛", - "block.extlights.light_candle_socket_gold_pink": "带金底座的粉红色蜡烛", - "block.extlights.light_candle_socket_gold_purple": "带金底座的紫色蜡烛", - "block.extlights.light_candle_socket_gold_red": "带金底座的红色蜡烛", - "block.extlights.light_candle_socket_gold_white": "带金底座的白色蜡烛", - "block.extlights.light_candle_socket_gold_yellow": "带金底座的黄色蜡烛", - - "block.extlights.beam_thin_iron": "细铁支柱", - "block.extlights.beam_post_iron": "铁支柱", - "block.extlights.beam_thick_iron": "粗铁支柱", - "block.extlights.beam_thin_gold": "细金支柱", - "block.extlights.beam_post_gold": "金支柱", - "block.extlights.beam_thick_gold": "粗金支柱", - - "block.extlights.light_lamp_bulb_iron": "球泡铁灯", - "block.extlights.light_lamp_bulb_gold": "球泡金灯", - - "block.extlights.light_lantern_bulb_iron": "球泡铁灯笼", - "block.extlights.light_lantern_fancy_iron": "华丽铁灯笼", - "block.extlights.light_lantern_caged_iron": "笼式铁灯笼", - "block.extlights.light_lantern_square_iron": "方形铁灯笼", - "block.extlights.light_lantern_bulb_gold": "球泡金灯笼", - "block.extlights.light_lantern_fancy_gold": "华丽金灯笼", - "block.extlights.light_lantern_caged_gold": "笼式金灯笼", - "block.extlights.light_lantern_square_gold": "方形金灯笼", - - "block.extlights.light_modern_ceil_square_black": "面板灯 - 黑色混凝土（吊顶）", - "block.extlights.light_modern_ceil_square_white": "面板灯 - 白色混凝土（吊顶）", - "block.extlights.light_modern_wall_square_black": "方形灯 - 黑色混凝土（壁挂）", - "block.extlights.light_modern_wall_square_white": "方形灯 - 白色混凝土（壁挂）", - "block.extlights.light_modern_wall_torch_black": "户外光炬 - 黑色混凝土（壁挂）", - "block.extlights.light_modern_wall_torch_white": "户外光炬 - 白色混凝土（壁挂）", - "block.extlights.light_modern_ceil_tube_black": "灯管 - 黑色混凝土（吊顶）", - "block.extlights.light_modern_ceil_tube_white": "灯管 - 白色混凝土（吊顶）", - "block.extlights.light_modern_ground_panel_black": "面板花园灯 - 黑色混凝土（贴地）", - "block.extlights.light_modern_ground_panel_white": "面板花园灯 - 白色混凝土（贴地）", - "block.extlights.light_modern_ground_torch_black": "面板花园光炬 - 黑色混凝土（贴地）", - "block.extlights.light_modern_ground_torch_white": "面板花园光炬 - 白色混凝土（贴地）", - "block.extlights.light_modern_ground_tower_black": "指示灯 - 黑色混凝土（贴地）", - "block.extlights.light_modern_ground_tower_white": "指示灯 - 白色混凝土（贴地）", + "item.extlights.glowstone_bulb": "荧石灯泡", + "item.extlights.blaze_tube": "烈焰发光管", + + "block.extlights.light_candle_support_iron": "铁蜡烛支架", + "block.extlights.light_candle_socket_iron": "带铁底座的蜡烛", + "block.extlights.light_candle_socket_iron_black": "带铁底座的黑色蜡烛", + "block.extlights.light_candle_socket_iron_blue": "带铁底座的蓝色蜡烛", + "block.extlights.light_candle_socket_iron_brown": "带铁底座的棕色蜡烛", + "block.extlights.light_candle_socket_iron_cyan": "带铁底座的青色蜡烛", + "block.extlights.light_candle_socket_iron_gray": "带铁底座的灰色蜡烛", + "block.extlights.light_candle_socket_iron_green": "带铁底座的绿色蜡烛", + "block.extlights.light_candle_socket_iron_light_blue": "带铁底座的淡蓝色蜡烛", + "block.extlights.light_candle_socket_iron_light_gray": "带铁底座的淡灰色蜡烛", + "block.extlights.light_candle_socket_iron_lime": "带铁底座的黄绿色蜡烛", + "block.extlights.light_candle_socket_iron_magenta": "带铁底座的品红色蜡烛", + "block.extlights.light_candle_socket_iron_orange": "带铁底座的橙色蜡烛", + "block.extlights.light_candle_socket_iron_pink": "带铁底座的粉红色蜡烛", + "block.extlights.light_candle_socket_iron_purple": "带铁底座的紫色蜡烛", + "block.extlights.light_candle_socket_iron_red": "带铁底座的红色蜡烛", + "block.extlights.light_candle_socket_iron_white": "带铁底座的白色蜡烛", + "block.extlights.light_candle_socket_iron_yellow": "带铁底座的黄色蜡烛", + "block.extlights.light_candle_support_gold": "金蜡烛支架", + "block.extlights.light_candle_socket_gold": "带金底座的蜡烛", + "block.extlights.light_candle_socket_gold_black": "带金底座的黑色蜡烛", + "block.extlights.light_candle_socket_gold_blue": "带金底座的蓝色蜡烛", + "block.extlights.light_candle_socket_gold_brown": "带金底座的棕色蜡烛", + "block.extlights.light_candle_socket_gold_cyan": "带金底座的青色蜡烛", + "block.extlights.light_candle_socket_gold_gray": "带金底座的灰色蜡烛", + "block.extlights.light_candle_socket_gold_green": "带金底座的绿色蜡烛", + "block.extlights.light_candle_socket_gold_light_blue": "带金底座的淡蓝色蜡烛", + "block.extlights.light_candle_socket_gold_light_gray": "带金底座的淡灰色蜡烛", + "block.extlights.light_candle_socket_gold_lime": "带金底座的黄绿色蜡烛", + "block.extlights.light_candle_socket_gold_magenta": "带金底座的品红色蜡烛", + "block.extlights.light_candle_socket_gold_orange": "带金底座的橙色蜡烛", + "block.extlights.light_candle_socket_gold_pink": "带金底座的粉红色蜡烛", + "block.extlights.light_candle_socket_gold_purple": "带金底座的紫色蜡烛", + "block.extlights.light_candle_socket_gold_red": "带金底座的红色蜡烛", + "block.extlights.light_candle_socket_gold_white": "带金底座的白色蜡烛", + "block.extlights.light_candle_socket_gold_yellow": "带金底座的黄色蜡烛", + + "block.extlights.beam_thin_iron": "细铁支柱", + "block.extlights.beam_post_iron": "铁支柱", + "block.extlights.beam_thick_iron": "粗铁支柱", + "block.extlights.beam_thin_gold": "细金支柱", + "block.extlights.beam_post_gold": "金支柱", + "block.extlights.beam_thick_gold": "粗金支柱", + + "block.extlights.light_lamp_bulb_iron": "球泡铁灯", + "block.extlights.light_lamp_bulb_gold": "球泡金灯", + + "block.extlights.light_lantern_bulb_iron": "球泡铁灯笼", + "block.extlights.light_lantern_fancy_iron": "华丽铁灯笼", + "block.extlights.light_lantern_caged_iron": "笼式铁灯笼", + "block.extlights.light_lantern_square_iron": "方形铁灯笼", + "block.extlights.light_lantern_bulb_gold": "球泡金灯笼", + "block.extlights.light_lantern_fancy_gold": "华丽金灯笼", + "block.extlights.light_lantern_caged_gold": "笼式金灯笼", + "block.extlights.light_lantern_square_gold": "方形金灯笼", + + "block.extlights.light_modern_ceil_square_black": "面板灯 - 黑色混凝土（吊顶）", + "block.extlights.light_modern_ceil_square_white": "面板灯 - 白色混凝土（吊顶）", + "block.extlights.light_modern_wall_square_black": "方形灯 - 黑色混凝土（壁挂）", + "block.extlights.light_modern_wall_square_white": "方形灯 - 白色混凝土（壁挂）", + "block.extlights.light_modern_wall_torch_black": "户外光炬 - 黑色混凝土（壁挂）", + "block.extlights.light_modern_wall_torch_white": "户外光炬 - 白色混凝土（壁挂）", + "block.extlights.light_modern_ceil_tube_black": "灯管 - 黑色混凝土（吊顶）", + "block.extlights.light_modern_ceil_tube_white": "灯管 - 白色混凝土（吊顶）", + "block.extlights.light_modern_ground_panel_black": "面板花园灯 - 黑色混凝土（贴地）", + "block.extlights.light_modern_ground_panel_white": "面板花园灯 - 白色混凝土（贴地）", + "block.extlights.light_modern_ground_torch_black": "面板花园光炬 - 黑色混凝土（贴地）", + "block.extlights.light_modern_ground_torch_white": "面板花园光炬 - 白色混凝土（贴地）", + "block.extlights.light_modern_ground_tower_black": "指示灯 - 黑色混凝土（贴地）", + "block.extlights.light_modern_ground_tower_white": "指示灯 - 白色混凝土（贴地）", - "itemGroup.extlights": "灯具拓展" + "itemGroup.extlights": "灯具拓展" } From 7a93fc034da90c1fdfcf5a9a31fc29378a7090a9 Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Tue, 6 Sep 2022 00:59:39 +0800 Subject: [PATCH 6/6] Update zh_cn.json --- projects/1.18/assets/ecologics/ecologics/lang/zh_cn.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.18/assets/ecologics/ecologics/lang/zh_cn.json b/projects/1.18/assets/ecologics/ecologics/lang/zh_cn.json index bcd258134646..0bea5c985c9e 100644 --- a/projects/1.18/assets/ecologics/ecologics/lang/zh_cn.json +++ b/projects/1.18/assets/ecologics/ecologics/lang/zh_cn.json @@ -117,7 +117,7 @@ "item.ecologics.penguin_spawn_egg": "企鹅刷怪蛋", "item.ecologics.squirrel_spawn_egg": "松鼠刷怪蛋", "item.ecologics.coconut_slice": "椰子片", - "item.ecologics.coconut_husk": "椰子苗", + "item.ecologics.coconut_husk": "椰壳", "item.ecologics.crab_claw": "蟹钳", "item.ecologics.crab_meat": "蟹肉", "item.ecologics.tropical_stew": "热带炖菜", @@ -159,4 +159,4 @@ "text.autoconfig.ecologics.option.plains.generateWalnutTrees": "生成核桃树", "text.autoconfig.ecologics.option.lushCaves.replaceAzaleaTree": "将原版杜鹃树的橡木原木替换为杜鹃原木", "text.autoconfig.ecologics.option.lushCaves.generateSurfaceMoss": "生成表面苔藓" -} \ No newline at end of file +}