Merge remote-tracking branch 'origin/1.20.5-SNAPSHOT' into 1.20.5-SNA…

…PSHOT

src/main/resources/assets/combatify/lang/zh_cn.json

@@ -0,0 +1,163 @@
+{
+  "item.combatify.wooden_knife": "木小刀",
+  "item.combatify.stone_knife": "石小刀",
+  "item.combatify.iron_knife": "铁小刀",
+  "item.combatify.golden_knife": "金小刀",
+  "item.combatify.diamond_knife": "钻石小刀",
+  "item.combatify.netherite_knife": "下界合金小刀",
+  "item.combatify.wooden_longsword": "木长剑",
+  "item.combatify.stone_longsword": "石长剑",
+  "item.combatify.iron_longsword": "铁长剑",
+  "item.combatify.golden_longsword": "金长剑",
+  "item.combatify.diamond_longsword": "钻石长剑",
+  "item.combatify.netherite_longsword": "下界合金长剑",
+  "item.combatify.wooden_shield": "木盾牌",
+  "item.combatify.iron_shield": "铁盾牌",
+  "item.combatify.golden_shield": "金盾牌",
+  "item.combatify.diamond_shield": "钻石盾牌",
+  "item.combatify.netherite_shield": "下界合金盾牌",
+  "item.combatify.wooden_shield.red": "红色木盾牌",
+  "item.combatify.wooden_shield.orange": "橙色木盾牌",
+  "item.combatify.wooden_shield.yellow": "黄色木盾牌",
+  "item.combatify.wooden_shield.lime": "黄绿色木盾牌",
+  "item.combatify.wooden_shield.green": "绿色木盾牌",
+  "item.combatify.wooden_shield.light_blue": "淡蓝色木盾牌",
+  "item.combatify.wooden_shield.cyan": "青色木盾牌",
+  "item.combatify.wooden_shield.blue": "蓝色木盾牌",
+  "item.combatify.wooden_shield.purple": "紫色木盾牌",
+  "item.combatify.wooden_shield.magenta": "品红色木盾牌",
+  "item.combatify.wooden_shield.pink": "粉色木盾牌",
+  "item.combatify.wooden_shield.brown": "棕色木盾牌",
+  "item.combatify.wooden_shield.white": "白色木盾牌",
+  "item.combatify.wooden_shield.light_gray": "淡灰色木盾牌",
+  "item.combatify.wooden_shield.gray": "灰色木盾牌",
+  "item.combatify.wooden_shield.dark_gray": "深灰色木盾牌",
+  "item.combatify.wooden_shield.black": "黑色木盾牌",
+  "item.combatify.iron_shield.red": "红色铁盾牌",
+  "item.combatify.iron_shield.orange": "橙色铁盾牌",
+  "item.combatify.iron_shield.yellow": "黄色铁盾牌",
+  "item.combatify.iron_shield.lime": "黄绿色铁盾牌",
+  "item.combatify.iron_shield.green": "绿色铁盾牌",
+  "item.combatify.iron_shield.light_blue": "淡蓝色铁盾牌",
+  "item.combatify.iron_shield.cyan": "青色铁盾牌",
+  "item.combatify.iron_shield.blue": "蓝色铁盾牌",
+  "item.combatify.iron_shield.purple": "紫色铁盾牌",
+  "item.combatify.iron_shield.magenta": "品红色铁盾牌",
+  "item.combatify.iron_shield.pink": "粉色铁盾牌",
+  "item.combatify.iron_shield.brown": "棕色铁盾牌",
+  "item.combatify.iron_shield.white": "白色铁盾牌",
+  "item.combatify.iron_shield.light_gray": "淡灰色铁盾牌",
+  "item.combatify.iron_shield.gray": "灰色铁盾牌",
+  "item.combatify.iron_shield.dark_gray": "深灰色铁盾牌",
+  "item.combatify.iron_shield.black": "黑色铁盾牌",
+  "item.combatify.golden_shield.red": "红色金盾牌",
+  "item.combatify.golden_shield.orange": "橙色金盾牌",
+  "item.combatify.golden_shield.yellow": "黄色金盾牌",
+  "item.combatify.golden_shield.lime": "黄绿色金盾牌",
+  "item.combatify.golden_shield.green": "绿色金盾牌",
+  "item.combatify.golden_shield.light_blue": "淡蓝色金盾牌",
+  "item.combatify.golden_shield.cyan": "青色金盾牌",
+  "item.combatify.golden_shield.blue": "蓝色金盾牌",
+  "item.combatify.golden_shield.purple": "紫色金盾牌",
+  "item.combatify.golden_shield.magenta": "品红色金盾牌",
+  "item.combatify.golden_shield.pink": "粉色金盾牌",
+  "item.combatify.golden_shield.brown": "棕色金盾牌",
+  "item.combatify.golden_shield.white": "白色金盾牌",
+  "item.combatify.golden_shield.light_gray": "淡灰色金盾牌",
+  "item.combatify.golden_shield.gray": "灰色金盾牌",
+  "item.combatify.golden_shield.dark_gray": "深灰色金盾牌",
+  "item.combatify.golden_shield.black": "黑色金盾牌",
+  "item.combatify.diamond_shield.red": "红色钻石盾牌",
+  "item.combatify.diamond_shield.orange": "橙色钻石盾牌",
+  "item.combatify.diamond_shield.yellow": "黄色钻石盾牌",
+  "item.combatify.diamond_shield.lime": "黄绿色钻石盾牌",
+  "item.combatify.diamond_shield.green": "绿色钻石盾牌",
+  "item.combatify.diamond_shield.light_blue": "淡蓝色钻石盾牌",
+  "item.combatify.diamond_shield.cyan": "青色钻石盾牌",
+  "item.combatify.diamond_shield.blue": "蓝色钻石盾牌",
+  "item.combatify.diamond_shield.purple": "紫色钻石盾牌",
+  "item.combatify.diamond_shield.magenta": "品红色钻石盾牌",
+  "item.combatify.diamond_shield.pink": "粉色钻石盾牌",
+  "item.combatify.diamond_shield.brown": "棕色钻石盾牌",
+  "item.combatify.diamond_shield.white": "白色钻石盾牌",
+  "item.combatify.diamond_shield.light_gray": "淡灰色钻石盾牌",
+  "item.combatify.diamond_shield.gray": "灰色钻石盾牌",
+  "item.combatify.diamond_shield.dark_gray": "深灰色钻石盾牌",
+  "item.combatify.diamond_shield.black": "黑色钻石盾牌",
+  "item.combatify.netherite_shield.red": "红色下界合金盾牌",
+  "item.combatify.netherite_shield.orange": "橙色下界合金盾牌",
+  "item.combatify.netherite_shield.yellow": "黄色下界合金盾牌",
+  "item.combatify.netherite_shield.lime": "黄绿色下界合金盾牌",
+  "item.combatify.netherite_shield.green": "绿色下界合金盾牌",
+  "item.combatify.netherite_shield.light_blue": "淡蓝色下界合金盾牌",
+  "item.combatify.netherite_shield.cyan": "青色下界合金盾牌",
+  "item.combatify.netherite_shield.blue": "蓝色下界合金盾牌",
+  "item.combatify.netherite_shield.purple": "紫色下界合金盾牌",
+  "item.combatify.netherite_shield.magenta": "品红色下界合金盾牌",
+  "item.combatify.netherite_shield.pink": "粉色下界合金盾牌",
+  "item.combatify.netherite_shield.brown": "棕色下界合金盾牌",
+  "item.combatify.netherite_shield.white": "白色下界合金盾牌",
+  "item.combatify.netherite_shield.light_gray": "淡灰色下界合金盾牌",
+  "item.combatify.netherite_shield.gray": "灰色下界合金盾牌",
+  "item.combatify.netherite_shield.dark_gray": "深灰色下界合金盾牌",
+  "item.combatify.netherite_shield.black": "黑色下界合金盾牌",
+  "enchantment.combatify.defender" : "防御者",
+  "enchantment.combatify.piercer" : "穿透者",
+  "enchantment.minecraft.cleaving" : "裂解",
+  "options.autoAttack" : "自动攻击",
+  "options.shieldCrouch" : "在潜行时激活盾牌",
+  "options.lowShield" : "更低的盾牌",
+  "options.lowShield.tooltip" : "在潜行激活盾牌时降低盾牌以获得更好的视野",
+  "options.attackIndicatorValue" : "伤害决定条最大值",
+  "options.attackIndicatorValue.tooltip" : "调整这个滑动条以决定伤害决定条在屏幕上消失的值，默认值为2.0以匹配CTS。",
+  "options.attackIndicatorValue.default" : "默认",
+  "options.attackIndicatorMinValue" : "伤害决定条最最小值",
+  "options.attackIndicatorMinValue.tooltip" : "调整这个滑动条以决定伤害决定条开始出现在屏幕上的值，默认值为1.3以匹配CTS。",
+  "options.attackIndicatorMinValue.default" : "默认",
+  "options.double_value": "%s: %s",
+  "options.rhythmicAttack" : "有节奏型的攻击",
+  "options.protIndicator" : "保护魔咒等级指示器",
+  "options.swordBlockStyle" : "1.8的剑格挡动画",
+  "options.fishingRodLegacy" : "1.7的钓鱼竿",
+  "options.shieldIndicator" : "盾牌指示器",
+  "text.config.combatify-config.title": "Combatify",
+  "text.config.combatify-config.section.Booleans": "开关",
+  "text.config.combatify-config.section.Integers": "整数值",
+  "text.config.combatify-config.section.Floats": "浮点值",
+  "text.config.combatify-config.option.midairKB": "允许非弹射物来源的伤害将玩家向高处击退，即使他们已经在空中了",
+  "text.config.combatify-config.option.fishingHookKB": "钓鱼竿会造成击退",
+  "text.config.combatify-config.option.fistDamage": "将基础伤害修改为1以匹配基岩版做出的更改",
+  "text.config.combatify-config.option.swordBlocking": "剑格挡",
+  "text.config.combatify-config.option.shieldOnlyWhenCharged": "只允许在攻击冷却时用盾格挡，对剑格挡无效",
+  "text.config.combatify-config.option.sprintCritsEnabled": "允许在疾跑时进行暴击",
+  "text.config.combatify-config.option.saturationHealing": "在治疗时优先使用使用饱和度而不是直接消耗饥饿值",
+  "text.config.combatify-config.option.fastHealing": "允许像1.9+那样的高饱和度加速治疗",
+  "text.config.combatify-config.option.letVanillaConnect": "允许原版客户端连接到服务器，只对服务端有效",
+  "text.config.combatify-config.option.oldSprintFoodRequirement": "允许像CTS 5那样疾跑直到饥饿值耗尽",
+  "text.config.combatify-config.option.projectilesHaveIFrames": "弹射物来源的伤害是否有无懈可击时间",
+  "text.config.combatify-config.option.magicHasIFrames": "魔法来源的伤害是否有无懈可击时间",
+  "text.config.combatify-config.option.autoAttackAllowed": "阻止客户端使用自动攻击，只对服务端有效",
+  "text.config.combatify-config.option.bowMomentumDamage": "弓的伤害会受到箭的动能影响",
+  "text.config.combatify-config.option.configOnlyWeapons": "添加小刀和长剑，其拥有他们独特的属性和能力",
+  "text.config.combatify-config.option.tieredShields": "添加分级的盾牌，其会随着等级提升变的越来越强大",
+  "text.config.combatify-config.option.piercer": "添加穿透者魔咒，其会停用盾牌并每级增加10%的盔甲穿透，与伤害类魔咒互斥",
+  "text.config.combatify-config.option.defender": "添加防御者魔咒，其会减少0.5秒的盾牌停用时间以及增强盾牌与剑的保护效果",
+  "text.config.combatify-config.option.attackReach": "启用攻击距离",
+  "text.config.combatify-config.option.attackSpeed": "如果关闭且你的工具有最高的攻击速度（20），将会阻止攻击冷却重置",
+  "text.config.combatify-config.option.instaAttack": "攻击冷却不会重置",
+  "text.config.combatify-config.option.ctsAttackBalancing": "武器是否会像1.9那样减少伤害",
+  "text.config.combatify-config.option.eatingInterruption": "启用进食中断",
+  "text.config.combatify-config.option.improvedMiscEntityAttacks": "使末地水晶、画与物品展示框触发未击中攻击冷却，这样就不再需要达到100%攻击冷却",
+  "text.config.combatify-config.option.swordProtectionEfficacy": "以0.1每整数值修改剑格挡的强度",
+  "text.config.combatify-config.option.instantHealthBonus": "瞬间治疗加成",
+  "text.config.combatify-config.option.shieldDisableTime": "基准盾牌停用时间",
+  "text.config.combatify-config.option.cleavingDisableTime": "裂解的盾牌停用时间加成（每级）",
+  "text.config.combatify-config.option.defenderDisableReduction": "防御者减少的盾牌停用时间",
+  "text.config.combatify-config.option.shieldChargePercentage": "使用V5盾牌需要的攻击冷却百分比",
+  "text.config.combatify-config.option.snowballDamage": "雪球造成的伤害",
+  "text.config.combatify-config.option.eggDamage": "鸡蛋造成的伤害",
+  "text.config.combatify-config.option.windChargeDamage": "风弹造成的伤害",
+  "text.config.combatify-config.option.bowUncertainty": "弓的不确定性，也被称为精准度",
+  "text.config.combatify-config.option.baseHandAttackSpeed": "徒手攻击速度偏移",
+  "text.config.combatify-config.option.minHitboxSize": "实体判定箱最低大小"
+}

