Merge branch 'CFPAOrg:main' into main

projects/1.12.2/assets/compact-void-miners/compactvoidminers/lang/en_us.lang

@@ -17,4 +17,4 @@ item.item_filter.11.name=OreDictionary Filter: rod
 item.item_filter.12.name=OreDictionary Filter: stick
 item.item_filter.13.name=OreDictionary Filter: crop
 item.item_filter.14.name=OreDictionary Filter: dust
-item.item_filter.15.name=OreDictionary Filter: stone
+item.item_filter.15.name=OreDictionary Filter: stone

projects/1.12.2/assets/compact-void-miners/compactvoidminers/lang/zh_cn.lang

@@ -17,4 +17,4 @@ item.item_filter.11.name=矿辞过滤卡：棒/杆/手柄
 item.item_filter.12.name=矿辞过滤卡：棍/杆
 item.item_filter.13.name=矿辞过滤卡：作物
 item.item_filter.14.name=矿辞过滤卡：粉
-item.item_filter.15.name=矿辞过滤卡：石头
+item.item_filter.15.name=矿辞过滤卡：石头

projects/1.12.2/assets/forestry/forestry/lang/zh_cn.lang

@@ -1 +1 @@
-tile.forestry.fluid.bio.ethanol.name=乙醇
+tile.forestry.fluid.bio.ethanol.name=乙醇

projects/1.12.2/assets/rockhounding-fluid-pipeline/rockhounding_pipeline/lang/en_us.lang

@@ -25,4 +25,4 @@ label.rockhounding_pipeline:descr.void=Void Tank. Content will be lost
 label.rockhounding_pipeline:descr.speed=Speed Upgrade
 label.rockhounding_pipeline:descr.refractory=Refractory Upgrade
 label.rockhounding_pipeline:descr.insulation=Insulation Upgrade
-label.rockhounding_pipeline:descr.casing=Casing Upgrade
+label.rockhounding_pipeline:descr.casing=Casing Upgrade

projects/1.12.2/assets/rockhounding-fluid-pipeline/rockhounding_pipeline/lang/zh_cn.lang

@@ -24,4 +24,4 @@ label.rockhounding_pipeline:descr.void=清空（内容物将会丢失）
 label.rockhounding_pipeline:descr.speed=速度升级
 label.rockhounding_pipeline:descr.refractory=耐火升级
 label.rockhounding_pipeline:descr.insulation=绝缘升级
-label.rockhounding_pipeline:descr.casing=套管升级
+label.rockhounding_pipeline:descr.casing=套管升级

projects/1.12.2/assets/thaumic-energistics/thaumicenergistics/lang/zh_cn.lang

@@ -13,7 +13,7 @@ item.thaumicenergistics.essentia_cell_16k.name=16k-ME源质存储元件
 item.thaumicenergistics.essentia_cell_1k.name=1k-ME源质存储元件
 item.thaumicenergistics.essentia_cell_4k.name=4k-ME源质存储元件
 item.thaumicenergistics.essentia_cell_64k.name=64k-ME源质存储元件
-item.thaumicenergistics.essentia_cell_creative.name=ME源质存储外壳
+item.thaumicenergistics.essentia_cell_creative.name=创造型ME源质存储元件
 item.thaumicenergistics.essentia_component_16k.name=16k-ME源质存储组件
 item.thaumicenergistics.essentia_component_1k.name=1k-ME源质存储组件
 item.thaumicenergistics.essentia_component_4k.name=4k-ME源质存储组件

projects/1.12.2/assets/tinker-toolcasts/tinkertoolcasts/lang/en_us.lang

@@ -44,3 +44,15 @@ item.cast_creative.2.name=§dCreative gem cast
 item.cast_creative.3.name=§dCreative plate cast
 item.cast_creative.4.name=§dCreative gear cast
 item.cast_creative.tooltip=Casting time decreased by §d%s%%
