Skip to content

Commit

Permalink
Merge branch 'CFPAOrg:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Catchmons authored Feb 2, 2023
2 parents 25b55a3 + b65bb8c commit 9991635
Show file tree
Hide file tree
Showing 46 changed files with 4,539 additions and 141 deletions.
10 changes: 10 additions & 0 deletions projects/1.12.2/assets/dynamistics/dynamistics/lang/en_us.lang
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
dynamistics.category.title.ae2.pattern.crafting_substitute=Crafting Pattern
dynamistics.category.title.ae2.pattern.crafting_nonsubstitute=Crafting Pattern
dynamistics.category.title.ae2.pattern.processing=Processing Pattern
dynamistics.category.title.pauto.unpackage=Unpackaging
dynamistics.category.title.pauto.package=Packaging
dynamistics.category.title.pauto.process=Package Processing
dynamistics.category.title.pauto.holder=Packaged Recipe

dynamistics.recipe.text.package_processing_extra=Recipe %s:
dynamistics.recipe.text.show_jei_categories=Show Recipes
11 changes: 11 additions & 0 deletions projects/1.12.2/assets/dynamistics/dynamistics/lang/zh_cn.lang
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
dynamistics.category.title.ae2.pattern.crafting_substitute=合成样板
dynamistics.category.title.ae2.pattern.crafting_nonsubstitute=合成样板
dynamistics.category.title.ae2.pattern.processing=处理样板
dynamistics.category.title.pauto.unpackage=解包
dynamistics.category.title.pauto.package=打包
dynamistics.category.title.pauto.process=打包处理配方
dynamistics.category.title.pauto.holder=打包合成配方

dynamistics.recipe.text.package_processing_extra=配方%s:

dynamistics.recipe.text.show_jei_categories=查看配方
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
< en_US.lang - English localization file for the mod ToolProgression >

item.toolprogression.magic_mushroom.name=Magic™ Mushroom

modifier.magicmushroom.name=Magic™ Mushroom
modifier.magicmushroom.desc=This amazing mushroom can magically increase the capabilities of your tools.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
< en_US.lang - English localization file for the mod ToolProgression >

item.toolprogression.magic_mushroom.name=魔法™蘑菇

modifier.magicmushroom.name=魔法™蘑菇
modifier.magicmushroom.desc=这种神奇的蘑菇可以神奇地提高你的工具的能力。
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
"block.exlinefurniture.gravestone": "墓碑",

"block.exlinefurniture.skeleton_doll": "骷髅玩偶",
"block.exlinefurniture.wither_skeleton_doll": "凋零骷髅玩偶",
"block.exlinefurniture.wither_skeleton_doll": "凋灵骷髅玩偶",
"block.exlinefurniture.spider_doll": "蜘蛛玩偶",
"block.exlinefurniture.cave_spider_doll": "洞穴蜘蛛玩偶",

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[1]": "邻接于树干时会有何事发生。",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[2]": "",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[3]": "STOP_ALL:完全 ",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[4]": "阻止树木一键砍伐。'",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[4]": "阻止树木一键砍伐。",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[5]": "",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[6]": "STOP_BRANCH:阻止方块邻接的原木所在的 ",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[7]": "分枝,但仍然会砍伐树的其余部分,",
Expand Down Expand Up @@ -104,7 +104,7 @@
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[0]": "强制破坏树叶的半径。如果另一棵树",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[1]": "还拥有树叶则也会被一并破坏。",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[2]": "如果树叶是玩家放置的",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[3]": "则也会被摧毁。'",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[3]": "则也会被摧毁。",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[4]": "半径设定为以树顶的其中一个方块为中心。",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[5]": "",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[6]": "信息:要使该选项生效,树叶破坏选项必须开启。",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
"block.exlinefurniture.gravestone": "墓碑",

"block.exlinefurniture.skeleton_doll": "骷髅玩偶",
"block.exlinefurniture.wither_skeleton_doll": "凋零骷髅玩偶",
"block.exlinefurniture.wither_skeleton_doll": "凋灵骷髅玩偶",
"block.exlinefurniture.spider_doll": "蜘蛛玩偶",
"block.exlinefurniture.cave_spider_doll": "洞穴蜘蛛玩偶",