src/main/resources/assets/cookeymod/lang/zh_cn.json

@@ -0,0 +1,72 @@
+{
+  "key.categories.cookeymod": "CookeyMod",
+  "key.cookeymod_options": "打开设置",
+  "options.cookeymod": "CookeyMod",
+  "options.cookeymod.button": "CookeyMod...",
+  "options.cookeymod.generic.options.off": "关闭",
+  "options.cookeymod.animations": "动画与渲染",
+  "options.cookeymod.animations.swingAndUseItem": "挥动与使用物品",
+  "options.cookeymod.animations.swingAndUseItem.tooltip.0": "如果启用，则挥动动画不会",
+  "options.cookeymod.animations.swingAndUseItem.tooltip.1": "在你开始与物品互动时取消。",
+  "options.cookeymod.animations.enableOldSwing": "旧的挥动动画",
+  "options.cookeymod.animations.enableOldSwing.tooltip.0": "从1.16带回旧版的挥动动画。",
+  "options.cookeymod.animations.sneakAnimationSpeed": "视角转换速度",
+  "options.cookeymod.animations.sneakAnimationSpeed.tooltip.0": "改变当你的视平线改变时",
+  "options.cookeymod.animations.sneakAnimationSpeed.tooltip.1": "转换的速度（例如潜行）。",
+  "options.cookeymod.animations.disableCameraBobbing": "关闭视角抖动",
+  "options.cookeymod.animations.disableCameraBobbing.tooltip.0": "当\"视角摇晃\"被启用时，",
+  "options.cookeymod.animations.disableCameraBobbing.tooltip.1": "这会关闭走路时的视角抖动，",
+  "options.cookeymod.animations.disableCameraBobbing.tooltip.2": "但保留手部动画。",
+  "options.cookeymod.animations.enableToolBlocking": "工具格挡",
+  "options.cookeymod.animations.enableToolBlocking.tooltip.0": "当你用盾牌格挡时，为你的",
+  "options.cookeymod.animations.enableToolBlocking.tooltip.1": "工具启用一个格挡动画，",
+  "options.cookeymod.animations.enableToolBlocking.tooltip.2": "类似于1.8的剑格挡。",
+  "options.cookeymod.animations.showEatingInThirdPerson": "第三人称食用动画",
+  "options.cookeymod.animations.showEatingInThirdPerson.tooltip.0": "在第三人称视角启用一个",
+  "options.cookeymod.animations.showEatingInThirdPerson.tooltip.1": "食用与饮用物品的动画。",
+  "options.cookeymod.animations.enableDamageCameraTilt": "视角受伤抖动",
+  "options.cookeymod.animations.enableDamageCameraTilt.tooltip.0": "当你受到攻击时候，让你的",
+  "options.cookeymod.animations.enableDamageCameraTilt.tooltip.1": "视角朝你被击退的方向抖动。",
+  "options.cookeymod.hudRendering": "HUD与渲染",
+  "options.cookeymod.hudRendering.attackCooldownHandOffset": "攻击冷却手部偏移",
+  "options.cookeymod.hudRendering.attackCooldownHandOffset.tooltip.0": "修改在攻击冷却期间第一人称",
+  "options.cookeymod.hudRendering.attackCooldownHandOffset.tooltip.1": "视角中你的武器下沉程度。",
+  "options.cookeymod.hudRendering.damageColor": "实体受伤颜色",
+  "options.cookeymod.hudRendering.damageColor.tooltip.0": "修改实体受伤着色的颜色。",
+  "options.cookeymod.hudRendering.showDamageTintOnArmor": "盔甲受伤着色",
+  "options.cookeymod.hudRendering.showDamageTintOnArmor.tooltip.0": "让受伤着色也出现在盔甲上。",
+  "options.cookeymod.hudRendering.onlyShowShieldWhenBlocking": "隐藏未使用的盾牌",
+  "options.cookeymod.hudRendering.onlyShowShieldWhenBlocking.tooltip.0": "当未使用的时候，在第一",
+  "options.cookeymod.hudRendering.onlyShowShieldWhenBlocking.tooltip.1": "人称视角中隐藏盾牌。",
+  "options.cookeymod.hudRendering.disableEffectBasedFovChange": "无视视场角效果",
+  "options.cookeymod.hudRendering.disableEffectBasedFovChange.tooltip.0": "无视由状态效果造成的视场角",
+  "options.cookeymod.hudRendering.disableEffectBasedFovChange.tooltip.1": "变化（疾跑视场角不受影响）。",
+  "options.cookeymod.hudRendering.alternativeBobbing": "替代抖动",
+  "options.cookeymod.hudRendering.alternativeBobbing.tooltip.0": "启用一个替代的抖动动画。",
+  "options.cookeymod.hudRendering.showHandWhenInvisible": "在隐形时显示手",
+  "options.cookeymod.hudRendering.showHandWhenInvisible.tooltip.0": "在你隐形时在第一人称视角显示手。",
+  "options.cookeymod.misc": "杂项",
+  "options.cookeymod.misc.showModButton": "在MC设置中启用Mod按钮",
+  "options.cookeymod.misc.showModButton.tooltip.0": "改变CookeyMods按钮是否应该在",
+  "options.cookeymod.misc.showModButton.tooltip.1": "Minecraft的设置菜单中出现。",
+  "options.cookeymod.misc.showOwnNameInThirdPerson": "第三人称视角名字",
+  "options.cookeymod.misc.showOwnNameInThirdPerson.tooltip.0": "让你自己的名字在第三人称",
+  "options.cookeymod.misc.showOwnNameInThirdPerson.tooltip.1": "视角中出现。",
+  "options.cookeymod.misc.force100PercentRecharge": "强制100%攻击冷却",
+  "options.cookeymod.misc.force100PercentRecharge.tooltip.0": "强制总是在未击中后达到100%",
+  "options.cookeymod.misc.force100PercentRecharge.tooltip.1": "武器攻击冷却，可能对在Combat Tests",
+  "options.cookeymod.misc.force100PercentRecharge.tooltip.2": "中改进你的精准度与时机有帮助",
+  "options.cookeymod.misc.fixLocalPlayerHandling": "修复本地玩家处理问题",
+  "options.cookeymod.misc.fixLocalPlayerHandling.tooltip.0": "修复了客户端中的一个漏洞，其会导致",
+  "options.cookeymod.misc.fixLocalPlayerHandling.tooltip.1": "在攻击玩家时粒子效果出现并取消疾跑，",
+  "options.cookeymod.misc.fixLocalPlayerHandling.tooltip.2": "即使攻击已经被取消。",
+  "options.cookeymod.misc.fixLocalPlayerHandling.tooltip.3": "（参见MC-211708）",
+  "options.cookeymod.misc.fixCooldownDesync": "修复攻击冷却不同步问题",
+  "options.cookeymod.misc.fixCooldownDesync.tooltip.0": "修复了在某些破坏/放置方块",
+  "options.cookeymod.misc.fixCooldownDesync.tooltip.1": "或掉落物品的情况下，客户端",
+  "options.cookeymod.misc.fixCooldownDesync.tooltip.2": "的攻击冷却时间不同步问题。",
+  "options.cookeymod.misc.fixCooldownDesync.tooltip.3": "（参见MC-218570）",
+  "options.cookeymod.update.notification.title": "CookeyMod有更新可用！",
+  "options.cookeymod.update.notification.subtitle": "重新启动以应用。"
+
+}

src/main/resources/assets/minecraft/lang/zh_cn.json

@@ -0,0 +1,6 @@
+{
+  "attribute.name.player.entity_interaction_range": "攻击距离",
+  "attribute.name.generic.shield_strength": "伤害保护",
+  "attribute.name.generic.sword_block_strength": "伤害保护",
+  "attribute.name.generic.longsword_piercing": "盔甲穿透"
+}