恢复Alex's Caves模组支持

config/packer/1.20.json

@@ -6,7 +6,6 @@
         ],
         "exclusionMods": [],
         "exclusionNamespaces": [
-            "alexscaves",
             "cataclysm"
         ]
     },

projects/1.12.2/assets/1UNKNOWN/pmp/lang/zh_cn.lang

@@ -307,7 +307,7 @@ item.fruit_cherr.name=樱桃
 item.fruit_cocon.name=椰子
 item.fruit_grapf.name=柚子
 item.fruit_grnap.name=青苹果
-item.fruit_kiwi.name=奇异果
+item.fruit_kiwi.name=猕猴桃
 item.fruit_lemon.name=柠檬
 item.fruit_lime.name=青柠檬
 item.fruit_mango.name=芒果
@@ -545,7 +545,7 @@ tile.climb_cgrpv.name=葡萄藤
 tile.climb_gldho.name=蛇麻
 tile.climb_hyacb.name=扁豆
 tile.climb_japcr.name=日本爬行藤
-tile.climb_kiwi.name=奇异果
+tile.climb_kiwi.name=猕猴桃
 tile.climb_maidf.name=美国铁线蕨
 tile.climb_porce.name=瓷色浆果
 tile.climb_swpea_blu.name=蓝天鹅甜豌豆

projects/1.12.2/assets/kamen-rider-craft/kamenridercraft4th/lang/zh_cn.lang

@@ -1047,7 +1047,7 @@ item.banana_lockseed.name=香蕉锁种
 item.budou_lockseed.name=葡萄锁种
 item.mango_lockseed.name=芒果锁种
 item.durian_lockseed.name=榴莲锁种
-item.kiwi_lockseed.name=奇异果锁种
+item.kiwi_lockseed.name=猕猴桃锁种
 
 item.sakura_hurricane.name=樱花飓风定锁载具
 item.rose_attacker.name=玫瑰攻击者定锁载具
@@ -1579,7 +1579,7 @@ item.philosophers_stone.name=贤者之石
 item.budou_ryuhou.name=葡萄龙炮
 item.mango_punisher.name=芒果惩戒者
 item.duri_noko.name=榴锯剑
-item.kiwi_gekirin.name=奇异果击轮
+item.kiwi_gekirin.name=猕猴桃击轮
 
 
 item.shine_donkachi.name=闪耀橡金锤

projects/1.16/assets/unionlib/unionlib/lang/zh_cn.json

@@ -15,7 +15,7 @@
   "spell.unionlib.aoe_regeneration.desc": "对自身与周围的队友施加生命恢复效果",
   "death.attack.burningSpikes": "%1$s 在试图伤害 %2$s 时被烧死了。",
   "death.attack.burningSpikes.item": "%1$s 在试图伤害 %2$s 时被 %3$s 烧死了。",
-  "container.fletching": "箭羽装载",
+  "cfpa.conflictnamespace.container.fletching": "箭羽装载",
   "stat.unionlib.spells_casted": "咒术已施放",
   "upgradeableattribute.unionlib.jump_height": "跳跃高度",
   "unionlib.mods.title": "UnionLib 后置模组",

projects/1.18-fabric/assets/unionlib/unionlib/lang/zh_cn.json

@@ -6,7 +6,7 @@
   "spell.unionlib.aoe_regeneration.desc": "对自身与周围的队友施加生命恢复效果",
   "death.attack.burningSpikes": "%1$s 在试图伤害 %2$s 时被烧死了。",
   "death.attack.burningSpikes.item": "%1$s 在试图伤害 %2$s 时被 %3$s 烧死了。",
-  "container.fletching": "箭羽装载",
+  "cfpa.conflictnamespace.container.fletching": "箭羽装载",
   "stat.unionlib.spells_casted": "咒术已施放",
   "upgradeableattribute.unionlib.jump_height": "跳跃高度",
   "unionlib.mods.title": "UnionLib 后置模组",

projects/1.18/assets/brazilian-fields/brazilian_fields/lang/zh_cn.json

@@ -2,15 +2,15 @@
   "advancements.coxinha_dourada_advancement.descr": "金炸鸡肉面包！",
   "advancements.coxinha_dourada_advancement.title": "终极食物",
   "advancements.getriceandbeans.descr": "经典巴西美食",
