From bdae90562c8957d3a719ee11bc00aaf1a043d9fb Mon Sep 17 00:00:00 2001 From: MysticKoko <132279944+MysticKoko@users.noreply.github.com> Date: Tue, 6 Feb 2024 03:41:13 +0200 Subject: [PATCH] Revert "Merge branch 'pr/5' into 1.20" This reverts commit 187ae3c9e48e4262caca1e401c99ed744c740cac, reversing changes made to 9a4baa3bc6c7a5ab05f4f32c32dc981d3e1c1597. --- .../assets/hybrid-aquatic/lang/zh_cn.json | 203 ------------------ 1 file changed, 203 deletions(-) delete mode 100644 src/generated/resources/assets/hybrid-aquatic/lang/zh_cn.json diff --git a/src/generated/resources/assets/hybrid-aquatic/lang/zh_cn.json b/src/generated/resources/assets/hybrid-aquatic/lang/zh_cn.json deleted file mode 100644 index 7f6439ff7..000000000 --- a/src/generated/resources/assets/hybrid-aquatic/lang/zh_cn.json +++ /dev/null @@ -1,203 +0,0 @@ -{ - "block.hybrid-aquatic.anemone": "海葵", - "block.hybrid-aquatic.basking_shark_plushie": "姥鲨毛绒玩具", - "block.hybrid-aquatic.bull_shark_plushie": "公牛鲨毛绒玩具", - "block.hybrid-aquatic.crate": "货箱", - "block.hybrid-aquatic.crate.description": "使用斧破坏", - "block.hybrid-aquatic.frilled_shark_plushie": "皱鳃鲨毛绒玩具", - "block.hybrid-aquatic.great_white_shark_plushie": "大白鲨毛绒玩具", - "block.hybrid-aquatic.hammerhead_shark_plushie": "双髻鲨毛绒玩具", - "block.hybrid-aquatic.message_in_a_bottle": "瓶中信", - "block.hybrid-aquatic.message_in_a_bottle.jar": "罐中信", - "block.hybrid-aquatic.message_in_a_bottle.longneck": "酒瓶中信", - "block.hybrid-aquatic.thresher_shark_plushie": "长尾鲨毛绒玩具", - "block.hybrid-aquatic.tiger_shark_plushie": "虎鲨毛绒玩具", - "block.hybrid-aquatic.whale_shark_plushie": "鲸鲨毛绒玩具", - "enchantment.hybrid-aquatic.live_catch": "活捉", - "entity.hybrid-aquatic.anglerfish": "𩽾𩾌鱼", - "entity.hybrid-aquatic.atolla_jellyfish": "礁环冠水母", - "entity.hybrid-aquatic.barrel_jellyfish": "桶水母", - "entity.hybrid-aquatic.barreleye": "后肛鱼", - "entity.hybrid-aquatic.basking_shark": "姥鲨", - "entity.hybrid-aquatic.betta": "五彩搏鱼", - "entity.hybrid-aquatic.blue_jellyfish": "蓝水母", - "entity.hybrid-aquatic.blue_spotted_stingray": "蓝斑条尾𫚉", - "entity.hybrid-aquatic.blue_tang": "拟刺尾鲷", - "entity.hybrid-aquatic.bull_shark": "公牛鲨", - "entity.hybrid-aquatic.cauliflower_jellyfish": "冠水母", - "entity.hybrid-aquatic.clownfish": "小丑鱼", - "entity.hybrid-aquatic.compass_jellyfish": "罗盘水母", - "entity.hybrid-aquatic.cowfish": "角箱鲀", - "entity.hybrid-aquatic.crab": "螃蟹", - "entity.hybrid-aquatic.cuttlefish": "乌贼", - "entity.hybrid-aquatic.discus": "七彩神仙鱼", - "entity.hybrid-aquatic.dragonfish": "龙鱼", - "entity.hybrid-aquatic.fiddler_crab": "招潮蟹", - "entity.hybrid-aquatic.firefly_squid": "萤火鱿", - "entity.hybrid-aquatic.flashlight_fish": "灯眼鱼", - "entity.hybrid-aquatic.fried_egg_jellyfish": "蛋黄水母", - "entity.hybrid-aquatic.frilled_shark": "皱鳃鲨", - "entity.hybrid-aquatic.giant_clam": "大砗磲", - "entity.hybrid-aquatic.glowing_sucker_octopus": "发光吸盘章鱼", - "entity.hybrid-aquatic.gourami": "丝足鲈", - "entity.hybrid-aquatic.great_white_shark": "大白鲨", - "entity.hybrid-aquatic.hammerhead_shark": "双髻鲨", - "entity.hybrid-aquatic.hermit_crab": "寄居蟹", - "entity.hybrid-aquatic.lionfish": "狮子鱼", - "entity.hybrid-aquatic.lions_mane_jellyfish": "狮鬃水母", - "entity.hybrid-aquatic.mahimahi": "鲯鳅", - "entity.hybrid-aquatic.mauve_stinger": "夜光游水母", - "entity.hybrid-aquatic.moon_jellyfish": "海月水母", - "entity.hybrid-aquatic.moray_eel": "海鳝", - "entity.hybrid-aquatic.nautilus": "鹦鹉螺", - "entity.hybrid-aquatic.needlefish": "颌针鱼", - "entity.hybrid-aquatic.nomura_jellyfish": "越前水母", - "entity.hybrid-aquatic.nudibranch": "海兔", - "entity.hybrid-aquatic.oarfish": "皇带鱼", - "entity.hybrid-aquatic.opah": "月亮鱼", - "entity.hybrid-aquatic.oscar": "图丽鱼", - "entity.hybrid-aquatic.piranha": "食人鱼", - "entity.hybrid-aquatic.ratfish": "银鲛", - "entity.hybrid-aquatic.rockfish": "石斑鱼", - "entity.hybrid-aquatic.sea_angel": "海天使", - "entity.hybrid-aquatic.sea_cucumber": "海参", - "entity.hybrid-aquatic.sea_nettle": "海刺水母", - "entity.hybrid-aquatic.sea_urchin": "海胆", - "entity.hybrid-aquatic.seahorse": "海马", - "entity.hybrid-aquatic.starfish": "海星", - "entity.hybrid-aquatic.stonefish": "毒鲉", - "entity.hybrid-aquatic.sunfish": "翻车鱼", - "entity.hybrid-aquatic.tetra": "灯鱼", - "entity.hybrid-aquatic.thresher_shark": "长尾鲨", - "entity.hybrid-aquatic.tiger_barb": "四带无须魮", - "entity.hybrid-aquatic.tiger_shark": "虎鲨", - "entity.hybrid-aquatic.toadfish": "豹蟾鱼", - "entity.hybrid-aquatic.triggerfish": "鳞鲀", - "entity.hybrid-aquatic.unicorn_fish": "短吻鼻鱼", - "entity.hybrid-aquatic.vampire_squid": "吸血乌贼", - "entity.hybrid-aquatic.whale_shark": "鲸鲨", - "entity.hybrid-aquatic.yellowfin_tuna": "黄鳍金枪鱼", - "entity.hybrid-aquatic.zebra_danio": "斑马鱼", - "hybrid-aquatic.sea_message.adventure": "「对于那位勇敢的探险家——发现这个瓶子的你，要知道，冒险就在每个角落等待着！」", - "hybrid-aquatic.sea_message.anglerfish": "「深海中的鬼灯鱼用发光的附属器吸引猎物，在黑暗的深渊中摇摆。勇闯未知吧，探索深海生物的迷人奥秘！」", - "hybrid-aquatic.sea_message.bold_muddy": "「天哪，我淹死了！」\n——大胆泥泥", - "hybrid-aquatic.sea_message.clownfish": "「小丑鱼和海葵之间有着独特的纽带。\n小丑鱼在海葵的触手中获得保护，同时为海葵提供食物。\n近距离目睹这种共生关系。」", - "hybrid-aquatic.sea_message.corals": "「珊瑚礁的绚丽色彩源自珊瑚虫和藻类之间的共生关系。\n潜入这个水下天堂，发现其中繁茂的生命之网！」", - "hybrid-aquatic.sea_message.depths": "「在这个世界的深处，隐藏着秘密。\n去揭示它们，解锁被遗忘文明的秘密……」", - "hybrid-aquatic.sea_message.distant": "「这是来自遥远之地的问候！\n希望这个消息能到达你的手里。\n希望你一切都好。」", - "hybrid-aquatic.sea_message.dream": "「亲爱的读者：\n你的存在证明了希望能在波涛中存活。\n继续梦想吧！」", - "hybrid-aquatic.sea_message.fortune": "「这个瓶子里寄托着对你的祝福，愿你找到幸运和繁荣之路。」", - "hybrid-aquatic.sea_message.polar_bear": "「前往北极，见证北极熊的坚韧！\n这些壮丽的生物完美适应地球上最恶劣的环境之一。\n我们应该多多了解它们独特的适应能力以及它们在气候变化中面临的挑战。」", - "hybrid-aquatic.sea_message.poyo": "「我讨厌乱扔垃圾的人。」\n——波波", - "hybrid-aquatic.sea_message.rick_roll": "「Never gonna give you up!\nNever gonna let you down!\nNever gonna run around and desert you!」\n——Rick Astley", - "hybrid-aquatic.sea_message.sea_cucumber": "「海参在维护珊瑚礁生态系统的健康中起着至关重要的作用。\n这些迷人的生物通过消化腐烂物质来循环养分，保持珊瑚礁的清洁。」", - "hybrid-aquatic.sea_message.seahorse": "「你知道海马是少数几个雄性会为幼崽分娩的物种之一吗？\n不妨亲眼目睹它们将幼小的孩子释放到海洋中这一独特现象。」", - "hybrid-aquatic.sea_message.sunshine": "「在这个瓶子里，我送给你阳光的温暖和和煦的吹风，让你的日子更加明亮。」", - "hybrid-aquatic.sea_message.the_creepers_code": "「苦力怕是由代码驱动的……」", - "hybrid-aquatic.sea_message.turtle": "「探索深渊，遇见迷人的海龟！\n这些温柔的生物可以穿越数千英里来回到它们的出生地。\n见证它们旅程的奇迹，欣赏它们的坚定不移。」", - "hybrid-aquatic.sea_message.vampire_squid": "「神秘的吸血鱿鱼，尽管名字中带有“吸血”二字，实际上并不吸血。\n它通过发光的显示和具有膜状吸盘的触手在深海中导航和捕捉猎物。\n在探索深渊时，惊叹于这个神秘生物。」", - "item.hybrid-aquatic.anglerfish": "𩽾𩾌鱼", - "item.hybrid-aquatic.anglerfish_spawn_egg": "𩽾𩾌鱼刷怪蛋", - "item.hybrid-aquatic.atolla_jellyfish_spawn_egg": "礁环冠水母刷怪蛋", - "item.hybrid-aquatic.barbed_hook": "鱼钩", - "item.hybrid-aquatic.barbed_hook.description": "提高在白天钓鱼的速度", - "item.hybrid-aquatic.barrel_jellyfish_spawn_egg": "桶水母刷怪蛋", - "item.hybrid-aquatic.barreleye": "后肛鱼", - "item.hybrid-aquatic.barreleye_spawn_egg": "后肛鱼刷怪蛋", - "item.hybrid-aquatic.basking_shark_spawn_egg": "姥鲨刷怪蛋", - "item.hybrid-aquatic.betta_spawn_egg": "五彩搏鱼刷怪蛋", - "item.hybrid-aquatic.black_pearl": "黑珍珠", - "item.hybrid-aquatic.blue_jellyfish_spawn_egg": "蓝水母刷怪蛋", - "item.hybrid-aquatic.blue_spotted_stingray": "蓝斑条尾𫚉", - "item.hybrid-aquatic.blue_spotted_stingray_spawn_egg": "蓝斑条尾𫚉刷怪蛋", - "item.hybrid-aquatic.blue_tang": "拟刺尾鲷", - "item.hybrid-aquatic.blue_tang_spawn_egg": "拟刺尾鲷刷怪蛋", - "item.hybrid-aquatic.bull_shark_spawn_egg": "公牛鲨刷怪蛋", - "item.hybrid-aquatic.cauliflower_jellyfish_spawn_egg": "冠水母刷怪蛋", - "item.hybrid-aquatic.clownfish": "小丑鱼", - "item.hybrid-aquatic.clownfish_spawn_egg": "小丑鱼刷怪蛋", - "item.hybrid-aquatic.compass_jellyfish_spawn_egg": "罗盘水母刷怪蛋", - "item.hybrid-aquatic.cooked_crab_meat": "熟蟹肉", - "item.hybrid-aquatic.cooked_fish_meat": "熟鱼肉", - "item.hybrid-aquatic.cooked_small_fish_meat": "熟小块鱼肉", - "item.hybrid-aquatic.cooked_tentacle": "熟八爪鱼须", - "item.hybrid-aquatic.cowfish": "角箱鲀", - "item.hybrid-aquatic.cowfish_spawn_egg": "角箱鲀刷怪蛋", - "item.hybrid-aquatic.crab_claw": "蟹钳", - "item.hybrid-aquatic.crab_meat": "生蟹肉", - "item.hybrid-aquatic.crab_spawn_egg": "螃蟹刷怪蛋", - "item.hybrid-aquatic.cuttlefish_spawn_egg": "乌贼刷怪蛋", - "item.hybrid-aquatic.discus_spawn_egg": "七彩神仙鱼刷怪蛋", - "item.hybrid-aquatic.dragonfish_spawn_egg": "龙鱼刷怪蛋", - "item.hybrid-aquatic.fiddler_crab_spawn_egg": "招潮蟹刷怪蛋", - "item.hybrid-aquatic.firefly_squid_spawn_egg": "萤火鱿刷怪蛋", - "item.hybrid-aquatic.fish_meat": "鱼肉", - "item.hybrid-aquatic.fishing_net": "渔网", - "item.hybrid-aquatic.fishing_net.description": "捕获生物：%s", - "item.hybrid-aquatic.flashlight_fish_spawn_egg": "灯眼鱼刷怪蛋", - "item.hybrid-aquatic.fried_egg_jellyfish_spawn_egg": "蛋黄水母刷怪蛋", - "item.hybrid-aquatic.frilled_shark_spawn_egg": "皱鳃鲨刷怪蛋", - "item.hybrid-aquatic.giant_clam_spawn_egg": "大砗磲刷怪蛋", - "item.hybrid-aquatic.glow_slime": "闪光黏液", - "item.hybrid-aquatic.glowing_hook": "荧光鱼钩", - "item.hybrid-aquatic.glowing_hook.description": "提高在黑夜钓鱼的速度", - "item.hybrid-aquatic.glowing_sucker_octopus_spawn_egg": "发光吸盘章鱼刷怪蛋", - "item.hybrid-aquatic.gourami_spawn_egg": "丝足鲈刷怪蛋", - "item.hybrid-aquatic.great_white_shark_spawn_egg": "大白鲨刷怪蛋", - "item.hybrid-aquatic.hammerhead_shark_spawn_egg": "双髻鲨刷怪蛋", - "item.hybrid-aquatic.hermit_crab_spawn_egg": "寄居蟹刷怪蛋", - "item.hybrid-aquatic.hook.description": "需要用副手持有", - "item.hybrid-aquatic.lionfish": "狮子鱼", - "item.hybrid-aquatic.lionfish_spawn_egg": "狮子鱼刷怪蛋", - "item.hybrid-aquatic.lions_mane_jellyfish_spawn_egg": "狮鬃水母刷怪蛋", - "item.hybrid-aquatic.magnetic_hook": "磁力鱼钩", - "item.hybrid-aquatic.magnetic_hook.description": "提高宝藏的出现率", - "item.hybrid-aquatic.mahi_mahi": "鲯鳅", - "item.hybrid-aquatic.mahimahi_spawn_egg": "鲯鳅刷怪蛋", - "item.hybrid-aquatic.mauve_stinger_spawn_egg": "夜光游水母刷怪蛋", - "item.hybrid-aquatic.moon_jellyfish_spawn_egg": "海月水母刷怪蛋", - "item.hybrid-aquatic.moray_eel": "海鳝", - "item.hybrid-aquatic.moray_eel_spawn_egg": "海鳝刷怪蛋", - "item.hybrid-aquatic.nautilus_spawn_egg": "鹦鹉螺刷怪蛋", - "item.hybrid-aquatic.needlefish": "颌针鱼", - "item.hybrid-aquatic.needlefish_spawn_egg": "颌针鱼刷怪蛋", - "item.hybrid-aquatic.nomura_jellyfish_spawn_egg": "越前水母刷怪蛋", - "item.hybrid-aquatic.nudibranch_spawn_egg": "海兔刷怪蛋", - "item.hybrid-aquatic.oarfish_spawn_egg": "皇带鱼刷怪蛋", - "item.hybrid-aquatic.opah": "月亮鱼", - "item.hybrid-aquatic.opah_spawn_egg": "月亮鱼刷怪蛋", - "item.hybrid-aquatic.oscar": "图丽鱼", - "item.hybrid-aquatic.oscar_spawn_egg": "图丽鱼刷怪蛋", - "item.hybrid-aquatic.pearl": "珍珠", - "item.hybrid-aquatic.piranha": "食人鱼", - "item.hybrid-aquatic.piranha_spawn_egg": "食人鱼刷怪蛋", - "item.hybrid-aquatic.ratfish_spawn_egg": "银鲛刷怪蛋", - "item.hybrid-aquatic.rockfish": "石斑鱼", - "item.hybrid-aquatic.rockfish_spawn_egg": "石斑鱼刷怪蛋", - "item.hybrid-aquatic.sea_angel_spawn_egg": "海天使刷怪蛋", - "item.hybrid-aquatic.sea_cucumber_spawn_egg": "海参刷怪蛋", - "item.hybrid-aquatic.sea_nettle_spawn_egg": "海刺水母刷怪蛋", - "item.hybrid-aquatic.sea_urchin_spawn_egg": "海胆刷怪蛋", - "item.hybrid-aquatic.seahorse_spawn_egg": "海马刷怪蛋", - "item.hybrid-aquatic.shark_tooth": "鲨鱼牙", - "item.hybrid-aquatic.small_fish_meat": "小块鱼肉", - "item.hybrid-aquatic.starfish_spawn_egg": "海星刷怪蛋", - "item.hybrid-aquatic.stonefish_spawn_egg": "毒鲉刷怪蛋", - "item.hybrid-aquatic.sunfish_spawn_egg": "翻车鱼刷怪蛋", - "item.hybrid-aquatic.tentacle": "生八爪鱼须", - "item.hybrid-aquatic.tetra_spawn_egg": "灯鱼刷怪蛋", - "item.hybrid-aquatic.thresher_shark_spawn_egg": "长尾鲨刷怪蛋", - "item.hybrid-aquatic.tiger_barb": "四带无须魮", - "item.hybrid-aquatic.tiger_barb_spawn_egg": "四带无须魮刷怪蛋", - "item.hybrid-aquatic.tiger_shark_spawn_egg": "虎鲨刷怪蛋", - "item.hybrid-aquatic.toadfish_spawn_egg": "豹蟾鱼刷怪蛋", - "item.hybrid-aquatic.triggerfish": "鳞鲀", - "item.hybrid-aquatic.triggerfish_spawn_egg": "鳞鲀刷怪蛋", - "item.hybrid-aquatic.unicorn_fish": "短吻鼻鱼", - "item.hybrid-aquatic.unicorn_fish_spawn_egg": "短吻鼻鱼刷怪蛋", - "item.hybrid-aquatic.vampire_squid_spawn_egg": "吸血乌贼刷怪蛋", - "item.hybrid-aquatic.whale_shark_spawn_egg": "鲸鲨刷怪蛋", - "item.hybrid-aquatic.yellowfin_tuna": "黄鳍金枪鱼", - "item.hybrid-aquatic.yellowfin_tuna_spawn_egg": "黄鳍金枪鱼刷怪蛋", - "item.hybrid-aquatic.zebra_danio_spawn_egg": "斑马鱼刷怪蛋" -}