Expand Down
4 changes: 2 additions & 2 deletions projects/1.16/assets/falling-tree/fallingtree/lang/zh_cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[1]": "邻接于树干时会有何事发生。",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[2]": "",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[3]": "STOP_ALL:完全 ",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[4]": "阻止树木一键砍伐。'",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[4]": "阻止树木一键砍伐。",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[5]": "",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[6]": "STOP_BRANCH:阻止方块邻接的原木所在的 ",
"text.autoconfig.fallingtree.option.trees.adjacentStopMode.@Tooltip[7]": "分枝,但仍然会砍伐树的其余部分,",
Expand Down Expand Up @@ -104,7 +104,7 @@
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[0]": "强制破坏树叶的半径。如果另一棵树",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[1]": "还拥有树叶则也会被一并破坏。",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[2]": "如果树叶是玩家放置的",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[3]": "则也会被摧毁。'",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[3]": "则也会被摧毁。",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[4]": "半径设定为以树顶的其中一个方块为中心。",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[5]": "",
"text.autoconfig.fallingtree.option.trees.leavesBreakingForceRadius.@Tooltip[6]": "信息:要使该选项生效,树叶破坏选项必须开启。",
Expand Down
20 changes: 10 additions & 10 deletions projects/1.16/assets/productivebees/productivebees/lang/zh_cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"advancements.husbandry.honeylogged.title": "双重打击!",
"advancements.husbandry.nest_locator.description": "制作一个蜂巢定位器",
"advancements.husbandry.nest_locator.title": "找到嗡嗡声了。",
"advancements.husbandry.overworld_nest.description": "获取或制作一个孤单蜂巢",
"advancements.husbandry.overworld_nest.title": "孤单",
"advancements.husbandry.overworld_nest.description": "获取或制作一个独居蜜蜂蜂巢",
"advancements.husbandry.overworld_nest.title": "独居",
"advancements.husbandry.professional_bee.description": "培育牧场蜜蜂、农民蜜蜂、伐木蜜蜂或采石场蜜蜂。",
"advancements.husbandry.professional_bee.title": "我是一只特别的小蜜蜂",
"advancements.husbandry.quartz_nest.description": "制作或获取到一个下界石英蜂巢。",
Expand Down Expand Up @@ -140,7 +140,7 @@
"block.productivebees.comb_manasteel": "魔力钢蜜脾块",
"block.productivebees.comb_manyullyn": "玛玉灵蜜脾块",
"block.productivebees.comb_menril": "门瑞欧蜜脾块",
"block.productivebees.comb_milky": "牛奶蜜脾块",
"block.productivebees.comb_milky": "奶蜜脾块",
"block.productivebees.comb_netherite": "远古蜜脾块",
"block.productivebees.comb_nickel": "镍蜜脾块",
"block.productivebees.comb_niter": "硝石蜜脾块",
Expand All @@ -164,7 +164,7 @@
"block.productivebees.comb_resonant_ender": "熔融谐振末影珍珠蜜脾块",
"block.productivebees.comb_rose_gold": "玫瑰金蜜脾块",
"block.productivebees.comb_rotten": "腐烂蜜脾块",
"block.productivebees.comb_ruby": "橡胶蜜脾块",
"block.productivebees.comb_ruby": "红宝石蜜脾块",
"block.productivebees.comb_sapphire": "蓝宝石蜜脾块",
"block.productivebees.comb_signalum": "信素蜜脾块",
"block.productivebees.comb_silicon": "硅蜜脾块",
Expand Down Expand Up @@ -402,7 +402,7 @@
"entity.productivebees.rock_crystal_bee": "水晶石蜜蜂",
"entity.productivebees.rose_gold_bee": "玫瑰金蜜蜂",
"entity.productivebees.rose_quartz_bee": "玫瑰石英蜜蜂",
"entity.productivebees.ruby_bee": "橡胶蜜蜂",
"entity.productivebees.ruby_bee": "红宝石蜜蜂",
"entity.productivebees.sapphire_bee": "蓝宝石蜜蜂",
"entity.productivebees.signalum_bee": "信素蜜蜂",
"entity.productivebees.silicon_bee": "硅蜜蜂",
Expand Down Expand Up @@ -515,7 +515,7 @@
"item.productivebees.honeycomb_manasteel": "魔力钢蜜脾",
"item.productivebees.honeycomb_manyullyn": "玛玉灵蜜脾",
"item.productivebees.honeycomb_menril": "门瑞欧蜜脾",
"item.productivebees.honeycomb_milky": "牛奶蜜脾",
"item.productivebees.honeycomb_milky": "奶蜜脾",
"item.productivebees.honeycomb_netherite": "远古蜜脾",
"item.productivebees.honeycomb_nickel": "镍蜜脾",
"item.productivebees.honeycomb_niter": "硝石蜜脾",
Expand All @@ -539,7 +539,7 @@
"item.productivebees.honeycomb_resonant_ender": "熔融谐振末影珍珠蜜脾",
"item.productivebees.honeycomb_rose_gold": "玫瑰金蜜脾",
"item.productivebees.honeycomb_rotten": "腐烂蜜脾",
"item.productivebees.honeycomb_ruby": "橡胶蜜脾",
"item.productivebees.honeycomb_ruby": "红宝石蜜脾",
"item.productivebees.honeycomb_sapphire": "蓝宝石蜜脾",
"item.productivebees.honeycomb_signalum": "信素蜜脾",
"item.productivebees.honeycomb_silicon": "硅蜜脾",
Expand Down Expand Up @@ -569,7 +569,7 @@
"item.productivebees.honeycomb_vibranium": "振金蜜脾",
"item.productivebees.honeycomb_withered": "凋灵蜜脾",
"item.productivebees.honeycomb_zinc": "锌蜜脾",
"item.productivebees.milk_bottle": "牛奶",
"item.productivebees.milk_bottle": "",
"item.productivebees.nest_locator": "蜂巢定位器",
"item.productivebees.spawn_egg_ashy_mining_bee": "灰烬开采蜜蜂刷怪蛋",
"item.productivebees.spawn_egg_blue_banded_bee": "蓝条纹蜜蜂刷怪蛋",
Expand Down Expand Up @@ -653,7 +653,7 @@
"productivebees.information.attribute.temper.passive": "消极",
"productivebees.information.attribute.type": "类型:%s",
"productivebees.information.attribute.type.hive": "蜂箱",
"productivebees.information.attribute.type.solitary": "孤独",
"productivebees.information.attribute.type.solitary": "独居",
"productivebees.information.attribute.weather_tolerance": "天气耐受性: %s",
"productivebees.information.attribute.weather_tolerance.any": "任何",
"productivebees.information.attribute.weather_tolerance.none": "",
Expand Down Expand Up @@ -719,7 +719,7 @@
"productivebees.ingredient.description.only_spawnegg": "要获得这只蜜蜂,请查阅其刷怪蛋的制作配方。",
"productivebees.ingredient.description.skeletal": "确保你的蜂箱照明良好,防止这家伙搬进来。",
"productivebees.ingredient.description.sugarbag": "这种温暖湿润的小蜜蜂可以在热带地区找到。它生产一种特殊类型的超级美味蜜脾。即使在可可豆的自然气候之外种植,它也能找到进入可可豆的途径。",
"productivebees.ingredient.description.ruby": "你还可以搜索橡胶.",
"productivebees.ingredient.description.ruby": "你仍可以搜索红宝石。",
"productivebees.ingredient.description.spacial": "这种蜜蜂的蜜脾可以离心分离来得到需要进一步加工的赛特斯石英种子。",
"productivebees.ingredient.description.slimy_nest": "吸引野生黏滑蜜蜂。蜂巢必须放在沼泽生物群系中。",
"productivebees.ingredient.description.snow_nest": "原生于更寒冷区域的蜜蜂会被这个蜂巢吸引。为了吸引蜜蜂,蜂巢必须要放在寒冷生物群系。",
Expand Down
13 changes: 13 additions & 0 deletions projects/1.16/assets/your-ideas/yourideas/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"item.minecraft.potion.effect.levitation_potion" : "Levitation Potion",
"item.minecraft.splash_potion.effect.levitation_potion" : "Splash Potion of Levitation",
"item.minecraft.lingering_potion.effect.levitation_potion" : "Lingering Potion of Levitation",
"item.minecraft.tipped_arrow.effect.levitation_potion" : "Arrow of Levitation",
"itemGroup.yourideas" : "Your Ideas",
"item.yourideas.dragon_charge" : "Dragon Charge",
"item.yourideas.bat_tooth" : "Bat Tooth",
"item.yourideas.iron_spear_of_siphon" : "Iron Spear of Siphon",
"item.yourideas.diamond_spear_of_siphon" : "Diamond Spear of Siphon",
"item.yourideas.netherite_spear_of_siphon" : "Netherite Spear of Siphon",
"item.yourideas.emerald_spear_of_siphon" : "Emerald Spear of Siphon"
}
13 changes: 13 additions & 0 deletions projects/1.16/assets/your-ideas/yourideas/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"item.minecraft.potion.effect.levitation_potion" : "飘浮药水",
"item.minecraft.splash_potion.effect.levitation_potion" : "喷溅型飘浮药水",
"item.minecraft.lingering_potion.effect.levitation_potion" : "滞留型飘浮药水",
"item.minecraft.tipped_arrow.effect.levitation_potion" : "飘浮之箭",
"itemGroup.yourideas" : "你的想法",
"item.yourideas.dragon_charge" : "末影龙弹",
"item.yourideas.bat_tooth" : "蝙蝠牙齿",
"item.yourideas.iron_spear_of_siphon" : "铁虹吸之矛",
"item.yourideas.diamond_spear_of_siphon" : "钻石虹吸之矛",
"item.yourideas.netherite_spear_of_siphon" : "下界合金虹吸之矛",
"item.yourideas.emerald_spear_of_siphon" : "绿宝石虹吸之矛"
}
Loading

0 comments on commit 9991635

Please sign in to comment.