+
+item.debug_lava.name=§dDebug lava bucket
+item.debug_lava.tooltip=§eImmediately fills smeltery tank
+item.debug_lava.tooltip_creative=§c§oYou can use this item only in Creative mode!
+
+tile.tank_advanced.name=§eAdvanced fuel tank
+tile.tank_reinforced.name=§9Reinforced fuel tank
+tile.tank_iridium.name=§bIridium fuel tank
+tile.tank_ultimate.name=§cUltimate fuel tank
+tile.tank_creative.name=§dCreative fuel tank
+tile.tank.tooltip=§7Tank: §6%s§7 (§e%d§7/§e%d§7)
+tile.tank.tooltip.creative=§dSmeltery won't consume fuel from this tank!

projects/1.12.2/assets/tinker-toolcasts/tinkertoolcasts/lang/zh_cn.lang

@@ -44,3 +44,15 @@ item.cast_creative.2.name=§d创造宝石铸模
 item.cast_creative.3.name=§d创造板铸模
 item.cast_creative.4.name=§d创造齿轮铸模
 item.cast_creative.tooltip=将铸造时间缩短§d%s%%
+
+item.debug_lava.name=§d调试用熔岩桶
+item.debug_lava.tooltip=§e立即装满焦黑储罐
+item.debug_lava.tooltip_creative=§c§o你只能在创造模式下使用此物品！
+
+tile.tank_advanced.name=§e进阶燃料罐
+tile.tank_reinforced.name=§9强化燃料罐
+tile.tank_iridium.name=§b铱金燃料罐
+tile.tank_ultimate.name=§c终极燃料罐
+tile.tank_creative.name=§d创造燃料罐
+tile.tank.tooltip=§7储罐： §6%s§7 (§e%d§7/§e%d§7)
+tile.tank.tooltip.creative=§d冶炼炉不会消耗这个储罐的燃料！

projects/1.12.2/assets/zen-summoning/zensummoning/lang/zh_cn.lang

@@ -1,9 +1,15 @@
 tile.altar.name=召唤祭坛
-chat.zensummoning.success=祭坛愉快的发出悦耳的嗡嗡声。
-chat.zensummoning.busy=祭坛繁忙。
-chat.zensummoning.no_match=祭坛不知道你想要什么。
-chat.zensummoning.unsatisfied=祭坛不满意。
+itemGroup.zensummoning=Zen 召唤祭坛
+chat.zensummoning.success=祭坛发出愉快的嗡嗡声。
+chat.zensummoning.busy=祭坛正在工作。
+chat.zensummoning.no_match=祭坛不知道你在渴望什么。
+chat.zensummoning.unsatisfied=祭坛不满足你的祭品。
+chat.zensummoning.unsatisfied_hand=祭坛对你的祭品不满意。
+chat.zensummoning.unknown_error=发生未知错误，无法执行预期的召唤。
 jei.zensummoning.recipe.altar=召唤祭坛
+jei.zensummoning.catalyst.lore=待所有祭品都在祭坛上后按住Shift并右击祭坛即可开始
+jei.zensummoning.recipe.altar.isCatalystConsumed=消耗物品：%1$s
+jei.zensummoning.recipe.altar.weight=概率：%f
 jei.zensummoning.recipe.altar.entity=%1$dx%2$s
-jei.zensummoning.catalyst.lore=将其他需要的物品都放入祭坛之后，手持这个物品Shift右击祭坛开始召唤
-itemGroup.zensummoning=禅宗召唤
+itemGroup.zensummoning=Zen 召唤祭坛
+# numbered parameters here for example, #xname, 1xOcelo

projects/1.12.2/assets/zenscroll/zenscroll/lang/en_us.lang

@@ -0,0 +1,13 @@
+zenscroll.config.modifierKey=Modifier Key
+zenscroll.config.reversed=Reversed
+zenscroll.config.enabled=Enabled
+
+zenscroll.tooltip=%s-scroll to cycle
+
+zenscroll.options.modifier_key=Scroll Modifier Key
+
+zenscroll.jei.notBound=No ZenScroll modifier key bound
+zenscroll.jei.creativeOnly=%s-scroll to cycle in creative
+zenscroll.jei.scroll.title=Scrolling
+
+zenscroll.kick.uCheatin=Invalid scroll packet, u cheatin?

projects/1.12.2/assets/zenscroll/zenscroll/lang/zh_cn.lang