-  "advancements.getriceandbeans.title": "巴西豆饭",
+  "advancements.getriceandbeans.title": "巴西煮豆",
   "advancements.your_rich.descr": "获得一些雷亚尔币",
   "advancements.your_rich.title": "真金不怕火炼",
   "biome.brazilian_fields.brazilian_city": "巴西都市",
   "biome.brazilian_fields.caatinga": "卡廷加群落",
   "biome.brazilian_fields.ipe_amarelo_plains": "风铃木平原",
-  "block.brazilian_fields.acai_growed": "阿萨伊浆果",
-  "block.brazilian_fields.acai_ice_cream_block": "阿萨伊浆果冰淇淋块",
-  "block.brazilian_fields.acai_palm_heart_log": "阿萨伊棕榈原木",
+  "block.brazilian_fields.acai_growed": "巴西莓",
+  "block.brazilian_fields.acai_ice_cream_block": "巴西莓冰淇淋块",
+  "block.brazilian_fields.acai_palm_heart_log": "巴西莓树原木",
   "block.brazilian_fields.asphalt_holes": "带洞沥青",
   "block.brazilian_fields.asphalt": "沥青",
   "block.brazilian_fields.caatinga_cactus": "卡廷加仙人掌",
@@ -30,7 +30,7 @@
   "block.brazilian_fields.ipe_amarelo_leaves": "黄花风铃木树叶",
   "block.brazilian_fields.mosaic_floor": "马赛克地砖",
   "block.brazilian_fields.mud_water_filter": "泥制过滤器",
-  "block.brazilian_fields.palm_heart_leaves": "阿萨伊棕榈树叶",
+  "block.brazilian_fields.palm_heart_leaves": "巴西莓树树叶",
   "block.brazilian_fields.soccer_ball": "足球",
   "entity.brazilian_fields.anta": "南美貘",
   "entity.brazilian_fields.capybara": "水豚",
@@ -40,11 +40,11 @@
   "entity.brazilian_fields.mico_leao_dourado": "金狮面狨",
   "entity.brazilian_fields.saci": "萨奇·佩雷雷",
   "entity.brazilian_fields.toucan": "巨嘴鸟",
-  "item.brazilian_fields.acai_berry": "阿萨伊浆果",
-  "item.brazilian_fields.acai_chocolate": "阿萨伊浆果巧克力",
-  "item.brazilian_fields.acai_ice_cream": "阿萨伊浆果冰淇淋",
-  "item.brazilian_fields.acai_juice": "阿萨伊浆果汁",
-  "item.brazilian_fields.acai_milkshake": "阿萨伊浆果奶昔",
+  "item.brazilian_fields.acai_berry": "巴西莓",
+  "item.brazilian_fields.acai_chocolate": "巴西莓巧克力",
+  "item.brazilian_fields.acai_ice_cream": "巴西莓冰淇淋",
+  "item.brazilian_fields.acai_juice": "巴西莓汁",
+  "item.brazilian_fields.acai_milkshake": "巴西莓奶昔",
   "item.brazilian_fields.acai_palm_heart_pie": "棕榈心派",
   "item.brazilian_fields.acai_palm_heart": "棕榈心",
   "item.brazilian_fields.anta_spawn_egg": "南美貘刷怪蛋",
@@ -110,7 +110,7 @@
   "item.brazilian_fields.red_slipper_chestplate": "人字拖",
   "item.brazilian_fields.red_slipper_helmet": "人字拖",
   "item.brazilian_fields.red_slipper_leggings": "人字拖",
-  "item.brazilian_fields.rice_and_beans": "巴西豆饭",
+  "item.brazilian_fields.rice_and_beans": "巴西煮豆",
   "item.brazilian_fields.saci_spawn_egg": "萨奇·佩雷雷刷怪蛋",
   "item.brazilian_fields.toucan_spawn_egg": "巨嘴鸟刷怪蛋",
   "item.brazilian_fields.white_slipper_boots": "人字拖",

projects/1.18/assets/unionlib/unionlib/lang/zh_cn.json

@@ -6,7 +6,7 @@
   "spell.unionlib.aoe_regeneration.desc": "对自身与周围的队友施加生命恢复效果",
   "death.attack.burningSpikes": "%1$s 在试图伤害 %2$s 时被烧死了。",
   "death.attack.burningSpikes.item": "%1$s 在试图伤害 %2$s 时被 %3$s 烧死了。",
