Skip to content

Commit 7a9cc04

Browse files
authored
Synergy update:官库更新
1 parent 2318239 commit 7a9cc04

2 files changed

Lines changed: 46 additions & 2 deletions

File tree

projects/1.21/assets/synergy/synergy/lang/en_us.json

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"block.synergy.blast_brick_block": "Blast Brick",
1616
"block.synergy.blast_bricks": "Blast Bricks",
1717
"block.synergy.blue_cup_mushroom": "Blue Cup Mushroom",
18+
"block.synergy.bricked_heater": "Bricked Heater",
1819
"block.synergy.calcite_bricks": "Calcite Bricks",
1920
"block.synergy.cast_iron_block": "Cast Iron Block",
2021
"block.synergy.cast_iron_tiles": "Cast Iron Tiles",
@@ -97,6 +98,7 @@
9798
"block.synergy.logic_box": "Logic Box",
9899
"block.synergy.macerator": "Macerator",
99100
"block.synergy.mangrove_drying_rack": "Mangrove Drying Rack",
101+
"block.synergy.metallic_heater": "Metallic Heater",
100102
"block.synergy.mixing_chamber": "Mixing Chamber",
101103
"block.synergy.molten_aluminum": "Molten Aluminum",
102104
"block.synergy.molten_ancient_debris": "Molten Ancient Debris",
@@ -137,6 +139,9 @@
137139
"block.synergy.rock_crusher": "Rock Crusher",
138140
"block.synergy.router": "Router",
139141
"block.synergy.rubber": "Rubber",
142+
"block.synergy.sandy_bricks": "Sandy Bricks",
143+
"block.synergy.sandy_bricks_slab": "Sandy Bricks Slab",
144+
"block.synergy.sandy_bricks_stair": "Sandy Bricks Stair",
140145
"block.synergy.sap": "Sap",
141146
"block.synergy.sculk_cooler": "Sculk Cooler",
142147
"block.synergy.shadow_cooler": "Shadow Cooler",
@@ -147,6 +152,8 @@
147152
"block.synergy.solar_panel": "Solar Panel",
148153
"block.synergy.sprinkler": "Sprinkler",
149154
"block.synergy.spruce_drying_rack": "Spruce Drying Rack",
155+
"block.synergy.steam": "Steam",
156+
"block.synergy.steam_boiler": "Steam Boiler",
150157
"block.synergy.steel_block": "Steel Block",
151158
"block.synergy.stripped_ironwood_log": "Stripped Ironwood Log",
152159
"block.synergy.stripped_ironwood_wood": "Stripped Ironwood Wood",
@@ -175,6 +182,8 @@
175182
"config.jade.plugin_synergy.fegen": "Energy Provider Info",
176183
"config.jade.plugin_synergy.foundry_fuel": "Foundry Fuel Provider Modifier Info",
177184
"config.jade.plugin_synergy.fuel_cell": "Fuel Cell Recipe Provider Info",
185+
"config.jade.plugin_synergy.heat_consumer": "Heat Consumer Info",
186+
"config.jade.plugin_synergy.heat_provider": "Heat Provider Info",
178187
"config.jade.plugin_synergy.laser_machine_gun": "Laser Machine Gun Color",
179188
"config.jade.plugin_synergy.laser_rotor": "Laser Rotor Info",
180189
"config.jade.plugin_synergy.logic_box": "Logic Box Info",
@@ -209,6 +218,7 @@
209218
"fluid_type.synergy.oil_type": "Oil",
210219
"fluid_type.synergy.rubber_type": "Rubber",
211220
"fluid_type.synergy.sap_type": "Sap",
221+
"fluid_type.synergy.steam_type": "Steam",
212222
"fluid_type.synergy.sulfuric_acid_type": "Sulfuric Acid",
213223
"item.minecraft.lingering_potion.effect.conduit_power": "Lingering Potion of Conduit Power",
214224
"item.minecraft.lingering_potion.effect.hunger": "Lingering Potion of Hunger",
@@ -420,6 +430,7 @@
420430
"item.synergy.smasher": "Smasher",
421431
"item.synergy.soldering_gun": "Soldering Gun",
422432
"item.synergy.speed_upgrade": "Speed Upgrade",
433+
"item.synergy.steam_bucket": "Steam Bucket",
423434
"item.synergy.steel_gear": "Steel Gear",
424435
"item.synergy.steel_ingot": "Steel Ingot",
425436
"item.synergy.steel_nugget": "Steel Nugget",
@@ -593,6 +604,7 @@
593604
"synergy.blockpos": "§7BlockPos : ",
594605
"synergy.boost.drying_rack": "§7When placed below a Drying Rack it will speed up the process",
595606
"synergy.boost.evaporation_basin": "§7When placed below a Evaporation Basin it will speed up the process",
607+
"synergy.bricked_heater": "§7Consume solid fuel items to produce heat\nMax temperature: 100°C\nCannot be used on Foundry Structure!",
596608
"synergy.cake_stick": "§7Place cake slices",
597609
"synergy.cassiterite.tip": "§7High concentration of tin",
598610
"synergy.casting_table": "§7Use molds to solidify liquids",
@@ -663,13 +675,20 @@
663675
"synergy.jade.bricks.wet": "§cDrying conditions don't match!",
664676
"synergy.jade.environment_modifier.tip": "Base Speed: %s",
665677
"synergy.jade.foundry_fuel.tip": "Heat Speed Modifier: %s",
678+
"synergy.jade.heat_consumer.status.missing_heat": "§cRequire an active heat source below",
679+
"synergy.jade.heat_consumer.status.safe": "Status: §aWorking",
680+
"synergy.jade.heat_consumer.status.warn.above": "Status: §cTemperature is too high!",
681+
"synergy.jade.heat_consumer.status.warn.below": "Status: §cTemperature is too low!",
682+
"synergy.jade.heat_consumer.temperature": "Heat provided: %d°C [%d-%d]",
666683
"synergy.jade.info.blacklist": "Blacklist:",
667684
"synergy.jade.info.cooler_status.false": "Status: §cInactive",
668685
"synergy.jade.info.cooler_status.true": "Status: §aActive",
669686
"synergy.jade.info.whitelist": "Whitelist:",
670687
"synergy.jade.modifier.environment.fuel.fail": "§cRequire an heat source below",
671688
"synergy.jade.tip.cycle": "every cycle",
672689
"synergy.jade.tip.daytime": "when daytime",
690+
"synergy.jade.tip.exclude": "Exclude",
691+
"synergy.jade.tip.include": "Include",
673692
"synergy.jade.warn.moderator": "§cModerator not satisfied",
674693
"synergy.jade.watcher_mode.not_player": "Mode Filter: §aNearest living entity not player",
675694
"synergy.jade.watcher_mode.player_only": "Mode Filter: §aNearest player",
@@ -682,6 +701,7 @@
682701
"synergy.jei.atlas.generator.cobble": "Cobblestone Generator",
683702
"synergy.jei.atlas.generator.energy": "Energy Generator",
684703
"synergy.jei.atlas.generator.water": "Water Generator",
704+
"synergy.jei.atlas.heat.consumer": "Heat Consumer",
685705
"synergy.jei.atlas.heat.provider.active": "Active Heat Provider",
686706
"synergy.jei.atlas.heat.provider.passive": "Passive Heat Provider",
687707
"synergy.jei.atlas.heat.source": "Heat Source",
@@ -732,7 +752,7 @@
732752
"synergy.jei.provider.item": "Item Provider Pattern",
733753
"synergy.jei.quern": "Quern Milling",
734754
"synergy.jei.resource_info": "Resource Info",
735-
"synergy.jei.tip.consume_durability": "§cConsume durability",
755+
"synergy.jei.steam_boiler": "Steam Boiler recipes",
736756
"synergy.jei.tip.dont_consume": "§cNot consume",
737757
"synergy.jei.urn": "Urn Rituals",
738758
"synergy.jei.void_box": "Void Box Infusions",
@@ -752,6 +772,7 @@
752772
"synergy.lignite.tip": "§7High concentration of coal",
753773
"synergy.logic_box": "§7Input filtered tiny chest",
754774
"synergy.malachite.tip": "§7High concentration of copper",
775+
"synergy.metallic_heater": "§7Consume solid fuel items to produce heat\nMax temperature: 300°C",
755776
"synergy.mixing_chamber": "§7Extract fluids to create new fluids from adjacent fluid tanks\nRequire an heat source below",
756777
"synergy.mixture_tip": "§7Can be used to speed the grow of any plant",
757778
"synergy.moderator": "§7Increase Heat and FE production",
@@ -790,6 +811,7 @@
790811
"synergy.solar_panel": "§7Produce FE when daytime and can see the sky",
791812
"synergy.soldering_gun": "§7Change the size of AOE on specific blocks",
792813
"synergy.sprinkler": "§7Randomly speed the grow of crops around",
814+
"synergy.steam_boiler": "§7Convert fluids to other fluids using temperatures\nRequire an §lactive§7 heat source below\nCan explode when above 100°C!",
793815
"synergy.tank_interact.empty": "Empty",
794816
"synergy.tiny_ornated_chest": "§7Like stone but can store an entire double chest!",
795817
"synergy.tiny_stone_chest": "§7Like wooden but can store an entire chest",

