diff --git a/src/main/resources/assets/andromeda/lang/zh_cn.json b/src/main/resources/assets/andromeda/lang/zh_cn.json index 00db253e..1c11e525 100644 --- a/src/main/resources/assets/andromeda/lang/zh_cn.json +++ b/src/main/resources/assets/andromeda/lang/zh_cn.json @@ -11,6 +11,7 @@ "tooltip.andromeda.compass.recovery": "距死亡点：%s格", "tooltip.andromeda.frameitem": "展示框中的物品", "tooltip.andromeda.throwable_item": "可投掷", + "tooltip.andromeda.magnet.level": "等级 %s/5", "death.attack.andromeda_agony": "%s死于痛苦", "death.attack.andromeda_bricked": "%1$s被%2$s用砖块砸晕了", "andromeda.container.guarded": "这个箱子被守护着，无法打开！", @@ -19,7 +20,6 @@ "andromeda.config.option_manager.reason.andromeda.module_conflict": "启用了冲突的特性！", "andromeda.config.option_manager.reason.andromeda.iceberg": "与低于1.1.13的Iceberg前置冲突。", - "andromeda.config.option_manager.reason.andromeda.spawner_enabled": "需启用刷怪笼矿车以使用！", "andromeda.config.option_manager.reason.andromeda.side_only_enabled": "此特性因启用了“客户端模式”被禁用！", "andromeda.config.tooltip.environment.client": "仅客户端特性", @@ -33,8 +33,11 @@ "block.andromeda.incubator": "孵蛋器", "item.andromeda.infinite_totem": "创生图腾", + "item.andromeda.lockpick": "开锁器", + "item.andromeda.magnet": "磁铁", + "item.andromeda.spawner_minecart": "载刷怪笼的矿车", "item.andromeda.anvil_minecart": "载铁砧的矿车", "item.andromeda.note_block_minecart": "载音符盒的矿车", @@ -107,15 +110,13 @@ "config.andromeda.category.world": "世界", "config.andromeda.world.auto_planting": "自种植作物", - "config.andromeda.world.auto_planting.@Tooltip[0]": "作物将尝试在一段时间后种植自身。", - "config.andromeda.world.auto_planting.@Tooltip[1]": "灵感取自于HephaestusDev的TinyTweaks", + "config.andromeda.world.auto_planting.@Tooltip": "作物将尝试在一段时间后种植自身。\n灵感取自于HephaestusDev的TinyTweaks", "config.andromeda.world.auto_planting.option.blacklistMode": "黑名单模式", "config.andromeda.world.auto_planting.option.blacklistMode.@Tooltip": "下面的列表将作为黑名单", "config.andromeda.world.auto_planting.option.idList": "物品列表", "config.andromeda.world.auto_planting.option.idList.@Tooltip": "阻止/允许下列物品自种植。", "config.andromeda.world.falling_beenests": "蜂巢是否能够自然掉落？", - "config.andromeda.world.falling_beenests.@Tooltip[0]": "正如此项目字面所言，它能够让蜂巢在一段时间后自然掉落，", - "config.andromeda.world.falling_beenests.@Tooltip[1]": "此外，你还能通过向蜂巢射箭来使它们掉落", + "config.andromeda.world.falling_beenests.@Tooltip": "正如此项目字面所言，它能够让蜂巢在一段时间后自然掉落，\n此外，你还能通过向蜂巢射箭来使它们掉落", "config.andromeda.world.crop_temperature": "基于温度的作物生长速度", "config.andromeda.world.crop_temperature.@Tooltip": "在这里给这个项目添加简介吧~", "config.andromeda.world.quick_fire": "更快的火焰蔓延", @@ -125,29 +126,26 @@ "config.andromeda.blocks.guarded_loot": "宝藏守卫", "config.andromeda.blocks.guarded_loot.@Tooltip": "设定距离内有怪物时，阻止玩家打开未生成战利品的箱子。", "config.andromeda.blocks.guarded_loot.option.range": "检测距离", + "config.andromeda.blocks.guarded_loot.option.allowLockPicking": "开锁器解除守卫", + "config.andromeda.blocks.guarded_loot.option.allowLockPicking.@Tooltip": "前提是启用开锁器！", "config.andromeda.blocks.falling_propagule": "胎生苗掉落", "config.andromeda.blocks.falling_propagule.@Tooltip": "成熟后，悬挂的红树胎生苗会掉下来。", "config.andromeda.blocks.cactus_bottle_filling": "仙人掌取水", - "config.andromeda.blocks.cactus_bottle_filling.@Tooltip[0]": "手持空瓶对仙人掌右键来取出其中的水。", - "config.andromeda.blocks.cactus_bottle_filling.@Tooltip[1]": "顶部的仙人掌在被取三次水后会被破坏，掉落枯萎的灌木。", + "config.andromeda.blocks.cactus_bottle_filling.@Tooltip": "手持空瓶对仙人掌右键来取出其中的水。\n顶部的仙人掌在被取三次水后会被破坏，掉落枯萎的灌木。", "config.andromeda.blocks.incubator": "孵蛋器设置", - "config.andromeda.blocks.incubator.@Tooltip[0]": "一些关于孵蛋器的设置 :)", - "config.andromeda.blocks.incubator.@Tooltip[1]": "部分选项改动需要游戏重启，部分则不需要", - "config.andromeda.blocks.incubator.@Tooltip[2]": "我自己也不知道为啥", + "config.andromeda.blocks.incubator.@Tooltip": "一些关于孵蛋器的设置 :)\n部分选项改动需要游戏重启，部分则不需要\n我自己也不知道为啥", "config.andromeda.blocks.incubator.option.randomness": "孵化时间随机化", "config.andromeda.blocks.incubator.option.randomness.@Tooltip": "使得孵蛋器的孵蛋时间长度更加随机", "config.andromeda.blocks.better_fletching_table": "实用的制箭台", "config.andromeda.blocks.better_fletching_table.@Tooltip": "赋予制箭台功能界面，使你能够通过强化弓弦提高射击准度", "config.andromeda.blocks.bed.unsafe": "床无处不炸", - "config.andromeda.blocks.bed.unsafe.@Tooltip[0]": "让床无视维度，一睡就炸", - "config.andromeda.blocks.bed.unsafe.@Tooltip[1]": "与”安眠之榻“不兼容！", + "config.andromeda.blocks.bed.unsafe.@Tooltip": "让床无视维度，一睡就炸\n与”安眠之榻“不兼容！", "config.andromeda.blocks.bed.power": "床的爆炸强度", "config.andromeda.blocks.bed.power.@Tooltip": "启用下列设置项。", "config.andromeda.blocks.bed.power.option.power": "爆炸强度", "config.andromeda.blocks.bed.power.option.power.@Tooltip": "可配置的床的爆炸强度，默认为5.0", "config.andromeda.blocks.bed.safe": "安眠之榻", - "config.andromeda.blocks.bed.safe.@Tooltip[0]": "使得床不会爆炸。", - "config.andromeda.blocks.bed.safe.@Tooltip[1]": "与“床无处不炸”不兼容！", + "config.andromeda.blocks.bed.safe.@Tooltip": "使得床不会爆炸。\n与“床无处不炸”不兼容！", "config.andromeda.blocks.campfire_effects": "营火效果", "config.andromeda.blocks.campfire_effects.@Tooltip": "使营火给予范围内生物药水效果", "config.andromeda.blocks.campfire_effects.option.affectsPassive": "治愈友好生物", @@ -156,14 +154,11 @@ "config.andromeda.blocks.campfire_effects.option.effectsRange": "营火生效范围", "config.andromeda.blocks.campfire_effects.option.effectsRange.@Tooltip": "设置营火给予药水效果的范围", "config.andromeda.blocks.leaf_slowdown": "树叶缓速", - "config.andromeda.blocks.leaf_slowdown.@Tooltip[0]": "降低叶面上实体的移动速度。", - "config.andromeda.blocks.leaf_slowdown.@Tooltip[1]": "这可以防止玩家在树叶上不断跑酷，无视地表上的有趣东西。", + "config.andromeda.blocks.leaf_slowdown.@Tooltip": "降低叶面上实体的移动速度。\n这可以防止玩家在树叶上不断跑酷，无视地表上的有趣东西。", "config.andromeda.category.entities": "实体", "config.andromeda.entities.zombie.clean_pickup": "僵尸不再拾起垃圾", - "config.andromeda.entities.zombie.clean_pickup.@Tooltip[0]": "防止僵尸捡起没用的物品。", - "config.andromeda.entities.zombie.clean_pickup.@Tooltip[1]": "“有用”的物品包括：工具，护甲以及可投掷物品（若有启用这个特性）", - "config.andromeda.entities.zombie.clean_pickup.@Tooltip[2]": "还有“andromeda:zombies_pickup”标签。", + "config.andromeda.entities.zombie.clean_pickup.@Tooltip": "防止僵尸捡起没用的物品。\n“有用”的物品包括：工具，护甲以及可投掷物品（若有启用这个特性）\n还有“andromeda:zombies_pickup”标签。", "config.andromeda.entities.zombie.all_pick_up": "所有僵尸均可拾起物品", "config.andromeda.entities.zombie.all_pick_up.@Tooltip": "无视难度设置，允许所有僵尸拾起物品。", "config.andromeda.entities.snowball_tweaks": "雪球调整", @@ -188,22 +183,17 @@ "config.andromeda.entities.slimes.option.slowness": "黏糊糊史莱姆", "config.andromeda.entities.slimes.option.slowness.@Tooltip": "史莱姆减速接触的目标。", "config.andromeda.entities.bee_flower_duplication": "蜜蜂催生花朵", - "config.andromeda.entities.bee_flower_duplication.@Tooltip[0]": "被蜜蜂授粉的花朵概率获得催生效果。", - "config.andromeda.entities.bee_flower_duplication.@Tooltip[1]": "这个效果并不是每次授粉都会出现的，它内置有3-6分钟的冷却时间。", + "config.andromeda.entities.bee_flower_duplication.@Tooltip": "被蜜蜂授粉的花朵概率获得催生效果。\n这个效果并不是每次授粉都会出现的，它内置有3-6分钟的冷却时间。", "config.andromeda.entities.bee_flower_duplication.option.tallFlowers": "蜜蜂催生花丛", "config.andromeda.entities.bee_flower_duplication.option.tallFlowers.@Tooltip": "允许蜜蜂催生花朵的效果应用于花丛的同时，禁用骨粉催生花丛", "config.andromeda.entities.villagers_follow_emeralds": "村民跟随绿宝石块", "config.andromeda.entities.villagers_follow_emeralds.@Tooltip": "村民跟随手持绿宝石块的玩家", "config.andromeda.entities.better_furnace_minecart": "更好的动力矿车", - "config.andromeda.entities.better_furnace_minecart.@Tooltip[0]": "一些让动力矿车更好一些的调整选项。", - "config.andromeda.entities.better_furnace_minecart.@Tooltip[1]": "- 燃料现在作为整数保存，你可以在下面改变燃料量上限。", - "config.andromeda.entities.better_furnace_minecart.@Tooltip[2]": "- 你可以使用所有种类的燃料，如岩浆桶，煤炭块等等。", + "config.andromeda.entities.better_furnace_minecart.@Tooltip": "一些让动力矿车更好一些的调整选项。\n- 燃料现在作为整数保存，你可以在下面改变燃料量上限。\n- 你可以使用所有种类的燃料，如岩浆桶，煤炭块等等。", "config.andromeda.entities.better_furnace_minecart.option.maxFuel": "最大动力矿车载燃料量", "config.andromeda.entities.better_furnace_minecart.option.maxFuel.@Tooltip": "为动力矿车设置最大载燃料量。默认45000，最大2147483647", "config.andromeda.entities.better_furnace_minecart.option.takeFuelWhenLow": "动力矿车攫取燃料", - "config.andromeda.entities.better_furnace_minecart.option.takeFuelWhenLow.@Tooltip[0]": "使动力矿车能够从周边的可交互矿车中获取燃料，", - "config.andromeda.entities.better_furnace_minecart.option.takeFuelWhenLow.@Tooltip[1]": "如运输矿车、漏斗矿车，也许模组的矿车也能用上。", - "config.andromeda.entities.better_furnace_minecart.option.takeFuelWhenLow.@Tooltip[2]": "如果动力矿车已经停止，你需要自行推动它。", + "config.andromeda.entities.better_furnace_minecart.option.takeFuelWhenLow.@Tooltip": "使动力矿车能够从周边的可交互矿车中获取燃料，\n如运输矿车、漏斗矿车，也许模组的矿车也能用上。\n若动力矿车已经停下，你需要自行推动它。", "config.andromeda.entities.minecarts": "额外的矿车种类", "config.andromeda.entities.minecarts.@Tooltip": "让你能够启用或禁用特定种类的额外矿车种类", "config.andromeda.entities.minecarts.option.isAnvilMinecartOn": "启用载铁砧的矿车", @@ -243,6 +233,8 @@ "config.andromeda.items.lockpick.option.breakAfterUse.@Tooltip": "成功开锁后销毁开锁器", "config.andromeda.items.lockpick.option.villagerInventory": "村民物品栏", "config.andromeda.items.lockpick.option.villagerInventory.@Tooltip": "能够打开村民的物品栏。", + "config.andromeda.items.magnet": "磁铁", + "config.andromeda.items.magnet.@Tooltip": "能够吸引指定物品的神奇磁铁。\n可消耗海洋之心来升级。", "config.andromeda.items.better_names": "更好的物品名显示", "config.andromeda.items.better_names.@Tooltip": "在物品耐久未满时显示其耐久度百分比，在物品数量大于一时显示其数量", "config.andromeda.items.infinite_totem": "创生图腾", @@ -250,19 +242,15 @@ "config.andromeda.items.infinite_totem.option.enableAscension": "允许图腾进化", "config.andromeda.items.infinite_totem.option.enableAscension.@Tooltip": "允许不死图腾进化为创生图腾，禁用则使之无法常规获取", "config.andromeda.items.balanced_mending": "更平衡的经验修补", - "config.andromeda.items.balanced_mending.@Tooltip[0]": "通过移除“过于昂贵”的特性，让经验修补不是那么不可或缺，", - "config.andromeda.items.balanced_mending.@Tooltip[1]": "让玩家不再一味地用经验来修补工具。", - "config.andromeda.items.balanced_mending.@Tooltip[2]": "同时，将附魔等级上限设置为了40（不完全如此！）", - "config.andromeda.items.balanced_mending.@Tooltip[3]": "这个特性受到了TheMisterEpic的视频\"This Minecraft Enchantment has been BROKEN for 3 YEARS...\"的启发", + "config.andromeda.items.balanced_mending.@Tooltip": "通过移除“过于昂贵”的特性，让经验修补不是那么不可或缺，\n让玩家不再一味地用经验来修补工具。\n同时，将附魔等级上限设置为了40（不完全如此！）\n这个特性受到了TheMisterEpic的视频\"This Minecraft Enchantment has been BROKEN for 3 YEARS...\"的启发", "config.andromeda.items.minecart_block_picking": "矿车方块采集", "config.andromeda.items.minecart_block_picking.@Tooltip": "允许玩家通过矿车“采集”方块", "config.andromeda.items.minecart_block_picking.option.spawnerPicking": "矿车采集刷怪笼", - "config.andromeda.items.minecart_block_picking.option.spawnerPicking.@Tooltip": "允许玩家通过矿车“采集”刷怪笼。", + "config.andromeda.items.minecart_block_picking.option.spawnerPicking.@Tooltip": "允许玩家通过矿车“采集”刷怪笼\n前提是启用刷怪笼矿车！", "config.andromeda.category.bugfixes": "Bug修复", "config.andromeda.bugfixes.advancement_shadow": "独立成就阴影渲染", - "config.andromeda.bugfixes.advancement_shadow.@Tooltip[0]": "还记得当鼠标移动到成就上时显示的阴影吗？", - "config.andromeda.bugfixes.advancement_shadow.@Tooltip[1]": "现在它不会再因为帧率变动而改变动画速度了。", + "config.andromeda.bugfixes.advancement_shadow.@Tooltip": "还记得当鼠标移动到成就上时显示的阴影吗？\n现在它不会再因为帧率变动而改变动画速度了。", "config.andromeda.bugfixes.aligned_alternatives": "对齐配方界面", "config.andromeda.bugfixes.aligned_alternatives.@Tooltip": "在组内配方繁多时，配方组别不会再看上去那么小块了", @@ -273,8 +261,7 @@ "config.andromeda.mechanics.dragon_fight.option.respawnCrystals": "末影水晶再生成", "config.andromeda.mechanics.dragon_fight.option.respawnCrystals.@Tooltip": "让末影水晶在爆炸后再次生成（每隔1.6-3分钟）", "config.andromeda.mechanics.dragon_fight.option.scaleHealthByMaxPlayers": "集群强化", - "config.andromeda.mechanics.dragon_fight.option.scaleHealthByMaxPlayers.@Tooltip[0]": "根据最大在末地的玩家数量提升末影龙生命值。", - "config.andromeda.mechanics.dragon_fight.option.scaleHealthByMaxPlayers.@Tooltip[1]": "计算公式：floor((sqrt(500 * i)) * 10)，i为最大玩家数量。", + "config.andromeda.mechanics.dragon_fight.option.scaleHealthByMaxPlayers.@Tooltip": "根据最大在末地的玩家数量提升末影龙生命值。\n计算公式：floor((sqrt(500 * i)) * 10)，i为最大玩家数量。", "config.andromeda.mechanics.dragon_fight.option.shorterCrystalTrackRange": "更短的水晶治疗距离", "config.andromeda.mechanics.dragon_fight.option.shorterCrystalTrackRange.@Tooltip": "将水晶的治疗距离由32降低至24格。", "config.andromeda.mechanics.dragon_fight.option.shorterSpikes": "更短的尖刺", @@ -289,9 +276,7 @@ "config.andromeda.mechanics.throwable_items.option.zombieThrowInterval.@Tooltip": "在原本冷却的基础上，额外加算的僵尸投掷冷却时间。", "config.andromeda.mechanics.throwable_items.option.tooltip": "显示“可投掷”工具提示", "config.andromeda.mechanics.trading_goat_horn": "流浪商人号角", - "config.andromeda.mechanics.trading_goat_horn.@Tooltip[0]": "每两天，你都能使用这个号角来召唤一位流浪商人。", - "config.andromeda.mechanics.trading_goat_horn.@Tooltip[1]": "值得注意的是，流浪商人仍然会自然生成。", - "config.andromeda.mechanics.trading_goat_horn.@Tooltip[2]": "你可以通过禁用\"doTraderSpawning\"的游戏规则来禁用流浪商人自然生成。", + "config.andromeda.mechanics.trading_goat_horn.@Tooltip": "每两天，你都能使用这个号角来召唤一位流浪商人。\n值得注意的是，流浪商人仍然会自然生成。\n你可以通过禁用\"doTraderSpawning\"的游戏规则来禁用流浪商人自然生成。", "config.andromeda.category.gui": "GUI", "config.andromeda.gui.name_tooltips": "工具提示样式", @@ -331,9 +316,7 @@ "config.andromeda.base.option.sideOnlyMode": "仅客户端模式", "config.andromeda.base.option.sideOnlyMode.@Tooltip": "禁用所有要求服务端的特性。", "config.andromeda.base.option.sendCrashReports": "上传错误报告", - "config.andromeda.base.option.sendCrashReports.@Tooltip[0]": "在客户端崩溃时上传的数据：", - "config.andromeda.base.option.sendCrashReports.@Tooltip[1]": "栈跟踪，加载的模组，环境（客户端/服务端）", - "config.andromeda.base.option.sendCrashReports.@Tooltip[2]": "错误报告不会附加特征信息。", + "config.andromeda.base.option.sendCrashReports.@Tooltip": "在客户端崩溃时上传的数据：\n栈跟踪，加载的模组，环境（客户端/服务端）\n错误报告不会附加特征信息。", "config.andromeda.base.option.debugMessages": "启用调试信息", "config.andromeda.base.option.debugMessages.@Tooltip": "开启后，日志文件将被数不清的条目淹没。" } -- 2.51.2 From b500a2fbaaecfdd777340461923314e4a512f3b4 Mon Sep 17 00:00:00 2001 From: melontini <104443436+melontini@users.noreply.github.com> Date: Sun, 10 Dec 2023 12:21:33 +0700 Subject: [PATCH 2/2] hotfix --- CHANGELOG.md | 20 ++------------------ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fd721b9..c17269f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,21 +2,5 @@ ## Alpha warning! -* New Feature! Magnet. - * This special magnet allows you to select items you want to attract. - * Can be upgraded 4 additional times using a Heart of the Sea. - * Crafted from Heart of the Sea, 4 Copper Ingots and 2 Redstone. -* Guarded Loot: Allow Lock Picking! - * Allows the Lockpick to bypass chest guards. - -Other stuff: - -* Improved option tooltips if Cloth-Config is installed. -* Brightened Incubator's texture. -* Fixed New Minecarts not working. -* Configs are now selectively saved instead of all at once. -* Updated Chinese translation. Courtesy of [Rad233](https://github.com/Rad233). -* ModuleManager is now shared over ObjectShare. -* Optimized PNG assets. -* Fixed some bugs (and probably added more!) -* Updated DM. \ No newline at end of file +* Fixed Dark Matter related crash. +* Updated Chinese translation. Courtesy of [Rad233](https://github.com/Rad233). \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 78ee8e75..598d54fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ minecraft_version=1.19.2 yarn_mappings=1.19.2+build.28 loader_version=0.15.0 # Mod Properties -mod_version=1.1.0-1.19.2 +mod_version=1.1.1-1.19.2 maven_group=me.melontini archives_base_name=andromeda # Dependencies @@ -17,5 +17,5 @@ modmenu_version=4.2.0-beta.2 fabric_version=0.76.0+1.19.2 cloth_version=8.3.103 fabric_asm_version=2.3 -dark_matter=2.1.0-1.19.2 +dark_matter=2.1.1-1.19.2 mixin_extras_version=0.3.1 \ No newline at end of file