Merge remote-tracking branch 'origin/1.21' into 1.21

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

@@ -26,6 +26,9 @@
   "block.functionalstorage.framed_2": "镶框抽屉（1x2）",
   "block.functionalstorage.framed_4": "镶框抽屉（2x2）",
   "block.functionalstorage.framed_controller_extension": "镶框控制器扩展器",
+  "block.functionalstorage.framed_fluid_1": "镶框流体抽屉（1x1）",
+  "block.functionalstorage.framed_fluid_2": "镶框流体抽屉（1x2）",
+  "block.functionalstorage.framed_fluid_4": "镶框流体抽屉（2x2）",
   "block.functionalstorage.framed_simple_compacting_drawer": "镶框简单压缩抽屉",
   "block.functionalstorage.framed_storage_controller": "镶框存储控制器",
   "block.functionalstorage.jungle_1": "丛林木抽屉（1x1）",
@@ -45,6 +48,7 @@
   "block.functionalstorage.warped_1": "诡异木抽屉（1x1）",
   "block.functionalstorage.warped_2": "诡异木抽屉（1x2）",
   "block.functionalstorage.warped_4": "诡异木抽屉（2x2）",
+  "config.jade.plugin_functionalstorage.drawer": "功能性存储抽屉",
   "configurationtool.configmode": "配置模式：",
   "configurationtool.configmode.indicator": "切换指示模式",
   "configurationtool.configmode.indicator.mode_0": "隐藏",
@@ -57,6 +61,23 @@
   "configurationtool.configmode.toggle_upgrades": "隐藏/显示升级渲染",
   "configurationtool.use": "潜行+右击可更改模式。右击抽屉可开关所选项。",
   "drawer.block.contents": "内容：",
+  "drawer.block.multiplier": "存储乘数：%s",
+  "drawer_upgrade.functionalstorage.collect.fluid": "收集流体：%s",
+  "drawer_upgrade.functionalstorage.collect.item": "收集物品实体：%s",
+  "drawer_upgrade.functionalstorage.pull.fluid": "抽入流体：%s",
+  "drawer_upgrade.functionalstorage.pull.item": "抽入物品：%s",
+  "drawer_upgrade.functionalstorage.push.fluid": "推出流体：%s",
+  "drawer_upgrade.functionalstorage.push.item": "推出物品：%s",
+  "drawer_upgrade.functionalstorage.redstone": "为槽位 %s 发出红石信号",
+  "drawer_upgrade.functionalstorage.relative_direction": "相对方向：%s",
+  "drawer_upgrade.functionalstorage.sides.back": "后",
+  "drawer_upgrade.functionalstorage.sides.down": "下",
+  "drawer_upgrade.functionalstorage.sides.front": "前",
+  "drawer_upgrade.functionalstorage.sides.left": "左",
+  "drawer_upgrade.functionalstorage.sides.right": "右",
+  "drawer_upgrade.functionalstorage.sides.up": "上",
+  "drawer_upgrade.functionalstorage.void.fluid": "虚空销毁多余的流体",
+  "drawer_upgrade.functionalstorage.void.item": "虚空销毁多余的物品",
   "frameddrawer.use": "如何更改纹理：\n在合成网格内，第一个槽位放置用于定义抽屉外部纹理的方块，第二个槽位放置用于定义抽屉内部纹理的方块，第三个槽位放置镶框抽屉。\n",
   "gui.functionalstorage.amount": "数量：",
   "gui.functionalstorage.fluid": "流体：",
@@ -71,14 +92,18 @@
   "item.functionalstorage.copper_upgrade": "铜升级",
   "item.functionalstorage.creative_vending_upgrade": "创造取出升级",
   "item.functionalstorage.diamond_upgrade": "钻石升级",
+  "item.functionalstorage.dripping_upgrade": "滴水升级",
   "item.functionalstorage.gold_upgrade": "金升级",
   "item.functionalstorage.iron_downgrade": "铁降级",
   "item.functionalstorage.linking_tool": "链接工具",
+  "item.functionalstorage.max_storage_upgrade": "最大存储升级",
   "item.functionalstorage.netherite_upgrade": "下界合金升级",
+  "item.functionalstorage.obsidian_upgrade": "黑曜石生成器升级",
   "item.functionalstorage.puller_upgrade": "抽入升级",
-  "item.functionalstorage.pusher_upgrade": "输出升级",
+  "item.functionalstorage.pusher_upgrade": "推出升级",
   "item.functionalstorage.redstone_upgrade": "红石升级",
   "item.functionalstorage.void_upgrade": "虚空升级",
+  "item.functionalstorage.water_generator_upgrade": "水生成器升级",
   "item.utility.direction": "方向：",
   "item.utility.direction.desc": "在GUI中右键单击以更改方向",
   "item.utility.downgrade": "将槽位降级至最多存储64个物品",
@@ -88,7 +113,7 @@
   "key.categories.storage": "存储",
   "key.categories.utility": "功能",
   "linkingtool.controller": "控制器：",
-  "linkingtool.ender.clear": "潜行+右键空气单击可清除频率。",
+  "linkingtool.ender.clear": "潜行+右键单击空气可清除频率。",
   "linkingtool.ender.frequency": "频率：",
   "linkingtool.linkingaction": "链接操作：",
   "linkingtool.linkingaction.add": "添加",
@@ -98,21 +123,11 @@
   "linkingtool.linkingmode.multiple.desc": "链接两点之间的多个抽屉到控制器",
   "linkingtool.linkingmode.single": "复选",
   "linkingtool.linkingmode.single.desc": "链接单个抽屉到控制器",
-  "linkingtool.use": "*潜行+右键空气单击可更改模式或清除频率。\n* 左击末影抽屉以存储其频率。\n* 右键空气单击可以更改操作。\n\n右键单击控制器以设置该工具，然后使用它附近的抽屉进行链接。\n\n手持该工具时，它将显示连接到所选控制器的抽屉。",
+  "linkingtool.use": "* 潜行+右键单击空气可更改模式或清除频率。\n* 左键单击末影抽屉以存储其频率。\n* 右键单击空气可以更改操作。\n\n右键单击控制器以设置该工具，然后使用它链接附近的抽屉。\n\n手持该工具时，它将显示链接到所选控制器的抽屉。",
   "storageupgrade.desc.fluid": "将该方块的液体存储量乘以 ",
   "storageupgrade.desc.item": "将该方块的物品存储量乘以 ",
-  "storageupgrade.desc.range": "将控制器的作用半径延长%s格",
+  "storageupgrade.desc.range": "将控制器的作用半径增加%s格",
   "upgrade.type": "类型：",
   "upgrade.type.storage": "存储",
-  "upgrade.type.utility": "功能",
-  "block.functionalstorage.framed_controller_extension":"镶框扩展控制器",
-  "block.functionalstorage.framed_storage_controller":"镶框存储控制器",
-  "block.functionalstorage.framed_simple_compacting_drawer":"镶框简易压缩抽屉",
-  "block.functionalstorage.simple_compacting_drawer":"简易压缩抽屉",
-  "block.functionalstorage.controller_extension":"扩展控制器",
-  "block.functionalstorage.fluid_4":"流体抽屉（2x2）",
-  "block.functionalstorage.fluid_2":"流体抽屉（1x2）",
-  "block.functionalstorage.fluid_1":"流体抽屉（1x1）",
-  "storageupgrade.desc.fluid": "使此抽屉可以存储的流体x",
-  "storageupgrade.desc.item": "使此抽屉可以存储的物品x"
-  }
+  "upgrade.type.utility": "功能"
+}