projects/1.21/assets/synergy/synergy/lang/zh_cn.json

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"block.synergy.blast_brick_block": "防爆砖",
1616
"block.synergy.blast_bricks": "防爆砖块",
1717
"block.synergy.blue_cup_mushroom": "蓝盖菇",
18+
"block.synergy.bricked_heater": "砖制加热器",
1819
"block.synergy.calcite_bricks": "方解石砖",
1920
"block.synergy.cast_iron_block": "铸铁块",
2021
"block.synergy.cast_iron_tiles": "铸铁瓦",
@@ -97,6 +98,7 @@
9798
"block.synergy.logic_box": "逻辑盒",
9899
"block.synergy.macerator": "打粉机",
99100
"block.synergy.mangrove_drying_rack": "红树木干燥架",
101+
"block.synergy.metallic_heater": "金属制加热器",
100102
"block.synergy.mixing_chamber": "混合室",
101103
"block.synergy.molten_aluminum": "熔融铝",
102104
"block.synergy.molten_ancient_debris": "熔融远古残骸",
@@ -137,6 +139,9 @@
137139
"block.synergy.rock_crusher": "岩石粉碎机",
138140
"block.synergy.router": "转送器",
139141
"block.synergy.rubber": "橡胶",
142+
"block.synergy.sandy_bricks": "混沙砖",
143+
"block.synergy.sandy_bricks_slab": "混沙砖台阶",
144+
"block.synergy.sandy_bricks_stair": "混沙砖楼梯",
140145
"block.synergy.sap": "树液",
141146
"block.synergy.sculk_cooler": "幽匿冷却器",
142147
"block.synergy.shadow_cooler": "暗影冷却器",
@@ -147,6 +152,8 @@
147152
"block.synergy.solar_panel": "太阳能板",
148153
"block.synergy.sprinkler": "洒水机",
149154
"block.synergy.spruce_drying_rack": "云杉木干燥架",
155+
"block.synergy.steam": "蒸汽",
156+
"block.synergy.steam_boiler": "蒸汽锅炉",
150157
"block.synergy.steel_block": "钢块",
151158
"block.synergy.stripped_ironwood_log": "去皮铁树原木",
152159
"block.synergy.stripped_ironwood_wood": "去皮铁树木",
@@ -175,6 +182,8 @@
175182
"config.jade.plugin_synergy.fegen": "能量产出信息",
176183
"config.jade.plugin_synergy.foundry_fuel": "熔炼炉燃料乘数信息",
177184
"config.jade.plugin_synergy.fuel_cell": "燃料单元配方信息",
185+
"config.jade.plugin_synergy.heat_consumer": "用热器信息",
186+
"config.jade.plugin_synergy.heat_provider": "供热器信息",
178187
"config.jade.plugin_synergy.laser_machine_gun": "激光发射器颜色",
179188
"config.jade.plugin_synergy.laser_rotor": "激光转子信息",
180189
"config.jade.plugin_synergy.logic_box": "逻辑盒信息",
@@ -209,6 +218,7 @@
209218
"fluid_type.synergy.oil_type": "原油",
210219
"fluid_type.synergy.rubber_type": "橡胶",
211220
"fluid_type.synergy.sap_type": "树液",
221+
"fluid_type.synergy.steam_type": "蒸汽",
212222
"fluid_type.synergy.sulfuric_acid_type": "硫酸",
213223
"item.minecraft.lingering_potion.effect.conduit_power": "滞留型潮涌能量药水",
214224
"item.minecraft.lingering_potion.effect.hunger": "滞留型饥饿药水",
@@ -420,6 +430,7 @@
420430
"item.synergy.smasher": "快拆器",
421431
"item.synergy.soldering_gun": "焊枪",
422432
"item.synergy.speed_upgrade": "速度升级",
433+
"item.synergy.steam_bucket": "蒸汽桶",
423434
"item.synergy.steel_gear": "钢齿轮",
424435
"item.synergy.steel_ingot": "钢锭",
425436
"item.synergy.steel_nugget": "钢粒",
@@ -593,6 +604,7 @@
593604
"synergy.blockpos": "§7方块位置:",
594605
"synergy.boost.drying_rack": "§7放置在干燥架下方可加快干燥速度",
595606
"synergy.boost.evaporation_basin": "§7放置在蒸发皿下方可加快蒸发速度",
607+
"synergy.bricked_heater": "§7消耗固体燃料以产热\n最高温度:100°C\n不可用于熔炼炉结构!",
596608
"synergy.cake_stick": "§7放置蛋糕片",
597609
"synergy.cassiterite.tip": "§7锡含量高",
598610
"synergy.casting_table": "§7借助模具为流体固化定形",
@@ -663,13 +675,20 @@
663675
"synergy.jade.bricks.wet": "§c不符合干燥条件!",
664676
"synergy.jade.environment_modifier.tip": "基础速度:%s",
665677
"synergy.jade.foundry_fuel.tip": "加热速度乘数:%s",
678+
"synergy.jade.heat_consumer.status.missing_heat": "§c下方须有运作中的热源",
679+
"synergy.jade.heat_consumer.status.safe": "状态:§a运作中",
680+
"synergy.jade.heat_consumer.status.warn.above": "状态:§c温度过高!",
681+
"synergy.jade.heat_consumer.status.warn.below": "状态:§c温度过低!",
682+
"synergy.jade.heat_consumer.temperature": "供热水平:%d°C [%d-%d]",
666683
"synergy.jade.info.blacklist": "黑名单:",
667684
"synergy.jade.info.cooler_status.false": "状态:§c未激活",
668685
"synergy.jade.info.cooler_status.true": "状态:§a激活",
669686
"synergy.jade.info.whitelist": "白名单:",
670687
"synergy.jade.modifier.environment.fuel.fail": "§c下方须有热源",
671688
"synergy.jade.tip.cycle": "每周期",
672689
"synergy.jade.tip.daytime": "(日间)",
690+
"synergy.jade.tip.exclude": "Exclude",
691+
"synergy.jade.tip.include": "Include",
673692
"synergy.jade.warn.moderator": "§c慢化器条件未满足",
674693
"synergy.jade.watcher_mode.not_player": "过滤模式:§a最近的非玩家生物",
675694
"synergy.jade.watcher_mode.player_only": "过滤模式:§a最近玩家",
@@ -682,6 +701,7 @@
682701
"synergy.jei.atlas.generator.cobble": "圆石生成器",
683702
"synergy.jei.atlas.generator.energy": "能量生成器",
684703
"synergy.jei.atlas.generator.water": "水生成器",
704+
"synergy.jei.atlas.heat.consumer": "用热器",
685705
"synergy.jei.atlas.heat.provider.active": "主动供热器",
686706
"synergy.jei.atlas.heat.provider.passive": "被动供热器",
687707
"synergy.jei.atlas.heat.source": "热源",
@@ -732,7 +752,7 @@
732752
"synergy.jei.provider.item": "物品供应样板",
733753
"synergy.jei.quern": "磨盘磨制",
734754
"synergy.jei.resource_info": "资源信息",
735-
"synergy.jei.tip.consume_durability": "§c消耗耐久度",
755+
"synergy.jei.steam_boiler": "蒸汽锅炉配方",
736756
"synergy.jei.tip.dont_consume": "§c不消耗",
737757
"synergy.jei.urn": "转化瓮仪式",
738758
"synergy.jei.void_box": "虚空盒灌注",
@@ -752,6 +772,7 @@
752772
"synergy.lignite.tip": "§7煤含量高",
753773
"synergy.logic_box": "§7会过滤输入的微型箱子",
754774
"synergy.malachite.tip": "§7铜含量高",
775+
"synergy.metallic_heater": "§7消耗固体燃料以产热\n最高温度:300°C",
755776
"synergy.mixing_chamber": "§7从相邻的流体储罐中抽取流体,以此制造新流体\n下方须有热源",
756777
"synergy.mixture_tip": "§7可用于加速任意植物的生长",
757778
"synergy.moderator": "§7增加热量和FE产出",
@@ -790,6 +811,7 @@
790811
"synergy.solar_panel": "§7露天时会在日间产生FE",
791812
"synergy.soldering_gun": "§7改变部分方块作用范围的尺寸",
792813
"synergy.sprinkler": "§7随机加快周围农作物的生长",
814+
"synergy.steam_boiler": "§7利用高温将流体转化为其他流体\n下方须有§l运作中§7的热源\n高于100°C时会爆炸!",
793815
"synergy.tank_interact.empty": "",
794816
"synergy.tiny_ornated_chest": "§7和微型石头箱子类似,但内部空间和大箱子一样!",
795817
"synergy.tiny_stone_chest": "§7和微型木箱子类似,但内部空间和普通的箱子一样",

0 commit comments

Comments
 (0)