diff --git a/projects/1.20-fabric/assets/neepmeat/meatlib/lang/en_us.json b/projects/1.20-fabric/assets/neepmeat/meatlib/lang/en_us.json new file mode 100644 index 000000000000..b83ed12831fb --- /dev/null +++ b/projects/1.20-fabric/assets/neepmeat/meatlib/lang/en_us.json @@ -0,0 +1,8 @@ +{ + "tooltip.meatlib.shift_for_info": "§7Hold §fSHIFT§7 for more info", + + "subtitles.meatlib.wrench_click": "Wrench Use", + "subtitles.meatlib.plc_select": "UI Beep 1", + "subtitles.meatlib.plc_select_block": "UI Beep 2", + "subtitles.meatlib.click": "Click" +} \ No newline at end of file diff --git a/projects/1.20-fabric/assets/neepmeat/meatlib/lang/zh_cn.json b/projects/1.20-fabric/assets/neepmeat/meatlib/lang/zh_cn.json new file mode 100644 index 000000000000..52f6186ca5d3 --- /dev/null +++ b/projects/1.20-fabric/assets/neepmeat/meatlib/lang/zh_cn.json @@ -0,0 +1,8 @@ +{ + "tooltip.meatlib.shift_for_info": "§7按住§fSHIFT§7显示更多信息", + + "subtitles.meatlib.wrench_click": "扳手:使用", + "subtitles.meatlib.plc_select": "界面:哔", + "subtitles.meatlib.plc_select_block": "界面:嘟", + "subtitles.meatlib.click": "咔哒" +} \ No newline at end of file diff --git a/projects/1.20-fabric/assets/neepmeat/meatweapons/lang/en_us.json b/projects/1.20-fabric/assets/neepmeat/meatweapons/lang/en_us.json index c135b86619c7..e4d1f07ef5d4 100644 --- a/projects/1.20-fabric/assets/neepmeat/meatweapons/lang/en_us.json +++ b/projects/1.20-fabric/assets/neepmeat/meatweapons/lang/en_us.json @@ -23,6 +23,9 @@ "item.meatweapons.engine": "Engine", "item.meatweapons.iron_barrel": "Iron Barrel", "item.meatweapons.meat_steel_barrel": "Meat Steel Barrel", + "item.meatweapons.almost_pistol": "Almost Pistol", + "item.meatweapons.almost_pistol.lore_0": "A lump of metal that might be or might have been a gun.", + "item.meatweapons.knife": "Knife", "item.meatweapons.basic_pistol": "Raw Gun", "item.meatweapons.basic_pistol.lore_0": "Cobbled together from reanimated flesh.\nComes with a pistol module preinstalled.\nPassively generates ammunition from metabolic substrate.\nClick with a food item in an inventory to feed.", @@ -115,8 +118,8 @@ "tooltip.meatweapons.meatgun_module.complexity": "Complexity: %s", "tooltip.meatweapons.meatgun_module.remaining_complexity": "C: %s / %s", - "death.attack.meatweapons.bullet": "%1$s was pwned.", - "death.attack.meatweapons.bullet.player": "%1$s was shot by %1$s.", + "death.attack.meatweapons.bullet": "%1$s was pwned by %2$s", + "death.attack.meatweapons.bullet.player": "%1$s was shot by %2$s", "tooltip.meatweapons.meatgun_module.max_complexity": "Max complexity: %s", "tooltip.meatweapons.applicable": "Applicable slots: %s", "death.attack.meatweapons.meatgun_explosion": "%1$s was gibbed", diff --git a/projects/1.20-fabric/assets/neepmeat/meatweapons/lang/zh_cn.json b/projects/1.20-fabric/assets/neepmeat/meatweapons/lang/zh_cn.json index 032c7afaf3e6..9782baa39922 100644 --- a/projects/1.20-fabric/assets/neepmeat/meatweapons/lang/zh_cn.json +++ b/projects/1.20-fabric/assets/neepmeat/meatweapons/lang/zh_cn.json @@ -23,6 +23,9 @@ "item.meatweapons.engine": "引擎", "item.meatweapons.iron_barrel": "铁枪管", "item.meatweapons.meat_steel_barrel": "肉钢枪管", + "item.meatweapons.almost_pistol": "大约是枪", + "item.meatweapons.almost_pistol.lore_0": "一块金属,也许是枪,也许曾经是枪。", + "item.meatweapons.knife": "小刀", "item.meatweapons.basic_pistol": "粗制肉枪", "item.meatweapons.basic_pistol.lore_0": "由复活的血肉随意拼接而成。\n自带手枪模块。\n会常态使用代谢底物生成弹药。\n在物品栏中使用食物物品点击它即可喂食。", @@ -115,7 +118,7 @@ "tooltip.meatweapons.meatgun_module.complexity": "复杂度:%s", "tooltip.meatweapons.meatgun_module.remaining_complexity": "复杂度:%s / %s", - "death.attack.meatweapons.bullet": "%1$s被击杀了", + "death.attack.meatweapons.bullet": "%1$s被%2$s击杀了", "death.attack.meatweapons.bullet.player": "%1$s被%2$s击毙了", "tooltip.meatweapons.meatgun_module.max_complexity": "最大复杂度:%s", "tooltip.meatweapons.applicable": "适用槽位:%s", diff --git a/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/en_us/articles/machines/tree_vacuum.md b/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/en_us/articles/machines/tree_vacuum.md new file mode 100644 index 000000000000..9501184f26b4 --- /dev/null +++ b/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/en_us/articles/machines/tree_vacuum.md @@ -0,0 +1,19 @@ +--- +id: tree_vacuum +lookup: neepmeat:tree_vacuum +--- + +# Tree Vacuum + +This machine produces a terrifying suction that allows it to rapidly engulf entire trees as though they are spaghetti. + +## Specifications + +\columns{\graph{neepmeat:tree_vacuum}}{Min power: 10eJ/t +Max power: 1000eJ/t} + +## Usage +The Tree Vacuum block is a functional component. It requires a controller, a motor port and an item output port. + +When the machine is running and its maw faces a tree, it will consume the tree and eject the materials via the output port. + diff --git a/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/en_us/articles_en_us.json b/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/en_us/articles_en_us.json index 5d2162cb2491..0784c1965698 100644 --- a/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/en_us/articles_en_us.json +++ b/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/en_us/articles_en_us.json @@ -40,7 +40,7 @@ {"type": "text", "text": "Stirling Engine\n", "bold": true}, {"type": "text", "text": "The Stirling Engine converts heat energy from burning fuel into mechanical work."}, {"type": "text", "text": "\nUsage\n", "bold": true}, - {"type": "text", "text": "The Stirling Engine can accept any valid furnace fuel and will rotate as long as the fuel burns. Under load, it delivers 20eJ/t."} + {"type": "text", "text": "The Stirling Engine can accept any valid furnace fuel and will rotate as long as the fuel burns. It delivers 150eJ/t."} ]}, {"id": "bottler", "contents": [ {"type": "text", "text": "Bottler\n", "bold": true}, @@ -189,7 +189,7 @@ ]}, {"id": "charnel_pump", "contents": [ {"type": "text", "text": "Charnel Pump\n", "bold": true}, - {"type": "text", "text": "Integration Fluid can be induced to seek out precious minerals and engulf them. When injected at high pressure into a rock formation, the fluid will force apart minute fractures, allowing it animalcules to digest the newly exposed mineral deposits. \n\nThe Charnel Pump performs these functions and encourages the fluid to return to the surface once saturated."}, + {"type": "text", "text": "Integration Fluid can be induced to seek out precious minerals and engulf them. When injected at high pressure into a rock formation, the fluid will force apart minute fractures, allowing its animalcules to digest the newly exposed mineral deposits. \n\nThe Charnel Pump performs these functions and encourages the fluid to return to the surface once saturated."}, {"type": "text", "text": "\nUsage\n", "bold": true}, {"type": "text", "text": "The Charnel pump is a functional component eight blocks tall with a diameter of three blocks. It requires a controller, a motor port and two fluid input ports: one for compressed air and one for Integration Fluid. A motor must deliver over 500eJ/t for the Charnel Pump to run. Each pumping cycle will consume 1/3 buckets of Integration Fluid."}, {"type": "text", "text": "\nWhen the pump is first turned on, the surface will be breached by a spout of writhing earth nearby. A Well Head must be placed on this to receive the resources liberated from the earth."} @@ -198,13 +198,6 @@ {"type": "text", "text": "Large Compressor\n", "bold": true}, {"type": "text", "text": "The Large Compressor is a functional component that produces compressed air. It requires a motor port. Compressed air is ejected from the top of the machine."} ]}, - {"id": "tree_vacuum", "contents": [ - {"type": "text", "text": "Tree Vacuum\n", "bold": true}, - {"type": "text", "text": "This machine produces a terrifying suction that allows it to rapidly engulf entire trees as though they are spaghetti."}, - {"type": "text", "text": "\nUsage\n", "bold": true}, - {"type": "text", "text": "The Tree Vacuum is a functional component. It requires a controller, a motor port and an item output port."}, - {"type": "text", "text": "When the machine is running and its maw faces a tree, it will consume the tree and eject the materials via the output port."} - ]}, {"id": "plc_instructions", "contents": [ diff --git a/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/zh_cn/articles/machines/tree_vacuum.md b/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/zh_cn/articles/machines/tree_vacuum.md new file mode 100644 index 000000000000..550a1819a343 --- /dev/null +++ b/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/zh_cn/articles/machines/tree_vacuum.md @@ -0,0 +1,19 @@ +--- +id: tree_vacuum +lookup: neepmeat:tree_vacuum +--- + +# 真空吸树机 + +此机器能产生恐怖的吸力,可以迅速拔起整棵树,就像是吸面条一样。 + +## 规格说明 + +\columns{\graph{neepmeat:tree_vacuum}}{最小功率:10eJ/t +最大功率:1000eJ/t} + +## 使用方法 +真空吸树机是功能组件。需要一个控制器、一个发动机端口、一个物品输出端口。 + +当此组件处于运作状态,且其吸入口面向树木时,该树会被连根拔起,所得产物通过输出端口主动排出。 + diff --git a/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/zh_cn/articles_zh_cn.json b/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/zh_cn/articles_zh_cn.json index 7e66e77e0e4b..a73c85c1d4e1 100644 --- a/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/zh_cn/articles_zh_cn.json +++ b/projects/1.20-fabric/assets/neepmeat/neepmeat/guide/zh_cn/articles_zh_cn.json @@ -40,7 +40,7 @@ {"type": "text", "text": "斯特林引擎\n", "bold": true}, {"type": "text", "text": "斯特林引擎能将燃烧燃料产生的热能转换为机械功。"}, {"type": "text", "text": "\n使用方法\n", "bold": true}, - {"type": "text", "text": "斯特林引擎接受任意种类的燃料,其运作时间与燃料燃烧时间相一致。接有负载时输出功率为20eJ/t。"} + {"type": "text", "text": "斯特林引擎接受任意种类的燃料,其运作时间与燃料燃烧时间相一致。其输出功率为150eJ/t。"} ]}, {"id": "bottler", "contents": [ {"type": "text", "text": "灌装机\n", "bold": true}, @@ -198,13 +198,6 @@ {"type": "text", "text": "大型压缩机\n", "bold": true}, {"type": "text", "text": "大型压缩机是能产出压缩空气的功能组件。需要一个发动机端口。压缩空气会从组件顶部主动排出。"} ]}, - {"id": "tree_vacuum", "contents": [ - {"type": "text", "text": "真空吸树机\n", "bold": true}, - {"type": "text", "text": "此组件能产生恐怖的吸力,可以此迅速拔起整棵树,就像是吸面条一样。"}, - {"type": "text", "text": "\n使用方法\n", "bold": true}, - {"type": "text", "text": "真空吸树机是功能组件。需要一个控制器、一个发动机端口、一个物品输出端口。"}, - {"type": "text", "text": "此组件处于运作状态,且其吸入口面向树木时,该树会被连根拔起,所得产物通过输出端口主动排出。"} - ]}, {"id": "plc_instructions", "contents": [ diff --git a/projects/1.20-fabric/assets/neepmeat/neepmeat/lang/en_us.json b/projects/1.20-fabric/assets/neepmeat/neepmeat/lang/en_us.json index a4b44e6262e3..68dc2306fbf3 100644 --- a/projects/1.20-fabric/assets/neepmeat/neepmeat/lang/en_us.json +++ b/projects/1.20-fabric/assets/neepmeat/neepmeat/lang/en_us.json @@ -3,7 +3,6 @@ "itemGroup.neepmeat.ingredients": "NEEPMeat Crafting", "itemGroup.neepmeat.food": "NEEPMeat Food", - "tooltip.neepmeat.shift_for_info": "§7Hold §fSHIFT§7 for more info", "tooltip.neepmeat.requires_motor": "Requires an external motor", "tooltip.neepmeat.requires_vascular": "Requires a vascular network", "tooltip.neepmeat.requires_ichor": "Requires Transient Ichor", @@ -396,6 +395,9 @@ "screen.neepmeat.vsc.cut_off": "Cut off when insufficient", "block.neepmeat.vascular_sensor": "Vascular Network Sensor", "block.neepmeat.vascular_sensor.lore_0": "Sends properties of the connected vascular network via NEEPBus.", + "block.neepmeat.vascular_condenser": "Vascular Condenser", + "screen.neepmeat.vascular_condenser.target.tooltip": "Target network capacity. \nIf the power injected into the network by other sources is less than this, this block will inject its stored energy to keep the available power in the network at this value.\nIf the network's capacity is below this, this block will absorb and store energy from the network", + "screen.neepmeat.vascular_condenser.destroy.tooltip": "If this is enabled, this block will continue to absorb excess power from the network even when its buffer is full.", "screen.neepmeat.deployer.round_robin": "Round-robin", "screen.neepmeat.deployer.block": "Interact block", @@ -497,6 +499,7 @@ "screen.neepmeat.display_plate.capacity": "Capacity:", "block.neepmeat.item_duct": "Hopper Extender", + "block.neepmeat.wooden_hopper": "Wooden Hopper", "block.neepmeat.rusty_panel": "Rusty Panel", @@ -924,6 +927,9 @@ "entity.neepmeat.repeater": "Repeater", "entity.neepmeat.machine_worm": "Machine Worm", + "entity.neepmeat.phage_ray": "Phage Ray", + + "entity.neepmeat.bog_follower": "Bog Follower", "message.neepmeat.implant.title": "Implant", "message.neepmeat.item_implant.title": "Item Implant", @@ -1205,6 +1211,8 @@ "tag.neepmeat.guide_lookup": "Guide Lookup", "tag.neepmeat.block_crushing_outputs": "Block Crushing Outputs", "tag.neepmeat.moppable": "Moppable", + "tag.neepmeat.dosimeter": "Dosimeter", + "tag.neepmeat.animal_feed_items": "Animal Feeds", "stat.neepmeat.enlightenment": "Enlightenment", diff --git a/projects/1.20-fabric/assets/neepmeat/neepmeat/lang/zh_cn.json b/projects/1.20-fabric/assets/neepmeat/neepmeat/lang/zh_cn.json index f263d3ceb69d..3eff6b4bbff7 100644 --- a/projects/1.20-fabric/assets/neepmeat/neepmeat/lang/zh_cn.json +++ b/projects/1.20-fabric/assets/neepmeat/neepmeat/lang/zh_cn.json @@ -3,7 +3,6 @@ "itemGroup.neepmeat.ingredients": "NEEPMeat丨合成", "itemGroup.neepmeat.food": "NEEPMeat丨食物", - "tooltip.neepmeat.shift_for_info": "§7按住§fSHIFT§7显示更多信息", "tooltip.neepmeat.requires_motor": "需要外接发动机", "tooltip.neepmeat.requires_vascular": "需要连接到脉管网络", "tooltip.neepmeat.requires_ichor": "需要供应瞬变浆液", @@ -396,6 +395,9 @@ "screen.neepmeat.vsc.cut_off": "功率不足时不传输", "block.neepmeat.vascular_sensor": "脉管网络传感器", "block.neepmeat.vascular_sensor.lore_0": "将相连脉管网络的属性输出至NEEP总线。", + "block.neepmeat.vascular_condenser": "脉管凝聚器", + "screen.neepmeat.vascular_condenser.target.tooltip": "目标网络容量。\n若其他来源注入网络的功率小于该值,此方块便会将其储存的能量注入网络,令网络内的可用功率保持在该值。\n若网络容量低于实际功率量,则此方块会从网络中抽取并储存能量。", + "screen.neepmeat.vascular_condenser.destroy.tooltip": "启用时,此方块会持续抽取网络中的多余功率,无论其内部缓冲已满与否。", "screen.neepmeat.deployer.round_robin": "轮询调度", "screen.neepmeat.deployer.block": "交互方块", @@ -497,6 +499,7 @@ "screen.neepmeat.display_plate.capacity": "容量:", "block.neepmeat.item_duct": "漏斗延长管", + "block.neepmeat.wooden_hopper": "木漏斗", "block.neepmeat.rusty_panel": "锈蚀横板", @@ -924,6 +927,9 @@ "entity.neepmeat.repeater": "播报员", "entity.neepmeat.machine_worm": "机器蠕虫", + "entity.neepmeat.phage_ray": "吞噬射线炮", + + "entity.neepmeat.bog_follower": "泥沼跟踪者", "message.neepmeat.implant.title": "植入物", "message.neepmeat.item_implant.title": "物品植入物", @@ -1205,6 +1211,8 @@ "tag.neepmeat.guide_lookup": "指南查询", "tag.neepmeat.block_crushing_outputs": "方块粉碎产物", "tag.neepmeat.moppable": "可用拖把清理", + "tag.neepmeat.dosimeter": "剂量计", + "tag.neepmeat.animal_feed_items": "动物饲料", "stat.neepmeat.enlightenment": "智慧",