-  "container.fletching": "箭羽装载",
+  "cfpa.conflictnamespace.container.fletching": "箭羽装载",
   "stat.unionlib.spells_casted": "咒术已施放",
   "upgradeableattribute.unionlib.jump_height": "跳跃高度",
   "unionlib.mods.title": "UnionLib 后置模组",

projects/1.20-fabric/assets/adaptive-tooltips/adaptivetooltips/lang/en_us.json

@@ -0,0 +1,63 @@
+{
+	"yacl3.config.adaptivetooltips:config.category.adaptivetooltips": "Adaptive Tooltips",
+	"yacl3.config.adaptivetooltips:config.category.adaptivetooltips.group.content_manipulation": "Content Manipulation",
+	"yacl3.config.adaptivetooltips:config.category.adaptivetooltips.group.content_manipulation.desc": "This group of options modifies the content of the tooltip.",
+	"yacl3.config.adaptivetooltips:config.wrapText": "Text Wrapping",
+	"yacl3.config.adaptivetooltips:config.wrapText.desc": "How Adaptive Tooltips wraps tooltip text.",
+	"yacl3.config.adaptivetooltips:config.overwriteVanillaWrapping": "Overwrite Vanilla Wrapping",
+	"yacl3.config.adaptivetooltips:config.overwriteVanillaWrapping.desc": "Stop vanilla from applying its own text wrapping to tooltips in the GUI and use AdaptiveTooltip's instead.",
+	"yacl3.config.adaptivetooltips:config.category.adaptivetooltips.group.positioning": "Positioning",
+	"yacl3.config.adaptivetooltips:config.category.adaptivetooltips.group.positioning.desc": "This group of options determines where the tooltip will appear on the screen.",
+	"yacl3.config.adaptivetooltips:config.prioritizeTooltipTop": "Prioritize Tooltip Top",
+	"yacl3.config.adaptivetooltips:config.prioritizeTooltipTop.desc": "When the tooltip height is larger than the screen height, by default, minecraft prioritizes fitting the bottom on the screen, cutting off the top. This option changes that priority to the top, cutting off the bottom.",
+	"adaptivetooltips.opt.prioritize_tooltip_top.warn.align_to_corner": "Prevents vertical check for %s because tooltip never goes above screen.",
+	"yacl3.config.adaptivetooltips:config.bedrockCentering": "Bedrock Centering",
+	"yacl3.config.adaptivetooltips:config.bedrockCentering.desc": "When the tooltip is too long to be rendered on the screen, the tooltip is positioned in the center of the mouse, instead of the left or the right.",
+	"yacl3.config.adaptivetooltips:config.bestCorner": "Align To Corner",
+	"yacl3.config.adaptivetooltips:config.bestCorner.desc": "When all else fails (including bedrock centering) Adaptive Tooltips determines the least obstructive corner to align the tooltip too. Best to be used with screen width text wrapping.",
+	"yacl3.config.adaptivetooltips:config.alwaysBestCorner": "Always Align Corner",
+	"yacl3.config.adaptivetooltips:config.alwaysBestCorner.desc": "Always align to corners, even when it is not needed.",
+	"yacl3.config.adaptivetooltips:config.preventVanillaClamping": "Prevent Vanilla Clamping",
+	"yacl3.config.adaptivetooltips:config.preventVanillaClamping.desc": "As of 1.19.3, Minecraft prevents tooltips from going off the left side of the screen by setting a minimum position of 0. This can make tooltips overlap the hovered element and interfere with AdaptiveTooltips' tweaks.",
+	"yacl3.config.adaptivetooltips:config.onlyRepositionHoverTooltips": "Only Reposition Hover Tooltips",
+	"yacl3.config.adaptivetooltips:config.onlyRepositionHoverTooltips.desc": "As of 1.19.3, Minecraft added two types of tooltip positioning: Hover & Focused. 'Hover' is the old method, 'Focused' places tooltips above or below a button widget. Disabling this setting allows AdaptiveTooltips to reposition all types of positioners, including focused and any other modded ones.",
+	"yacl3.config.adaptivetooltips:config.useYACLTooltipPositioner": "YACL-style GUI Tooltip Position",
+	"yacl3.config.adaptivetooltips:config.useYACLTooltipPositioner.desc": "Use the positioning of YetAnotherConfigLib for all GUI button widgets. (The same position as the tooltip you are reading this in)",
+	"yacl3.config.adaptivetooltips:config.category.adaptivetooltips.group.scrolling": "Scrolling",
+	"adaptivetooltips.group.scrolling.desc": "Controls behavior of the scrolling feature in AdaptiveTooltips.",
+	"adaptivetooltips.label.scrolling_instructions": "Hold %s and scroll while a tooltip is displaying to scroll up and down on it, scroll left and right to move it horizontally. Alternatively, hold %s at the same time to scroll horizontally instead.",
+	"yacl3.config.adaptivetooltips:config.smoothScrolling": "Smooth Scrolling",
+	"yacl3.config.adaptivetooltips:config.smoothScrolling.desc": "Tooltip scrolling appears smooth, instead of instant.",
+	"yacl3.config.adaptivetooltips:config.scrollDirection": "Scroll Direction",
+	"yacl3.config.adaptivetooltips:config.scrollDirection.desc": "Which direction tooltip scrolling goes in.",
+	"yacl3.config.adaptivetooltips:config.verticalScrollSensitivity": "Vertical Scroll Sensitivity",
+	"yacl3.config.adaptivetooltips:config.verticalScrollSensitivity.desc": "Amount of pixels to move the tooltip vertically per scroll step.",
+	"yacl3.config.adaptivetooltips:config.horizontalScrollSensitivity": "Horizontal Scroll Sensitivity",
+	"yacl3.config.adaptivetooltips:config.horizontalScrollSensitivity.desc": "Amount of pixels to move the tooltip horizontal per scroll step.",
+	"yacl3.config.adaptivetooltips:config.category.adaptivetooltips.group.style": "Style",
+	"yacl3.config.adaptivetooltips:config.category.adaptivetooltips.group.style.desc": "Options that modify how tooltips look.",
+	"yacl3.config.adaptivetooltips:config.tooltipTransparency": "Tooltip Transparency",
+	"yacl3.config.adaptivetooltips:config.tooltipTransparency.desc": "Modifies the transparency of tooltips by a percentage.",
+	"yacl3.config.adaptivetooltips:config.removeFirstLinePadding": "Remove First Line Padding",
+	"yacl3.config.adaptivetooltips:config.removeFirstLinePadding.desc": "Removes the extra 2 pixels of line padding from the first line of the tooltip.",
+	"adaptivetooltips.wrap_text_behaviour.off": "Off",
+	"adaptivetooltips.wrap_text_behaviour.off.desc": "Applies no wrapping to tooltips.",
+	"adaptivetooltips.wrap_text_behaviour.screen_width": "Screen width",
+	"adaptivetooltips.wrap_text_behaviour.screen_width.desc": "Wraps tooltips based on how wide the screen is. Designed to be paired with 'Bedrock Centering' option.",
+	"adaptivetooltips.wrap_text_behaviour.remaining_width": "Remaining width",
+	"adaptivetooltips.wrap_text_behaviour.remaining_width.desc": "Wraps tooltips based on amount of space left until the edge of the screen.",
+	"adaptivetooltips.wrap_text_behaviour.remaining_width.warning": "Only works with hover tooltip positioners! For more details see description of 'Only Reposition Hover Tooltips'.",
+	"adaptivetooltips.wrap_text_behaviour.half_screen_width": "Half screen width",
+	"adaptivetooltips.wrap_text_behaviour.half_screen_width.desc": "Wraps tooltips with the max width of half of the screen width, so tooltips can at most, only fill half of your screen horizontally.",
+	"adaptivetooltips.wrap_text_behaviour.smart": "Smart",
+	"adaptivetooltips.wrap_text_behaviour.smart.desc": "Wraps lines that are considerably longer than the others, with a hard limit of 3/4 of the screen width.",
+	"adaptivetooltips.scroll_direction.reverse": "Reverse (Windows)",
+	"adaptivetooltips.scroll_direction.natural": "Natural (macOS)",
+	"adaptivetooltips.format.pixels": "%s pixels",
+	"adaptivetooltips.format.vanilla": "Vanilla",
+	"yacl3.config.adaptivetooltips:config.scrollKeyCode": "Enable Tooltip Scrolling",
+	"yacl3.config.adaptivetooltips:config.horizontalScrollKeyCode": "Enable Horizontal Scrolling",
+	"adaptivetooltips.gui.awaiting_key": "Press a key",
+	"adaptivetooltips.gui.require_opt.on": "Requires '%s' to be enabled.",
+	"adaptivetooltips.gui.require_opt.off": "Requires '%s' to be disabled."
+}