From a1a7b0ab3387bee51a82a1bac773fabdd7a8524e Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 11 Aug 2020 16:52:47 -0300 Subject: [PATCH 1/2] 1.4.8 --- gradle.properties | 2 +- src/main/java/carpet/CarpetSettings.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 577e42cf..d61eaa74 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.8.8+build.202 # Mod Properties - mod_version = 1.4.7+v200806 + mod_version = 1.4.8+v200811 maven_group = carpet archives_base_name = fabric-carpet diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 999d9535..225f06a9 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -34,7 +34,7 @@ import static carpet.settings.RuleCategory.CLIENT; @SuppressWarnings("CanBeFinal") public class CarpetSettings { - public static final String carpetVersion = "1.4.7+v200806"; + public static final String carpetVersion = "1.4.8+v200811"; public static final Logger LOG = LogManager.getLogger(); public static boolean skipGenerationChecks = false; public static boolean impendingFillSkipUpdates = false; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e7b7ca68..166014fd 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "carpet", - "version": "1.4.7", + "version": "1.4.8", "name": "Carpet Mod in Fabric", "description": "Carpet made out of fabric", From c7ce2945b8fc5825671477203eae65624595783b Mon Sep 17 00:00:00 2001 From: Dianliang233 Date: Wed, 12 Aug 2020 01:10:02 +0800 Subject: [PATCH 2/2] Fixes and small tweaks for zh-cn translation (#410) * fixes and small tweaks * fix #410#discussion_r468369398 https://github.com/gnembon/fabric-carpet/pull/410#discussion_r468369398 --- .../resources/assets/carpet/lang/zh_cn.json | 78 +++++++++---------- 1 file changed, 37 insertions(+), 41 deletions(-) diff --git a/src/main/resources/assets/carpet/lang/zh_cn.json b/src/main/resources/assets/carpet/lang/zh_cn.json index f6dd3ad1..fd15f51c 100644 --- a/src/main/resources/assets/carpet/lang/zh_cn.json +++ b/src/main/resources/assets/carpet/lang/zh_cn.json @@ -8,36 +8,32 @@ "rule.combineXPOrbs.name": "经验球合并", "rule.combineXPOrbs.desc": "会将多个小经验球合并为更大的经验球", - "rule.commandCameramode.name": "灵魂出窍模式", - "rule.commandCameramode.desc": "启用/c和/s命令使得玩家可以在生存模式和观察者模式间切换", - "rule.commandCameramode.extra.0": "/c和/s命令所有玩家（包括非OP玩家）都可以使用", - "rule.commandDistance.name": "距离测量", "rule.commandDistance.desc": "启用/distance命令以测量游戏中两点间距离", - "rule.commandDistance.extra.0": "可以通过放置棕色地毯的方式使用本功能，前提是“放置地毯执行功能”已启用", + "rule.commandDistance.extra.0": "可以通过放置棕色地毯的方式使用本功能，前提是“多功能地毯”已启用", "rule.commandDraw.name": "画图", "rule.commandDraw.desc": "启用/draw命令以允许绘制一些简单图形", "rule.commandInfo.name": "获取方块数据", "rule.commandInfo.desc": "启用/info命令以获取方块数据", - "rule.commandInfo.extra.0": "可以通过放置灰色地毯的方式使用本功能，前提是“放置地毯执行功能”已启用", + "rule.commandInfo.extra.0": "可以通过放置灰色地毯的方式使用本功能，前提是“多功能地毯”已启用", "rule.commandLog.name": "游戏数据监视器", - "rule.commandLog.desc": "启用/log命令以在聊天栏/Tab栏监视游戏部分数据", + "rule.commandLog.desc": "启用/log命令以在聊天栏或Tab栏监视游戏部分数据", "rule.commandPerimeterInfo.name": "刷怪区域搜寻器", "rule.commandPerimeterInfo.desc": "启用/perimeterinfo命令以搜寻周围的可刷怪区域", - "rule.commandPlayer.name": "假人控制", + "rule.commandPlayer.name": "玩家控制", "rule.commandPlayer.desc": "启用/player命令以控制/召唤玩家", - "rule.commandScript.name": "地毯脚本控制器", + "rule.commandScript.name": "Carpet脚本控制器", "rule.commandScript.desc": "启用/script相关命令", "rule.commandScript.extra.0": "一个Scarpet语言的游戏内API", "rule.commandSpawn.name": "刷怪追踪器", - "rule.commandSpawn.desc": "启用/spawn命令用于怪物生成追踪", + "rule.commandSpawn.desc": "启用/spawn命令以追踪怪物生成", "rule.commandTick.name": "游戏时钟控制器", "rule.commandTick.desc": "启用/tick命令以控制游戏时钟", @@ -45,16 +41,16 @@ "rule.commandTrackAI.name": "AI追踪器", "rule.commandTrackAI.desc": "启用/track命令以追踪生物的AI", - "rule.ctrlQCraftingFix.name": "ctrlQ合成修复", - "rule.ctrlQCraftingFix.desc": "在合成时允许使用ctrl+Q快捷键扔出结果格内所有物品", + "rule.ctrlQCraftingFix.name": "Ctrl+Q合成修复", + "rule.ctrlQCraftingFix.desc": "在合成时允许使用Ctrl+Q快捷键扔出结果格内所有物品", "rule.customMOTD.name": "MOTD更改", "rule.customMOTD.desc": "设置一个不同的MOTD信息", - "rule.customMOTD.extra.0": "使用'_'时将发送默认MOTD(从server.properties中读取)", + "rule.customMOTD.extra.0": "使用“_”时将发送默认MOTD（从server.properties中读取）", "rule.defaultLoggers.name": "默认游戏监视器", "rule.defaultLoggers.desc": "为所有新进入玩家设置部分监视器默认开启", - "rule.defaultLoggers.extra.0": "比如设置'tps,mobcaps'作为默认监视器", + "rule.defaultLoggers.extra.0": "比如设置“tps,mobcaps”作为默认监视器", "rule.desertShrubs.name": "树苗在沙漠干枯", "rule.desertShrubs.desc": "树苗将在附近无水源的沙漠群系枯萎", @@ -70,7 +66,7 @@ "rule.extremeBehaviours.extra.0": "发射器和投掷器将使用最大随机刻", "rule.fastRedstoneDust.name": "红石粉卡顿优化", - "rule.fastRedstoneDust.desc": "红石粉卡顿优化 作者 Theosib", + "rule.fastRedstoneDust.desc": "红石粉卡顿优化 作者：Theosib", "rule.fillLimit.name": "fill/clone上限更改", "rule.fillLimit.desc": "将fill/clone上限更改为自己需要的值", @@ -78,10 +74,10 @@ "rule.fillUpdates.name": "fill更新开关", "rule.fillUpdates.desc": "fill/clone/setblock命令以及结构方块执行时是否产生更新", - "rule.fillUpdates.extra.0": "设置为true有更新 设置为false时为无更新", + "rule.fillUpdates.extra.0": "设置为true有更新，设置为false时为无更新", - "rule.flatWorldStructureSpawning.name": "结构怪在超平坦世界生成", - "rule.flatWorldStructureSpawning.desc": "允许结构怪在超平坦世界生成", + "rule.flatWorldStructureSpawning.name": "结构在超平坦世界生成", + "rule.flatWorldStructureSpawning.desc": "允许结构在超平坦世界生成", "rule.flippinCactus.name": "仙人掌扳手", "rule.flippinCactus.desc": "允许使用仙人掌调整方块朝向，并且不会产生更新", @@ -93,15 +89,15 @@ "rule.hopperCounters.name": "漏斗计数器", "rule.hopperCounters.desc": "漏斗指向的羊毛会计算经过的物品", "rule.hopperCounters.extra.0": "在羊毛上放置红色或绿色地毯，使用/counter命令可启用", - "rule.hopperCounters.extra.1": "使用 /counter reset重置计数器，使用/counter 查询", + "rule.hopperCounters.extra.1": "使用 /counter <颜色> reset重置计数器，使用/counter <颜色>查询", "rule.hopperCounters.extra.2": "在生存模式，在同色羊毛上放绿地毯可以查询，放红地毯重置", "rule.hopperCounters.extra.3": "数据是全局性在玩家间共享的，并且有16颜色可用", - "rule.hopperCounters.extra.4": "物品会被销毁，每个漏斗每tick销毁一组物品", + "rule.hopperCounters.extra.4": "物品会被销毁，每个漏斗每刻销毁一组物品", "rule.huskSpawningInTemples.name": "尸壳在神殿里生成", "rule.huskSpawningInTemples.desc": "只有尸壳会在沙漠神殿生成", - "rule.lagFreeSpawning.name": "延迟自然生成", + "rule.lagFreeSpawning.name": "无卡顿生成", "rule.lagFreeSpawning.desc": "生物生成需要更少的CPU和内存", "rule.leadFix.name": "栓绳修复", @@ -111,7 +107,7 @@ "rule.maxEntityCollisions.desc": "设定最大实体挤压限制，0表示无限大", "rule.mergeTNT.name": "合并TNT", - "rule.mergeTNT.desc": "合并静止的点燃的tnt实体", + "rule.mergeTNT.desc": "合并静止的点燃的TNT实体", "rule.missingTools.name": "工具缺失修复", "rule.missingTools.desc": "活塞，玻璃和海绵可以用合适的工具更快地破坏", @@ -120,13 +116,13 @@ "rule.movableBlockEntities.desc": "活塞可推动方块实体，比如箱子，漏斗", "rule.onePlayerSleeping.name": "单个玩家睡觉", - "rule.onePlayerSleeping.desc": "服务器里一个玩家睡觉可跳过夜晚", + "rule.onePlayerSleeping.desc": "服务器里一个玩家睡觉即可跳过夜晚", "rule.optimizedTNT.name": "TNT优化", - "rule.optimizedTNT.desc": "tnt在相同的地点或在流体里，爆炸造成更小的延迟", + "rule.optimizedTNT.desc": "TNT在相同的地点或在流体里，爆炸造成更小的延迟", "rule.persistentParrots.name": "鹦鹉停留", - "rule.persistentParrots.desc": "鹦鹉不会离开你的肩膀，除非你收到伤害", + "rule.persistentParrots.desc": "鹦鹉不会离开你的肩膀，除非你受到伤害", "rule.placementRotationFix.name": "放置旋转修复", "rule.placementRotationFix.desc": "修复了玩家放置方块时快速转身造成的问题", @@ -137,7 +133,7 @@ "rule.quasiConnectivity.name": "半连接激活开关", "rule.quasiConnectivity.desc": "活塞，发射器和投掷器在他们上方方块激活时是否响应", - "rule.quasiConnectivity.extra.0": "设置为true为开启 设置为false为禁用", + "rule.quasiConnectivity.extra.0": "设置为true为开启，设置为false为禁用", "rule.railPowerLimit.name": "自定义动力铁轨激活距离", "rule.railPowerLimit.desc": "动力铁轨激活上限可自定义", @@ -168,7 +164,7 @@ "rule.stackableShulkerBoxes.name": "潜影盒堆叠", "rule.stackableShulkerBoxes.desc": "空潜影盒仍在地上时将自动堆叠，直至堆叠为1组", - "rule.stackableShulkerBoxes.extra.0": "在物品GUI中，请使用shift键+单击以移动整组潜影盒", + "rule.stackableShulkerBoxes.extra.0": "在物品GUI中，请使用Shift+单击以移动整组潜影盒", "rule.summonNaturalLightning.name": "召唤闪电自然化", "rule.summonNaturalLightning.desc": "召唤的闪电将拥有所有自然生成闪电拥有的特性", @@ -180,8 +176,8 @@ "rule.tntPrimerMomentumRemoved.desc": "TNT点燃时的随机动量将被移除", "rule.tntRandomRange.name": "TNT爆炸范围设置", - "rule.tntRandomRange.desc": "设置TNT随机爆炸范围为一个固定的值,设为-1以禁用", - "rule.tntRandomRange.extra.0": "必须启用optimizedTNT功能", + "rule.tntRandomRange.desc": "设置TNT随机爆炸范围为一个固定的值，设为-1以禁用", + "rule.tntRandomRange.extra.0": "必须启用TNT优化功能", "rule.tntRandomRange.extra.1": "不能为负值，除了-1", "rule.unloadedEntityFix.name": "未加载实体修复", @@ -189,7 +185,7 @@ "rule.viewDistance.name": "自定义视距", "rule.viewDistance.desc": "改变服务器视距，设为0以使用默认值", - "rule.viewDistance.extra.0": "你必须在0(使用服务器默认设置)-32取一个整数", + "rule.viewDistance.extra.0": "你必须在0（使用服务器默认设置）-32取一个整数", "rule.xpNoCooldown.name": "经验吸收无冷却", "rule.xpNoCooldown.desc": "玩家吸收经验球时不会有冷却时间", @@ -211,21 +207,21 @@ "rule.creativeFlyDrag.name": "创造飞行阻力系数", "rule.creativeFlyDrag.desc": "允许使用本功能更改创造模式下飞行时的空气阻力系数", - "rule.creativeFlyDrag.extra.0": "阻力增加会降低您的飞行速度,\n所以需要相应地调整速度,\n使用 1.0 阻力系数的时候,使用 11 的速度系数似乎与原版速度相匹配.\n本功能仅在客户端也安装地毯MOD（版本>=服务器安装版本）的情况下生效", + "rule.creativeFlyDrag.extra.0": "阻力增加会降低您的飞行速度，\n所以需要相应地调整速度，\n使用1.0阻力系数的时候，使用11的速度系数似乎与原版速度相匹配。\n本功能仅在客户端也安装Carpet Mod（并且版本>=服务器安装版本）的情况下生效", "rule.creativeFlySpeed.name": "创造飞行速度系数", "rule.creativeFlySpeed.desc": "允许使用本功能更改创造模式下飞行速度系数", - "rule.creativeFlySpeed.extra.0": "本功能仅在客户端也安装地毯MOD（版本>=服务器安装版本）的情况下生效", + "rule.creativeFlySpeed.extra.0": "本功能仅在客户端也安装Carpet Mod（并且版本>=服务器安装版本）的情况下生效", "rule.creativeNoClip.name": "创造玩家无碰撞检测", "rule.creativeNoClip.desc": "创造玩家可以穿过方块", - "rule.creativeNoClip.extra.0": "这个选项需要服务端和客户端同时支持才生效.\n仅在服务端设置是无效的，而仅在客户端设置的情况下\n你可以利用一些和活板门有关的技巧来穿墙", + "rule.creativeNoClip.extra.0": "这个选项需要服务端和客户端同时支持才生效。\n仅在服务端设置是无效的，而仅在客户端设置的情况下\n你可以利用一些和活板门有关的技巧来穿墙", "rule.fogOff.name": "关闭雾气", "rule.fogOff.desc": "启用本功能以关闭地狱与末地的雾气", "rule.fogOff.extra.0": "提高了可见度，但看起来很奇怪", - "rule.forceloadLimit.name": "永加载区块上限更改", + "rule.forceloadLimit.name": "永久加载区块上限更改", "rule.forceloadLimit.desc": "允许使用本功能更改/forceload命令标记的永久加载区块上限", "rule.interactionUpdates.name": "放置方块产生更新", @@ -237,12 +233,12 @@ "rule.portalSurvivalDelay.name": "生存模式地狱门传送延迟", "rule.portalSurvivalDelay.desc": "设置生存模式下地狱门传送的延迟（单位:tick）", - "rule.spawnChunksSize.name": "出生点永加载区块半径", - "rule.spawnChunksSize.desc": "更改出生点永加载区块半径", + "rule.spawnChunksSize.name": "出生点永久加载区块半径", + "rule.spawnChunksSize.desc": "更改出生点永久加载区块半径", "rule.spawnChunksSize.extra.0": "定义新半径\n设为0以禁用出生点区块加载", - "category.bugfix": "BUG修复", + "category.bugfix": "漏洞修复", "category.survival": "生存", "category.creative": "创造", "category.experimental": "试验性", @@ -251,7 +247,7 @@ "category.command": "指令", "category.tnt": "TNT", "category.dispenser": "发射器", - "category.scarpet": "scarpet脚本语言", + "category.scarpet": "Scarpet脚本语言", "category.client": "客户端", "ui.browse_categories": "浏览分类", @@ -263,13 +259,13 @@ "ui.is_set_to": "被设置为", "ui.unknown_rule": "未知的规则选项", "ui.current_%(mod)s_startup_settings_from_%(conf)s": "目前启用的%s选项，从%s中读取得", - "ui.%(mod)s_settings_matching_'%(query)s'": "%s中符合\"%s\"的选项：", + "ui.%(mod)s_settings_matching_'%(query)s'": "%s中符合“%s”的选项：", "ui.all_%(mod)s_settings": "所有的%s选项", "ui.tags": "分类", "ui.change_permanently": "永久更改", "ui.click_to_keep_the_settings_in_%(conf)s_to_save_across_restarts": "点击此按钮以使此选项保存于%s，重启后依旧生效", "ui.rule_%(rule)s_will_now_default_to_%(value)s": "规则“%s”将会被默认设置为%s", "ui.rule_%(rule)s_not_set_restart": "规则“%s”将在重启后恢复默认值", - "ui.current_value": "当前的值" + "ui.current_value": "当前值" -} \ No newline at end of file +}