@@ -0,0 +1,13 @@
+zenscroll.config.modifierKey=修饰键
+zenscroll.config.reversed=逆转
+zenscroll.config.enabled=启用
+
+zenscroll.tooltip=%s-滚动以循环
+
+zenscroll.options.modifier_key=滚动修饰键
+
+zenscroll.jei.notBound=未绑定ZenScroll修饰键
+zenscroll.jei.creativeOnly=%s-创造模式下滚动以循环
+zenscroll.jei.scroll.title=滚动
+
+zenscroll.kick.uCheatin=无效的滚动数据包，你在作弊？

projects/1.16/assets/avaritia-lite/avaritia/lang/en_us.json

@@ -29,7 +29,7 @@
   "item.avaritia.infinity_armor_boots": "§cInfinity Boots§r",
   "item.avaritia.neutronium_ingot": "Neutronium Ingot",
   "item.avaritia.neutronium_nugget": "Neutronium Nugget",
-  "item.avaritia.natures_ruin": "§cNature\u0027s Ruin§r",
+  "item.avaritia.natures_ruin": "§cNature's Ruin§r",
   "block.avaritia.crystal_matrix": "Crystal Matrix",
   "item.avaritia.infinity_catalyst": "Infinity Catalyst",
   "item.avaritia.lapis_singularity": "Lapis Singularity",

projects/1.16/assets/botania-additions/botaniaadditions/lang/en_us.json

@@ -1,22 +1,18 @@
 {
   "itemGroup.botaniaadditions": "Botania Additions",
   "botaniaadditions.hasRegenIvy": "Has Timeless Ivy",
-
   "item.botaniaadditions.terra_shovel": "Terra Harvester",
   "item.botaniaadditions.regen_ivy": "Timeless Ivy",
   "item.botaniaadditions.terra_bow": "Terra Bow",
-
   "botaniaadditions.entry.terraShovel": "Terra Harvester",
   "botaniaadditions.tagline.terraShovel": "The Terra Shatterer as a Shovel, but weaker.",
   "botaniaadditions.page.terraShovel0": "The $(item)Terra Harvester$(0) is a shovel made from $(l:basics/terrasteel)$(item)Terrasteel$(0)$(/l) that can break an area of 5x5 blocks at the cost of $(thing)Mana$(0).$(p)It can also create paths or farmland in that same area and it can fertilize crops for $(thing)Mana$(0).$(p)The area of effect of this item can be increased by a $(l:alfhomancy/thor_ring)$(item)Ring of Thor$(0)$(/l), it can also be decreased by a $(l:tools/temperance_stone)$(item)Stone of Temperance$(0)$(/l) and is disabled while sneaking.",
   "botaniaadditions.page.terraShovel1": "Harvest the World",
-
   "botaniaadditions.entry.regenIvy": "Timeless Ivy",
   "botaniaadditions.tagline.regenIvy": "Ivy that can be attached to items to have them regenerate durability",
   "botaniaadditions.page.regenIvy0": "While $(l:mana/pool)$(item)Manasteel$(0)$(/l), $(l:alfhomancy/elf_resources)$(item)Elementium$(0)$(/l) and $(l:basics/terrasteel)$(item)Terrasteel$(0)$(/l) tools have the ability to harness $(thing)Mana$(0) and use it to protect their bodies, other tools or armor don't have this property.$(p)A handful of $(item)Timeless Ivy$(0) can be attached on to virtually any item, allowing it to be repaired with $(thing)Mana$(0).",
   "botaniaadditions.page.regenIvy1": "To apply it, one'd simply craft the tool in question alongside the ivy and 3 of an item that can be used to repair the tool in an anvil (eg. $(item)Diamonds$(0) for a $(item)Diamond Pickaxe$(0)).<br>Due to not being in direct contact with the material, the amount of $(thing)Mana$(0) used by the ivy in comparison to $(l:mana/pool)$(item)Manasteel$(0)$(/l) is rather high.",
   "botaniaadditions.page.regenIvy2": "Bring your Inferno Adze",
-
   "botaniaadditions.entry.terraBow": "Terra Bow",
   "botaniaadditions.tagline.terraBow": "A great bow made from Terrasteel and Livingwood",
   "botaniaadditions.page.terraBow0": "The $(item)Terra Bow$(0) is a great Bow made from $(l:basics/terrasteel)$(item)Terrasteel$(0)$(/l) and $(l:basics/pure_daisy)$(item)Living Wood$(0)$(/l) that can shoot an array of 3x3 of your $(item)Arrows$(0) at once without removing any from your inventory, at the cost of some mana.",

projects/1.16/assets/botania-additions/botaniaadditions/lang/zh_cn.json

@@ -1,22 +1,18 @@
 {
   "itemGroup.botaniaadditions": "植物魔法附加",
   "botaniaadditions.hasRegenIvy": "有永恒常春藤",
-
   "item.botaniaadditions.terra_shovel": "泰拉收割者",
   "item.botaniaadditions.regen_ivy": "永恒常春藤",
   "item.botaniaadditions.terra_bow": "泰拉弓",
-
   "botaniaadditions.entry.terraShovel": "泰拉收割者",
   "botaniaadditions.tagline.terraShovel": "作为铲子，泰拉收割者并没有那么强大。",
   "botaniaadditions.page.terraShovel0": "$(item)泰拉收割者$(0)是由$(l:basics/terrasteel)$(item)泰拉钢$(0)$(/l)制成的锹，可以通过消耗$(thing)魔力$(0)破坏 5x5 区域的方块。$(p)它也能在同样大小内创造草径或开垦耕地，并且它还能通过消耗$(thing)魔力$(0)来催生农作物。$(p)$(l:alfhomancy/thor_ring)$(item)托尔之戒$(0)$(/l)可以提升该物品的作用范围，$(l:tools/temperance_stone)$(item)节制之石$(0)$(/l)则可以减少其范围。可以通过潜行来关闭范围破坏功能。",
   "botaniaadditions.page.terraShovel1": "收割世界",
-
   "botaniaadditions.entry.regenIvy": "永恒常春藤",
   "botaniaadditions.tagline.regenIvy": "附着在物品上可恢复耐久的常春藤",
   "botaniaadditions.page.regenIvy0": "尽管$(l:mana/pool)$(item)魔钢$(0)$(/l)、$(l:alfhomancy/elf_resources)$(item)源质钢$(0)$(/l)和$(l:basics/terrasteel)$(item)泰拉钢$(0)$(/l)工具能用$(thing)魔力$(0)保护自身，其他的工具和盔甲却没有这种能力。$(p)可以给几乎所有物品附上一些$(item)永恒常春藤$(0)，使它们能用$(thing)魔力$(0)修复。",
   "botaniaadditions.page.regenIvy1": "使用的话，只需将常春藤和目标工具，以及3个在铁砧上修理该工具的材料(比如$(item)钻石镐$(0)用的就是$(item)钻石$(0))。$(p)由于没有直接连接到材料，这样消耗的$(thing)魔力$(0)比起$(l:mana/pool)$(item)魔钢$(0)$(/l)的会多很多。",
   "botaniaadditions.page.regenIvy2": "带上你的炼狱扁斧",
-
   "botaniaadditions.entry.terraBow": "泰拉弓",
   "botaniaadditions.tagline.terraBow": "由泰拉钢和活木制成的更加优秀的弓",
   "botaniaadditions.page.terraBow0": "$(item)泰拉弓$(0)是由$(l:basics/terrasteel)$(item)泰拉钢$(0)$(/l)和$(l:basics/pure_daisy)$(item)活木$(0)$(/l)制成的优质弓，它可以在不消耗背包中$(item)箭矢$(0)的情况下射出一组3x3的箭，但这需要消耗一些魔力。",

projects/1.16/assets/construction-wand/constructionwand/lang/en_us.json

@@ -5,20 +5,17 @@
   "item.constructionwand.infinity_wand": "Infinity Wand",
   "item.constructionwand.core_angel": "Angel Wand Core",
   "item.constructionwand.core_destruction": "Destruction Wand Core",
-
   "constructionwand.tooltip.blocks": "Max. %d blocks",
   "constructionwand.tooltip.shift": "Press [SHIFT]",
   "constructionwand.tooltip.cores": "Wand cores:",
   "constructionwand.tooltip.core_tip": "Combine the core with your wand in a crafting grid",
-
   "constructionwand.option.cores": "",
   "constructionwand.option.cores.constructionwand:default": "Construction Core",
   "constructionwand.option.cores.constructionwand:default.desc": "Extend your building on the side facing you",
   "constructionwand.option.cores.constructionwand:core_angel": "§6Angel Core",
   "constructionwand.option.cores.constructionwand:core_angel.desc": "Place behind blocks and in mid air",
   "constructionwand.option.cores.constructionwand:core_destruction": "§cDestruction Core",
   "constructionwand.option.cores.constructionwand:core_destruction.desc": "Destroys blocks on the side facing you",
-
   "constructionwand.option.lock": "Restriction: ",
   "constructionwand.option.lock.horizontal": "§aLeft/Right",
   "constructionwand.option.lock.horizontal.desc": "Build a horizontal column in front of the original block",
@@ -30,33 +27,28 @@
   "constructionwand.option.lock.eastwest.desc": "Build a row in E/W direction on top of the original block",
   "constructionwand.option.lock.nolock": "§cNone",
   "constructionwand.option.lock.nolock.desc": "Extend from any side of the original block",
-
   "constructionwand.option.direction": "Direction: ",
   "constructionwand.option.direction.target": "§6Target",
   "constructionwand.option.direction.target.desc": "Place blocks with same direction as target block",
   "constructionwand.option.direction.player": "§aPlayer",
   "constructionwand.option.direction.player.desc": "Place blocks facing the player",
-
   "constructionwand.option.replace": "Replacement: ",
   "constructionwand.option.replace.yes": "§aYes",
   "constructionwand.option.replace.yes.desc": "Replace certain blocks like fluids, snow and tallgrass",
   "constructionwand.option.replace.no": "§cNo",
   "constructionwand.option.replace.no.desc": "Don't replace blocks",
-
   "constructionwand.option.match": "Matching: ",
   "constructionwand.option.match.exact": "§aExact",
   "constructionwand.option.match.exact.desc": "Only extend blocks that are exactly the same",
   "constructionwand.option.match.similar": "§6Similar",
   "constructionwand.option.match.similar.desc": "Treat similar blocks (dirt/grass types) equally",
   "constructionwand.option.match.any": "§cAny",
   "constructionwand.option.match.any.desc": "Extend any block",
-
   "constructionwand.option.random": "Random: ",
   "constructionwand.option.random.yes": "§aYes",
   "constructionwand.option.random.yes.desc": "Place random blocks present in your hotbar",
   "constructionwand.option.random.no": "§cNo",
   "constructionwand.option.random.no.desc": "Don't randomize placed blocks",
-
   "constructionwand.description.wand": "The %1$s can place up to %2$d blocks at the side of a building facing you and lasts %3$s.\n\nHold down %5$s and scroll to change placement restriction (Horizontal, Vertical, North/South, East/West, No lock).\n\nOpen the option screen with %6$s§9+Right click§0.\n\n§5§nUNDO§0§r\nHolding down §9Sneak+§0%4$s while looking at a blocks will show you the last blocks you placed with a green border around them. §9Sneak+§0%4$s§9+Right clicking§0 any of them will undo the operation, giving you all the items back. If you used the Destruction core, it will restore the blocks.\n\n§5§nCONTAINERS§0§r\nShulker boxes, bundles and many containers from other mods can provide building blocks for the wand.\n\n§5§nOFFHAND PRIORITY§0§r\nHaving blocks in your offhand will place them instead of the block you're looking at.",
   "constructionwand.description.durability.limited": "for %d blocks",
   "constructionwand.description.durability.unlimited": "forever",
@@ -65,6 +57,5 @@
   "constructionwand.description.core": "§5§nINSTALLATION§0§r\nPut your new core together with your wand in a crafting grid to install it. To switch between cores, hold down %s and left click empty space with your wand or use the option screen.",
   "constructionwand.description.core_angel": "The angel core places a block on the opposite side of the block (or row of blocks) you are facing. Maximum distance depends on wand tier. Right click empty space to place a block in midair. To do that, you'll need to have the block you want to place in your offhand.",
   "constructionwand.description.core_destruction": "The destruction core destroys blocks (no tile entities) on the side facing you. Maximum number of blocks depends on wand tier. Destroyed blocks disappear into the void, you can use the undo feature if you've made a mistake.",
-
   "stat.constructionwand.use_wand": "Blocks placed using Wand"
 }