From f662a1c805a028049df26c10f98e3dbf8172cfc8 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Sat, 16 May 2020 23:47:49 +0800 Subject: [PATCH 1/6] - Fix schematicannon can place water in nether - Fix schematicannon item duplicating and wrong item requirement --- .../modules/schematics/ItemRequirement.java | 9 +++++++ .../schematics/block/LaunchedItem.java | 27 ++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/modules/schematics/ItemRequirement.java b/src/main/java/com/simibubi/create/modules/schematics/ItemRequirement.java index 3c08adf47..7df7fc7fe 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/ItemRequirement.java +++ b/src/main/java/com/simibubi/create/modules/schematics/ItemRequirement.java @@ -7,6 +7,9 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; +import net.minecraft.block.SeaPickleBlock; +import net.minecraft.block.SnowBlock; +import net.minecraft.block.TurtleEggBlock; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.item.ArmorStandEntity; @@ -56,6 +59,12 @@ public class ItemRequirement { // double slab needs two items if (state.has(BlockStateProperties.SLAB_TYPE) && state.get(BlockStateProperties.SLAB_TYPE) == SlabType.DOUBLE) return new ItemRequirement(ItemUseType.CONSUME, Arrays.asList(new ItemStack(item, 2))); + if (block instanceof TurtleEggBlock) + return new ItemRequirement(ItemUseType.CONSUME, Arrays.asList(new ItemStack(item, state.get(TurtleEggBlock.EGGS).intValue()))); + if (block instanceof SeaPickleBlock) + return new ItemRequirement(ItemUseType.CONSUME, Arrays.asList(new ItemStack(item, state.get(SeaPickleBlock.PICKLES).intValue()))); + if (block instanceof SnowBlock) + return new ItemRequirement(ItemUseType.CONSUME, Arrays.asList(new ItemStack(item, state.get(SnowBlock.LAYERS).intValue()))); return item == Items.AIR ? INVALID : new ItemRequirement(ItemUseType.CONSUME, item); } diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/LaunchedItem.java b/src/main/java/com/simibubi/create/modules/schematics/block/LaunchedItem.java index f283eb3fe..0cdc872b8 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/LaunchedItem.java +++ b/src/main/java/com/simibubi/create/modules/schematics/block/LaunchedItem.java @@ -8,17 +8,24 @@ import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Part; import com.simibubi.create.modules.contraptions.relays.belt.item.BeltConnectorItem; import com.simibubi.create.modules.contraptions.relays.elementary.ShaftBlock; +import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.NBTUtil; +import net.minecraft.particles.ParticleTypes; import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.tags.FluidTags; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.SoundEvents; import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.common.IPlantable; public abstract class LaunchedItem { @@ -108,13 +115,31 @@ public abstract class LaunchedItem { void place(World world) { // Piston if (state.has(BlockStateProperties.EXTENDED)) - state = state.with(BlockStateProperties.EXTENDED, false); + state = state.with(BlockStateProperties.EXTENDED, Boolean.FALSE); + if (state.has(BlockStateProperties.WATERLOGGED)) + state = state.with(BlockStateProperties.WATERLOGGED, Boolean.FALSE); if (AllBlocks.BELT.typeOf(state)) { world.setBlockState(target, state, 2); return; } + else if (state.getBlock() == Blocks.COMPOSTER) + state = Blocks.COMPOSTER.getDefaultState(); + else if (state.getBlock() != Blocks.SEA_PICKLE && state.getBlock() instanceof IPlantable) + state = ((IPlantable) state.getBlock()).getPlant(world, target); + if (world.dimension.doesWaterVaporize() && state.getFluidState().getFluid().isIn(FluidTags.WATER)) { + int i = target.getX(); + int j = target.getY(); + int k = target.getZ(); + world.playSound(null, target, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F); + + for (int l = 0; l < 8; ++l) { + world.addParticle(ParticleTypes.LARGE_SMOKE, i + Math.random(), j + Math.random(), k + Math.random(), 0.0D, 0.0D, 0.0D); + } + Block.spawnDrops(state, world, target); + return; + } world.setBlockState(target, state, 18); state.getBlock().onBlockPlacedBy(world, target, state, null, stack); } From 3544b981ee7340851ce4d2b2137f5415b4efa6c5 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Sun, 17 May 2020 17:56:32 +0800 Subject: [PATCH 2/6] - Fix extractor couldn't drop items when it attaches to a moving blcoks (#317) --- .../block/extractor/ExtractorMovementBehaviour.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorMovementBehaviour.java b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorMovementBehaviour.java index bcb4b888d..b2faf6ac8 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorMovementBehaviour.java @@ -35,18 +35,18 @@ public class ExtractorMovementBehaviour extends MovementBehaviour { ItemStack filter = getFilter(context); int amount = getFilterAmount(context); ItemStack dropped = ItemHelper.extract(context.contraption.inventory, - stack -> FilterItem.test(context.world, stack, filter), amount == 0 ? -1 : amount, false); + stack -> FilterItem.test(context.world, stack, filter), amount == 0 ? 64 : amount, false); if (dropped.isEmpty()) return; if (world.isRemote) return; - Vec3d entityPos = VecHelper.getCenterOf(pos).add(0, -0.5f, 0); + Vec3d entityPos = context.position; Entity entityIn = null; Direction facing = AttachedLogisticalBlock.getBlockFacing(context.state); - if (facing == Direction.DOWN) - entityPos = entityPos.add(0, .5, 0); + if (facing != Direction.DOWN) + entityPos = entityPos.add(0, -0.5f, 0); entityIn = new ItemEntity(world, entityPos.x, entityPos.y, entityPos.z, dropped); entityIn.setMotion(Vec3d.ZERO); From 616f8f746e3adc787b61cb79d9dc35f01695df64 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Sun, 17 May 2020 17:58:01 +0800 Subject: [PATCH 3/6] Remove unused import --- .../logistics/block/extractor/ExtractorMovementBehaviour.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorMovementBehaviour.java b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorMovementBehaviour.java index b2faf6ac8..3816d2af8 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorMovementBehaviour.java @@ -1,7 +1,6 @@ package com.simibubi.create.modules.logistics.block.extractor; import com.simibubi.create.foundation.item.ItemHelper; -import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; From 830c1c6d3d9d1ef33edf8574ee1804779351242b Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Mon, 18 May 2020 11:20:04 +0800 Subject: [PATCH 4/6] Fix contraption duplication (#325) --- .../components/contraptions/ContraptionEntity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionEntity.java index 56c7623f6..56291e421 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionEntity.java @@ -497,13 +497,16 @@ public class ContraptionEntity extends Entity implements IEntityAdditionalSpawnD } public void disassemble() { + if (!isAlive()) { + return; + } if (getContraption() != null) { + remove(); BlockPos offset = new BlockPos(getAnchorVec().add(.5, .5, .5)); Vec3d rotation = new Vec3d(getRoll(1), getYaw(1), getPitch(1)); getContraption().addBlocksToWorld(world, offset, rotation); preventMovedEntitiesFromGettingStuck(); } - remove(); } @Override From e3d3a5de3d7f3b5adc353fd1ce6bd89f07ef6eeb Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Mon, 18 May 2020 18:34:02 +0800 Subject: [PATCH 5/6] Fix deployer cannot place potato on campfire https://discordapp.com/channels/620934202875183104/689866656914210897/697585687397925007 --- .../contraptions/components/deployer/DeployerHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java index 3b24f953e..14400a1ac 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java @@ -82,7 +82,7 @@ public class DeployerHandler { static boolean shouldActivate(ItemStack held, World world, BlockPos targetPos) { if (held.getItem() instanceof BlockItem) - if (!world.getBlockState(targetPos).getMaterial().isReplaceable()) + if (world.getBlockState(targetPos).getBlock() == ((BlockItem) held.getItem()).getBlock()) return false; if (held.getItem() instanceof BucketItem) { From 4d3f8f993badc789e6a7018cf1df43b9dba16441 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Mon, 18 May 2020 13:01:24 +0200 Subject: [PATCH 6/6] Another chinese lang update - Added new zh_cn localization by Big_Dale --- .../resources/assets/create/lang/zh_cn.json | 450 ++++++++++-------- 1 file changed, 251 insertions(+), 199 deletions(-) diff --git a/src/main/resources/assets/create/lang/zh_cn.json b/src/main/resources/assets/create/lang/zh_cn.json index 9815ec263..483938be6 100644 --- a/src/main/resources/assets/create/lang/zh_cn.json +++ b/src/main/resources/assets/create/lang/zh_cn.json @@ -7,7 +7,7 @@ "item.create.terrain_zapper": "手持式环境塑形器", "item.create.tree_fertilizer": "树木肥料", "item.create.empty_blueprint": "空白蓝图", - "item.create.andesite_alloy": "安山岩合金", + "item.create.andesite_alloy": "安山合金", "item.create.chromatic_compound": "谜之化合物", "item.create.shadow_steel": "暗影金属", "item.create.blueprint_and_quill": "蓝图与笔", @@ -16,7 +16,6 @@ "item.create.goggles": "工程师护目镜", "item.create.filter": "过滤器", "item.create.property_filter": "属性过滤器", - "item.create.logistical_filter": "Address Filter", "item.create.rose_quartz": "玫瑰石英", "item.create.polished_rose_quartz": "磨制玫瑰石英", "item.create.refined_radiance": "光辉石", @@ -36,7 +35,9 @@ "item.create.crushed_iron": "碎铁矿", "item.create.crushed_gold": "碎金矿", "item.create.sand_paper": "砂纸", + "item.create.super_glue": "强力胶", "item.create.red_sand_paper": "红砂纸", + "item.create.minecart_contraption": "结构化矿车", "item.create.brass_ingot": "黄铜锭", "item.create.brass_sheet": "黄铜板", @@ -53,23 +54,16 @@ "item.create.electron_tube": "电子管", "item.create.integrated_circuit": "集成电路", - "item.create.logistical_controller_supply": "Item Supply", - "item.create.logistical_controller_request": "Item Request", - "item.create.logistical_controller_storage": "Item Storage", - "item.create.logistical_controller_calculation": "Ingredient Calculator", - "item.create.logistical_controller_transactions": "Task Manager", - "item.create.logistical_dial": "Logistical Dial", - "item.create.blazing_pickaxe": "烈焰稿", "item.create.blazing_shovel": "烈焰铲", "item.create.blazing_axe": "烈焰斧", "item.create.blazing_sword": "烈焰长剑", - "item.create.shadow_steel_pickaxe": "暗影金属稿", + "item.create.shadow_steel_pickaxe": "暗影金属镐", "item.create.shadow_steel_mattock": "暗影金属鹤嘴锄", "item.create.shadow_steel_sword": "暗影金属剑", - "item.create.rose_quartz_pickaxe": "玫瑰石英稿", + "item.create.rose_quartz_pickaxe": "玫瑰石英镐", "item.create.rose_quartz_shovel": "玫瑰石英铲", "item.create.rose_quartz_axe": "玫瑰石英斧", "item.create.rose_quartz_sword": "玫瑰石英剑", @@ -78,10 +72,12 @@ "block.create.copper_block": "铜块", "block.create.copper_shingles": "铜瓦堆", "block.create.zinc_ore": "锌矿", + "block.create.zinc_block": "锌块", + "block.create.brass_block": "黄铜块", - "block.create.andesite_casing": "安山套管", - "block.create.brass_casing": "黄铜套管", - "block.create.copper_casing": "铜套管", + "block.create.andesite_casing": "安山外壳", + "block.create.brass_casing": "黄铜外壳", + "block.create.copper_casing": "铜制外壳", "block.create.cogwheel": "齿轮", "block.create.large_cogwheel": "大齿轮", @@ -99,17 +95,19 @@ "block.create.cuckoo_clock": "布谷鸟鸣钟", "block.create.creative_motor": "动力马达", "block.create.belt": "传送带", + "block.create.millstone": "石磨", "block.create.crushing_wheel": "粉碎轮", - "block.create.drill": "钻头", + "block.create.drill": "动力钻头", "block.create.portable_storage_interface": "移动式储物接口", "block.create.harvester": "收割机", + "block.create.plough": "犁", "block.create.saw": "切割机", "block.create.water_wheel": "水车", "block.create.mechanical_press": "辊压机", "block.create.mechanical_mixer": "搅拌器", "block.create.deployer": "机械手", "block.create.basin": "工作盆", - "block.create.mechanical_crafter": "机械制造台", + "block.create.mechanical_crafter": "机械制造机", "block.create.flywheel": "飞轮", "block.create.furnace_engine": "熔炉引擎", "block.create.speed_gauge": "速度表", @@ -125,7 +123,7 @@ "block.create.mechanical_bearing": "动力轴承", "block.create.clockwork_bearing": "时钟轴承", "block.create.rope_pulley": "绳索滑轮", - "block.create.rope": "绳子", + "block.create.rope": "Rope", "block.create.pulley_magnet": "滑轮磁铁", "block.create.translation_chassis": "机壳底盘", "block.create.rotation_chassis": "旋转底盘", @@ -134,6 +132,7 @@ "block.create.redstone_bridge": "无线红石信号终端", "block.create.stockswitch": "存储检测器", "block.create.flexcrate": "板条箱", + "block.create.creative_crate": "创造板条箱", "block.create.extractor": "提取器", "block.create.belt_funnel": "传送带漏斗", "block.create.linked_extractor": "无线提取器", @@ -145,11 +144,6 @@ "block.create.toggle_latch": "T触发器", "block.create.flexpeater": "高级中继器", "block.create.entity_detector": "传送带观察者", - "block.create.logistical_casing": "Logistical 套管", - "block.create.logistical_controller": "Logistical Controller", - "block.create.logistical_index": "Logistical Index", - "block.create.logisticians_table": "Logistician's Table", - "block.create.package_funnel": "Package Funnel", "block.create.belt_tunnel": "传送带隧道", "block.create.sequenced_gearshift": "可编程齿轮箱", @@ -262,13 +256,14 @@ "block.create.dark_scoria_bricks_wall": "深色熔渣砖墙", "block.create.schematicannon": "加农炮", - "block.create.schematic_table": "Schematic桌", - "block.create.creative_crate": "Schematic创造者", + "block.create.schematic_table": "蓝图桌", "block.create.cocoa_log": "可可木", - "block.create.shop_shelf": "Shelf", - + "entity.create.contraption": "移动结构", + "entity.create.stationary_contraption": "固定结构", + "entity.create.super_glue": "强力胶", + "_comment": "-------------------------] UI & MESSAGES [------------------------------------------------", "death.attack.create.crush": "%1$s 被压扁了", @@ -276,24 +271,24 @@ "death.attack.create.fan_lava": "%1$s 在接受热风的洗礼中欲火焚身", "death.attack.create.drill": "%1$s 的钻头是突破天际的钻头", "death.attack.create.saw": "%1$s 被圆锯切成了两截", - "create.block.deployer.damage_source_name": "a rogue Deployer", - "death.attack.create.curse_polish": "%1$s 试图祛魔时受到了诅咒", + "create.block.deployer.damage_source_name": "背叛的机械臂", "death.attack.create.cuckoo_clock_explosion": "%1$s被布谷鸟闹钟炸得粉身碎骨", "create.recipe.crushing": "批量粉碎", + "create.recipe.milling": "批量研磨", "create.recipe.splashing": "批量洗涤", "create.recipe.splashing.fan": "在鼓风机前方倒水", - "create.recipe.smoking_via_fan": "批量烟熏", - "create.recipe.smoking_via_fan.fan": "在鼓风机前方点火", - "create.recipe.blasting_via_fan": "批量冶炼", - "create.recipe.blasting_via_fan.fan": "在鼓风机前方倒岩浆", + "create.recipe.smokingViaFan": "批量烟熏", + "create.recipe.smokingViaFan.fan": "在鼓风机前方点火", + "create.recipe.blastingViaFan": "批量冶炼", + "create.recipe.blastingViaFan.fan": "在鼓风机前方倒岩浆", "create.recipe.pressing": "金属压片", "create.recipe.mixing": "混合搅拌", "create.recipe.packing": "压块塑形", "create.recipe.sawing": "木材切割", "create.recipe.mechanical_crafting": "自动合成", "create.recipe.block_cutting": "方块切割", - "create.recipe.blockzapper_upgrade": "手持式方块放置器", + "create.recipe.blockzapperUpgrade": "手持式方块放置器", "create.recipe.sandpaper_polishing": "砂纸抛光", "create.recipe.mystery_conversion": "化合物变异", "create.recipe.processing.catalyst": "催化剂", @@ -321,6 +316,8 @@ "create.action.discard": "丢弃", "create.keyinfo.toolmenu": "工具菜单", + "create.keyinfo.scrollup": "（游戏中）向上鼠标滚轮", + "create.keyinfo.scrolldown": "（游戏中）向下鼠标滚轮", "create.gui.scrollInput.defaultTitle": "选择一个选项:", "create.gui.scrollInput.scrollToModify": "滚动修改", @@ -339,8 +336,8 @@ "create.orientation.orthogonal": "垂直", "create.orientation.diagonal": "对角线", "create.orientation.horizontal": "水平", - "create.orientation.alongZ": "Along Z", - "create.orientation.alongX": "Along X", + "create.orientation.alongZ": "以z轴为中心", + "create.orientation.alongX": "以x轴为中心", "create.gui.blockzapper.title": "手持式方块放置机", "create.gui.blockzapper.replaceMode": "更换模式", @@ -387,20 +384,24 @@ "create.blockzapper.leftClickToSet": "左键点击方块以设定方块", "create.blockzapper.empty": "出击!", - "create.contraptions.movement_mode": "Movement Mode", - "create.contraptions.movement_mode.move_place": "Always Place when Stopped", - "create.contraptions.movement_mode.move_place_returned": "Place only in Starting Position", - "create.contraptions.movement_mode.move_never_place": "Place only when Anchor Destroyed", - "create.contraptions.movement_mode.rotate_place": "Always Place when Stopped", - "create.contraptions.movement_mode.rotate_place_returned": "Only Place near Initial Angle", - "create.contraptions.movement_mode.rotate_never_place": "Only Place when Anchor Destroyed", + "create.contraptions.movement_mode": "运动模式", + "create.contraptions.movement_mode.move_place": "停止时总是实体化方块", + "create.contraptions.movement_mode.move_place_returned": "停止时只在初始位置实体化方块", + "create.contraptions.movement_mode.move_never_place": "只有在动力方块摧毁后才实体化方块", + "create.contraptions.movement_mode.rotate_place": "停止时总是实体化方块", + "create.contraptions.movement_mode.rotate_place_returned": "停止时只在接近初始角度实体化方块", + "create.contraptions.movement_mode.rotate_never_place": "只有在旋转轴摧毁后才实体化方块", + "create.contraptions.cart_movement_mode": "矿车运动模式", + "create.contraptions.cart_movement_mode.rotate": "结构与矿车保持相同方向", + "create.contraptions.cart_movement_mode.rotate_paused": "矿车转向时机器停止工作", + "create.contraptions.cart_movement_mode.rotation_locked": "结构方向保持不变", "create.logistics.filter": "过滤器", "create.logistics.firstFrequency": "频道. #1", "create.logistics.secondFrequency": "频道. #2", - "create.gui.goggles.generator_stats": "Generator 状态:", - "create.gui.goggles.kinetic_stats": "Kinetic 状态:", + "create.gui.goggles.generator_stats": "产能器状态:", + "create.gui.goggles.kinetic_stats": "动能状态:", "create.gui.goggles.at_current_speed": "当前速度应力值", "create.gui.goggles.base_value": "应力基础值", @@ -412,6 +413,7 @@ "create.gui.stress_gauge.no_rotation": "无旋转", "create.gui.contraptions.not_fast_enough": "显然 %1$s 没有足够的转速.", + "create.gui.contraptions.network_overstressed": "显然装置过载，减速高应力消耗的装置或者添加更多动力", "create.gui.flexcrate.title": "板条箱", "create.gui.flexcrate.storageSpace": "储存空间", @@ -420,9 +422,9 @@ "create.gui.stockswitch.lowerLimit": "阈值下限", "create.gui.stockswitch.upperLimit": "阈值上限", "create.gui.stockswitch.startAt": "启动信号", - "create.gui.stockswitch.startAbove": "Start Signal above", + "create.gui.stockswitch.startAbove": "给予红石信号当容量大于", "create.gui.stockswitch.stopAt": "停止信号", - "create.gui.stockswitch.stopBelow": "Stop Signal below", + "create.gui.stockswitch.stopBelow": "停止红石信号当容量小于", "create.gui.sequenced_gearshift.title": "可编程齿轮箱", "create.gui.sequenced_gearshift.instruction": "指令", @@ -439,13 +441,13 @@ "create.gui.sequenced_gearshift.speed.back": "一倍速, 反向", "create.gui.sequenced_gearshift.speed.back_fast": "两倍速, 反向", - "create.schematicAndQuill.dimensions": "原理图尺寸: %1$sx%2$sx%3$s", + "create.schematicAndQuill.dimensions": "蓝图尺寸: %1$sx%2$sx%3$s", "create.schematicAndQuill.firstPos": "第一个位置.", "create.schematicAndQuill.secondPos": "第二个位置.", "create.schematicAndQuill.noTarget": "按住Ctrl选择空气方块.", "create.schematicAndQuill.abort": "删除选择.", - "create.schematicAndQuill.prompt": "输入原理图的名称:", - "create.schematicAndQuill.fallbackName": "我的原理图", + "create.schematicAndQuill.prompt": "输入蓝图的名称:", + "create.schematicAndQuill.fallbackName": "我的蓝图", "create.schematicAndQuill.saved": "另存为 %1$s", "create.schematic.invalid": "[!] 无效的项目", @@ -471,15 +473,15 @@ "create.schematic.tool.deploy.description.1": "在地面上单击鼠标右键以放置.", "create.schematic.tool.deploy.description.2": "按住Ctrl以固定距离选择.", "create.schematic.tool.deploy.description.3": "按住Ctrl鼠标滚动更改距离.", - "create.schematic.tool.move.description.0": "水平移动原理图", - "create.schematic.tool.move.description.1": "选定原理图,然后按住Ctrl鼠标滚动移动.", + "create.schematic.tool.move.description.0": "水平移动蓝图", + "create.schematic.tool.move.description.1": "选定蓝图,然后按住Ctrl鼠标滚动移动.", "create.schematic.tool.move.description.2": "", "create.schematic.tool.move.description.3": "", - "create.schematic.tool.movey.description.0": "垂直移动原理图", + "create.schematic.tool.movey.description.0": "垂直移动蓝图", "create.schematic.tool.movey.description.1": "按住Ctrl鼠标滚动上下移动", "create.schematic.tool.movey.description.2": "", "create.schematic.tool.movey.description.3": "", - "create.schematic.tool.rotate.description.0": "围绕原理图中心旋转原理图.", + "create.schematic.tool.rotate.description.0": "围绕蓝图中心旋转蓝图.", "create.schematic.tool.rotate.description.1": "按住Ctrl鼠标滚动旋转90度", "create.schematic.tool.rotate.description.2": "", "create.schematic.tool.rotate.description.3": "", @@ -487,22 +489,22 @@ "create.schematic.tool.print.description.1": "右键单机确认当前位置.", "create.schematic.tool.print.description.2": "该工具仅适用于创造模式.", "create.schematic.tool.print.description.3": "", - "create.schematic.tool.flip.description.0": "沿你选择的面翻转原理图.", - "create.schematic.tool.flip.description.1": "指向原理图，然后按住Ctrl鼠标滚动将其翻转.", + "create.schematic.tool.flip.description.0": "沿你选择的面翻转蓝图.", + "create.schematic.tool.flip.description.1": "指向蓝图，然后按住Ctrl鼠标滚动将其翻转.", "create.schematic.tool.flip.description.2": "", "create.schematic.tool.flip.description.3": "", "create.schematics.synchronizing": "正在同步...", - "create.schematics.uploadTooLarge": "你的原理图太大", - "create.schematics.maxAllowedSize": "允许的最大原理图文件大小为:", + "create.schematics.uploadTooLarge": "你的蓝图太大", + "create.schematics.maxAllowedSize": "允许的最大蓝图文件大小为:", - "create.gui.schematicTable.title": "原理图桌", - "create.gui.schematicTable.availableSchematics": "可用原理图", - "create.gui.schematicTable.noSchematics": "没有保存的原理图", + "create.gui.schematicTable.title": "蓝图桌", + "create.gui.schematicTable.availableSchematics": "可用蓝图", + "create.gui.schematicTable.noSchematics": "没有保存的蓝图", "create.gui.schematicTable.uploading": "正在上传...", "create.gui.schematicTable.finished": "上传完成!", - "create.gui.schematicannon.title": "原理图加农炮", + "create.gui.schematicannon.title": "蓝图加农炮", "create.gui.schematicannon.settingsTitle": "放置设置", "create.gui.schematicannon.listPrinter": "物品清单打印机", "create.gui.schematicannon.gunpowderLevel": "火药 %1$s%%", @@ -510,18 +512,18 @@ "create.gui.schematicannon.shotsRemainingWithBackup": "备份: %1$s", "create.gui.schematicannon.optionEnabled": "当前启用", "create.gui.schematicannon.optionDisabled": "当前禁用", - "create.gui.schematicannon.option.dontReplaceSolid": "不要替换实体方块", - "create.gui.schematicannon.option.replaceWithSolid": "用普通方块替换实体方块", - "create.gui.schematicannon.option.replaceWithAny": "用任何方块替换", - "create.gui.schematicannon.option.replaceWithEmpty": "用方块替换空气", + "create.gui.schematicannon.option.dontReplaceSolid": "不要替换方块", + "create.gui.schematicannon.option.replaceWithSolid": "用实心方块替换工作区域内的方块", + "create.gui.schematicannon.option.replaceWithAny": "用任何方块替换工作区域内的方块", + "create.gui.schematicannon.option.replaceWithEmpty": "用空气替换工作区域内的方块（放置新方块时清理工作区域内所有原本的方块）", "create.gui.schematicannon.option.skipMissing": "绕过缺少的方块", "create.gui.schematicannon.option.skipTileEntities": "保护存储方块", - "create.gui.schematicannon.option.skipMissing.description": "如果原理图无法找到所需的放置块,它将在下一个位置继续(译者:看不懂可以直接看视频,因为我也看不懂...).", - "create.gui.schematicannon.option.skipTileEntities.description": "原理图将避免更换存储方块,如箱子.", + "create.gui.schematicannon.option.skipMissing.description": "如果蓝图无法找到所需的放置块,它将在下一个位置继续(译者:看不懂可以直接看视频,因为我也看不懂...).", + "create.gui.schematicannon.option.skipTileEntities.description": "蓝图将避免更换存储方块,如箱子.", "create.gui.schematicannon.option.dontReplaceSolid.description": "加农炮将永远不会替换工作范围内的任何实体方块.", - "create.gui.schematicannon.option.replaceWithSolid.description": "如果原理图在其工作范围内包含实体方块,则加农炮将仅替换实体方块.", - "create.gui.schematicannon.option.replaceWithAny.description": "如果原理图在其工作范围内包含任何块,则加农炮将替换实体方块.", + "create.gui.schematicannon.option.replaceWithSolid.description": "如果蓝图在其工作范围内包含实体方块,则加农炮将仅替换实体方块.", + "create.gui.schematicannon.option.replaceWithAny.description": "如果蓝图在其工作范围内包含任何块,则加农炮将替换实体方块.", "create.gui.schematicannon.option.replaceWithEmpty.description": "加农炮将清除其工作范围内的所有阻碍物,包括被空气取代的障碍.", "create.schematicannon.status.idle": "闲置", @@ -530,7 +532,7 @@ "create.schematicannon.status.finished": "完成", "create.schematicannon.status.paused": "已暂停", "create.schematicannon.status.stopped": "停止", - "create.schematicannon.status.noGunpowder": "Out of Gunpowder", + "create.schematicannon.status.noGunpowder": "火药消耗殆尽", "create.schematicannon.status.targetNotLoaded": "方块未加载", "create.schematicannon.status.targetOutsideRange": "定位目标太远", "create.schematicannon.status.searching": "搜索", @@ -538,23 +540,9 @@ "create.schematicannon.status.missingBlock": "缺少方块:", "create.schematicannon.status.placing": "配置", "create.schematicannon.status.clearing": "清除方块", - "create.schematicannon.status.schematicInvalid": "原理图无效", - "create.schematicannon.status.schematicNotPlaced": "原理图未部署", - "create.schematicannon.status.schematicExpired": "原理图文件已过期", - - "create.gui.index.title": "Logistical Index", - "create.gui.index.targetAddressSelect": "Destination Address", - "create.gui.index.confirmOrder": "Confirm Order", - - "create.logistics.priority": "Priority", - "create.logistics.priority.lowest": "Lowest", - "create.logistics.priority.low": "Low", - "create.logistics.priority.high": "High", - "create.logistics.priority.highest": "Highest", - "create.gui.logistical_controller.active_mode": "Active Mode", - "create.gui.logistical_controller.passive_mode": "Passive Mode", - "create.gui.requester.requestedItemCount": "Requested Amount", - "create.gui.storage.passiveModeOnly": "Item Storage is Passive Only", + "create.schematicannon.status.schematicInvalid": "蓝图无效", + "create.schematicannon.status.schematicNotPlaced": "蓝图未部署", + "create.schematicannon.status.schematicExpired": "蓝图文件已过期", "create.gui.filter.blacklist": "黑名单", "create.gui.filter.blacklist.description": "只通过不在黑名单中的物品，如果黑名单为空，所有物品都可以通过", @@ -567,6 +555,10 @@ "create.item_attributes.placeable": "可放置", "create.item_attributes.consumable": "可食用", + "create.item_attributes.smeltable": "可被熔炉烧制", + "create.item_attributes.washable": "可被筛洗", + "create.item_attributes.smokable": "可被烟熏", + "create.item_attributes.blastable": "可被高炉冶炼", "create.item_attributes.enchanted": "已被附魔", "create.item_attributes.damaged": "已损坏", "create.item_attributes.badly_damaged": "严重受损", @@ -579,9 +571,9 @@ "create.gui.attribute_filter.no_selected_attributes": "没有任何属性", "create.gui.attribute_filter.selected_attributes": "已选择的属性:", - "create.gui.attribute_filter.whitelist_disjunctive": "任意匹配白名单 (Any)", + "create.gui.attribute_filter.whitelist_disjunctive": "任意匹配白名单 (任何)", "create.gui.attribute_filter.whitelist_disjunctive.description": "只要有其中一项属性符合，就可以通过", - "create.gui.attribute_filter.whitelist_conjunctive": "全匹配白名单 (All)", + "create.gui.attribute_filter.whitelist_conjunctive": "全匹配白名单 (所有)", "create.gui.attribute_filter.whitelist_conjunctive.description": "只有所有属性都匹配才可以通过", "create.gui.attribute_filter.blacklist": "黑名单", "create.gui.attribute_filter.blacklist.description": "只要没有上述属性，就可以通过", @@ -601,89 +593,134 @@ "create.tooltip.stressImpact.low": "低", "create.tooltip.stressImpact.medium": "中", "create.tooltip.stressImpact.high": "高", + "create.tooltip.stressImpact.overstressed": "过载", "create.tooltip.capacityProvided": "应力容量: %1$s", "create.tooltip.capacityProvided.low": "小", "create.tooltip.capacityProvided.medium": "中", "create.tooltip.capacityProvided.high": "大", - "create.tooltip.capacityProvided.asGenerator": "(作为 Generator)", + "create.tooltip.capacityProvided.asGenerator": "(作为产能器)", "create.tooltip.generationSpeed": "产生 %1$s %2$s", - "create.tooltip.analogStrength": "Analog Strength: %1$s/15", + "create.tooltip.analogStrength": "拟电（红石信号）强度: %1$s/15", "create.tooltip.wip": "WIP", "create.tooltip.workInProgress": "Work in progress!", - "create.tooltip.randomWipDescription0": "Please keep this item away from children.", - "create.tooltip.randomWipDescription1": "A baby panda dies every time you use this item. Every. Time.", - "create.tooltip.randomWipDescription2": "Use at your own risk.", - "create.tooltip.randomWipDescription3": "This is not the item you are looking for, *finger-wiggles* please disperse.", - "create.tooltip.randomWipDescription4": "This item will self-destruct in 10 seconds. 10, 9, 8...", - "create.tooltip.randomWipDescription5": "Believe me, it's useless.", - "create.tooltip.randomWipDescription6": "By using this item, you hereby consent to our disclaimer and agree to its terms.", - "create.tooltip.randomWipDescription7": "This one maybe isn't for you. What about that one?", - "create.tooltip.randomWipDescription8": "Use it and regret your decision immediately.", + "create.tooltip.randomWipDescription0": "别把这玩意给熊孩子", + "create.tooltip.randomWipDescription1": "每一次使用这个物品都会伤害一只无辜的小猫， 所以没有使用就没有伤害。别！用！", + "create.tooltip.randomWipDescription2": "使用后果自负", + "create.tooltip.randomWipDescription3": "（摇手指）这可不是你在找的物品， 走开吧", + "create.tooltip.randomWipDescription4": "自爆模式已启动，10，9，8...", + "create.tooltip.randomWipDescription5": "这玩意真的没用， 我骗你干嘛", + "create.tooltip.randomWipDescription6": "如果你使用这个东西， 那么本作者与它造成的任何后果没有责任.", + "create.tooltip.randomWipDescription7": "这玩意不是给你用的， 换个吧", + "create.tooltip.randomWipDescription8": "试试就逝世", "create.mechanical_mixer.min_ingredients": "最小的物品数", "create.command.killTPSCommand": "killtps", - "create.command.killTPSCommand.status.slowed_by.0": "[Create]: Server tick is currently slowed by %s ms :o", - "create.command.killTPSCommand.status.slowed_by.1": "[Create]: Server tick is slowed by %s ms now >:)", - "create.command.killTPSCommand.status.slowed_by.2": "[Create]: Server tick is back to regular speed :D", - "create.command.killTPSCommand.status.usage.0": "[Create]: use /killtps stop to bring back server tick to regular speed", - "create.command.killTPSCommand.status.usage.1": "[Create]: use /killtps start to artificially slow down the server tick", + "create.command.killTPSCommand.status.slowed_by.0": "[Create]: 服务器每秒tick速被降低为 %s ms :o", + "create.command.killTPSCommand.status.slowed_by.1": "[Create]: 服务器现在每秒tick速被降低为 >:)", + "create.command.killTPSCommand.status.slowed_by.2": "[Create]: 服务器现在不卡了， TPS正常 :D", + "create.command.killTPSCommand.status.usage.0": "[Create]: 用 /killtps stop 来让服务器的TPS速度变回正常", + "create.command.killTPSCommand.status.usage.1": "[Create]: 用 /killtps start 来手动降低服务器TPS速度", "create.command.killTPSCommand.argument.tickTime": "tickTime", - "advancement.create:root": "机械纪元的开始", - "advancement.create:root.desc": "是时候开始创造各种机械了!", - "advancement.create:andesite_alloy": "新的材料", - "advancement.create:andesite_alloy.desc": "机械动力中有许多的材料，例如安山合金.", - "advancement.create:andesite_casing": "安山纪元", - "advancement.create:andesite_casing.desc": "使用安山合金、原木、木板可以合成一个基础箱子", - "advancement.create:crushing_wheel": "巨人兄弟", - "advancement.create:crushing_wheel.desc": "合成两个粉碎轮，用粉碎轮碾碎一些材料", - "advancement.create:rotation": "动起来了！", - "advancement.create:rotation.desc": "看看你的第一个运动的齿轮", - "advancement.create:overstressed": "超载", - "advancement.create:overstressed.desc": "第一次尝到超载的滋味", - "advancement.create:sand_paper": "抛光", - "advancement.create:sand_paper.desc": "用砂纸让方块更加光滑", - "advancement.create:polished_rose_quartz": "粉色钻石", - "advancement.create:polished_rose_quartz.desc": "将玫瑰石英抛光到能够透过光线", - "advancement.create:sand_paper_secret": "升级抛光", - "advancement.create:sand_paper_secret.desc": "用你的砂纸去抛光砂纸", - "advancement.create:press": "Duang！", - "advancement.create:press.desc": "用压片机去碾压你的材料", - "advancement.create:mixer": "搅拌~搅拌~", - "advancement.create:mixer.desc": "制造一个搅拌器", - "advancement.create:brass": "真的合金", - "advancement.create:brass.desc": "使用铜和锌合成黄铜", - "advancement.create:brass_casing": "黄铜纪元", - "advancement.create:brass_casing.desc": "用黄铜来合成新的箱子", - "advancement.create:deployer": "第三只手", - "advancement.create:deployer.desc": "创造一个机械手，让它工作起来", - "advancement.create:deployer_secret": "别打了别打了!", - "advancement.create:deployer_secret.desc": "让两个机械手互相挥拳", - "advancement.create:chromatic_compound": "两极材料", - "advancement.create:chromatic_compound.desc": "创造一个谜之化合物", - "advancement.create:shadow_steel": "没有收获？", - "advancement.create:shadow_steel.desc": "获得一种来自虚空的材料——暗影金属", - "advancement.create:refined_radiance": "光辉照耀", - "advancement.create:refined_radiance.desc": "获得一个光辉石, 充满着光辉的物质", - "advancement.create:refined_radiance_secret": "用光明来锻造", - "advancement.create:refined_radiance_secret.desc": "找到另一种获得光辉石的方法", - "advancement.create:speed_secret": "车速太快了", - "advancement.create:speed_secret.desc": "速度表显示的数值超过69 rpm.", + "advancement.create.root": "欢迎来到机械动力", + "advancement.create.root.desc": "是时候来制作一些超赞的机械结构了！", + "advancement.create.andesite_alloy": "原始人类的合金替代品", + "advancement.create.andesite_alloy.desc": "机械动力有着许多的材料和合金，但由于技术有限，原始的人类暂时们只能制作出安山合金", + + "advancement.create.its_alive": "鲜活的机械生命", + "advancement.create.its_alive.desc": "首次激活齿轮结构的旋转.", + "advancement.create.shifting_gears": "换挡，加速，起飞！", + "advancement.create.shifting_gears.desc": "将大齿轮连接到小齿轮上， 机械结构的转速将会翻倍", + "advancement.create.overstressed": "超载", + "advancement.create.overstressed.desc": "首次使能量网络超载.", + "advancement.create.belt": "大批流水作业", + "advancement.create.belt.desc": "用传送带连接两个传动杆", + "advancement.create.wrench": "细节调整", + "advancement.create.wrench.desc": "做出一个方便调整方块的扳手", + "advancement.create.goggles": "目力工程师", + "advancement.create.goggles.desc": "做出一个能看到机器动能信息的工程师护目镜", + "advancement.create.speed_gauge": "精密的速度控制", + "advancement.create.speed_gauge.desc": "放置一个速度表，并且带上工程师护目镜来读取速度数据", + "advancement.create.stress_gauge": "精密的应力控制", + "advancement.create.stress_gauge.desc": "放置一个应力表，并且带上工程师护目镜来读取应力数据", + + "advancement.create.water_wheel": "治水", + "advancement.create.water_wheel.desc": "放置一个水车并且让它开始旋转", + "advancement.create.lava_wheel": "风火轮", + "advancement.create.lava_wheel.desc": "你确定岩浆能带动水车？", + "advancement.create.millstone": "便携式粉碎机", + "advancement.create.millstone.desc": "放置一个石磨并且为其供能", + "advancement.create.andesite_casing": "安山纪元", + "advancement.create.andesite_casing.desc": "使用安山合金和木头来合成一个安山外壳", + "advancement.create.drill": "坚如磐石，势如破竹", + "advancement.create.drill.desc": "放置一个动力钻头并且为其供能", + "advancement.create.press": "'Duang!'", + "advancement.create.press.desc": "使用辊压机来辊压一些板子", + "advancement.create.polished_rose_quartz": "粉丝钻石", + "advancement.create.polished_rose_quartz.desc": "用砂纸将玫瑰石英打磨至透明", + "advancement.create.electron_tube": "哔~~哔~~", + "advancement.create.electron_tube.desc": "制作一个可用于合成高级机器的电子管", + "advancement.create.saw": "一刀两断", + "advancement.create.saw.desc": "放置一个切割机并且为其供能", + "advancement.create.basin": "快到碗里来", + "advancement.create.basin.desc": "放置一个工作盆，并且往里面放些东西", + "advancement.create.mixer": "均匀搅拌", + "advancement.create.mixer.desc": "将搅拌机放在工作盆上方，并且使其搅拌盆内物品", + "advancement.create.compact": "快乐压缩", + "advancement.create.compact.desc": "使用辊压机在工作盆中压缩一些物品", + + "advancement.create.expert_lane_1": "The Andesite Expert Lane", + "advancement.create.expert_lane_1.desc": "Work in Progress", + + "advancement.create.brass": "真正的合金", + "advancement.create.brass.desc": "使用碎锌和碎铜来制作碎黄铜", + "advancement.create.brass_casing": "黄铜纪元", + "advancement.create.brass_casing.desc": "用黄铜和木头制作一个黄铜外壳", + "advancement.create.copper_casing": "铜纪元", + "advancement.create.copper_casing.desc": "使用铜和木头制作一个铜制外壳", + + "advancement.create.crafter": "自动化流水作业", + "advancement.create.crafter.desc": "放置一些机械合成台并且为其供能", + "advancement.create.deployer": "我就指着你了咋地？", + "advancement.create.deployer.desc": "放置并且功能一个机械手。这可是你右手的完美复制品", + "advancement.create.fist_bump": "机械之间的友谊", + "advancement.create.fist_bump.desc": "使两个机械臂互相碰拳", + "advancement.create.crushing_wheel": "超级巨无霸", + "advancement.create.crushing_wheel.desc": "制作一些能更快粉碎物品的粉碎轮", + + "advancement.create.chromatic_compound": "极端材料", + "advancement.create.chromatic_compound.desc": "制作一个谜之化合物", + "advancement.create.shadow_steel": "暗影中的宝石", + "advancement.create.shadow_steel.desc": "制作一些暗影金属", + "advancement.create.refined_radiance": "闪耀着洁白的圣光", + "advancement.create.refined_radiance.desc": "制作一个光辉石", + + "advancement.create.zapper": "讲究的建筑师", + "advancement.create.zapper.desc": "制作一个非常方便的手持方块放置器", + "advancement.create.upgraded_zapper": "来自异世界的超频", + "advancement.create.upgraded_zapper.desc": "制作一个完全升级的手持方块放置器", + "advancement.create.symmetry_wand": "简单的镜面几何学", + "advancement.create.symmetry_wand.desc": "制作一个对称法杖", + "advancement.create.deforester": "超时空砍伐", + "advancement.create.deforester.desc": "制作一个森林毁灭者， 然后跟你后院的树林说再见吧", + + "advancement.create.eob": "测试版内容到此为止", + "advancement.create.eob.desc": "未来会有更多很棒棒的东西哦", - "create.subtitle.schematicannon_launch_block": "Schematicannon shoots", - "create.subtitle.schematicannon_finish": "Schematicannon finishes", - "create.subtitle.slime_added": "Slime squishes", - "create.subtitle.mechanical_press_activation": "Mechanical Press activates", - "create.subtitle.mechanical_press_item_break": "Metal clanks", - "create.subtitle.blockzapper_place": "Blocks zap into place", - "create.subtitle.blockzapper_confirm": "Affirmative Ding", - "create.subtitle.blockzapper_deny": "Declining Boop", - "create.subtitle.block_funnel_eat": "Funnel CHOMPS", + "create.subtitle.schematicannon_launch_block": "蓝图大炮发射", + "create.subtitle.schematicannon_finish": "蓝图大炮完成", + "create.subtitle.slime_added": "史莱姆挤压", + "create.subtitle.mechanical_press_activation": "辊压机工作", + "create.subtitle.mechanical_press_item_break": "金属碰撞", + "create.subtitle.blockzapper_place": "方块被放置", + "create.subtitle.blockzapper_confirm": "完成的“叮”提示声", + "create.subtitle.blockzapper_deny": "拒绝的警报", + "create.subtitle.block_funnel_eat": "传送带漏斗咀嚼", "_comment": "-------------------------] ITEM DESCRIPTIONS [------------------------------------------------", @@ -734,14 +771,14 @@ "item.create.deforester.tooltip.summary": "树林毁灭者，能够瞬间_砍倒_一棵树", "item.create.filter.tooltip": "FILTER", - "item.create.filter.tooltip.summary": "以更高的精度控制后勤设备的输出和输入，将它们与一组item或多个嵌套过滤器相匹配.（机翻）", + "item.create.filter.tooltip.summary": "将物品更精确地进行筛选分类， 可以同时筛选多个物品或者将已标记的过滤器放在另一个过滤器里嵌套使用.", "item.create.filter.tooltip.condition1": "当处于过滤器槽中", "item.create.filter.tooltip.behaviour1": "根据过滤器的配置,控制物品流经过滤器", "item.create.filter.tooltip.condition2": "当右键时", "item.create.filter.tooltip.behaviour2": "打开_配置面板_", "item.create.property_filter.tooltip": "ATTRIBUTE FILTER", - "item.create.property_filter.tooltip.summary": "以更高的精度控制物流设备的输出和输入，将它们与一组itme属性匹配.（机翻）", + "item.create.property_filter.tooltip.summary": "比起普通过滤器， 属性过滤器可以根据不同物品的属性来进行过滤", "item.create.property_filter.tooltip.condition1": "当处于过滤器槽中", "item.create.property_filter.tooltip.behaviour1": "根据过滤器的配置,控制物品流经过滤器", "item.create.property_filter.tooltip.condition2": "当右键时", @@ -753,10 +790,10 @@ "block.create.cocoa_log.tooltip.behaviour1": "四面生长可可豆", "item.create.empty_blueprint.tooltip": "EMPTY SCHEMATIC", - "item.create.empty_blueprint.tooltip.summary": "可作为合成材料或在原理图桌使用", + "item.create.empty_blueprint.tooltip.summary": "可作为合成材料或在蓝图桌使用", "item.create.blueprint.tooltip": "SCHEMATIC", - "item.create.blueprint.tooltip.summary": "可以放置在世界中的结构,根据需要放置全息图,并使用原理图加农炮进行构建.", + "item.create.blueprint.tooltip.summary": "可以放置在世界中的结构,根据需要放置全息图,并使用蓝图加农炮进行构建.", "item.create.blueprint.tooltip.condition1": "当全息图存在时", "item.create.blueprint.tooltip.behaviour1": "可以使用屏幕上的工具定位", "item.create.blueprint.tooltip.control1": "当潜行右键时", @@ -765,7 +802,7 @@ "item.create.blueprint_and_quill.tooltip": "SCHEMATIC AND QUILL", "item.create.blueprint_and_quill.tooltip.summary": "用于将世界中的结构保存到.nbt文件.", "item.create.blueprint_and_quill.tooltip.condition1": "第一步", - "item.create.blueprint_and_quill.tooltip.behaviour1": "手持原理图与右键旋转两个点", + "item.create.blueprint_and_quill.tooltip.behaviour1": "手持蓝图与右键旋转两个点", "item.create.blueprint_and_quill.tooltip.condition2": "第二步", "item.create.blueprint_and_quill.tooltip.behaviour2": "按住Ctrl鼠标滚轮选择选区大小,右键空白处保存.", "item.create.blueprint_and_quill.tooltip.control1": "右键", @@ -775,17 +812,14 @@ "item.create.blueprint_and_quill.tooltip.control3": "当潜行右键时", "item.create.blueprint_and_quill.tooltip.action3": "_重置_并删除选区.", - "block.create.creative_crate.tooltip": "CREATIVE CRATE", - "block.create.creative_crate.tooltip.summary": "为相邻的原理图加农炮提供无限能量的方块", - "block.create.schematicannon.tooltip": "SCHEMATICANNON", "block.create.schematicannon.tooltip.summary": "发射方块以在世界中重新构建已部署的全息图,使用相邻箱子中的物品及火药作为燃料.", "block.create.schematicannon.tooltip.control1": "当右键时", "block.create.schematicannon.tooltip.action1": "打开gui界面", "block.create.schematic_table.tooltip": "SCHEMATIC TABLE", - "block.create.schematic_table.tooltip.summary": "将保存的原理图图写入空白原理图", - "block.create.schematic_table.tooltip.condition1": "放入空白原理图时", + "block.create.schematic_table.tooltip.summary": "将保存的蓝图图写入空白蓝图", + "block.create.schematic_table.tooltip.condition1": "放入空白蓝图时", "block.create.schematic_table.tooltip.behaviour1": "从Schematics文件夹上传所选文件", "block.create.shaft.tooltip": "SHAFT", @@ -831,16 +865,16 @@ "item.create.belt_connector.tooltip.action2": "重置传送带的第一个选定位置", "item.create.goggles.tooltip": "GOGGLES", - "item.create.goggles.tooltip.summary": "一副特殊的眼镜,能够让你看见 _Kinetic_ 的信息.", + "item.create.goggles.tooltip.summary": "一副特殊的眼镜,能够让你看见 _动能_ 的信息.", "item.create.goggles.tooltip.condition1": "当装备时", - "item.create.goggles.tooltip.behaviour1": "将会展示Kinetic的速度、应力等信息", + "item.create.goggles.tooltip.behaviour1": "将会展示动能的速度、应力等信息", "item.create.goggles.tooltip.condition2": "当看向仪表时", "item.create.goggles.tooltip.behaviour2": "将会展示仪表连接网络的速度、应力等信息.", "item.create.wrench.tooltip": "WRENCH", - "item.create.wrench.tooltip.summary": "一种有用的工具，能够调整_Kinetic_的_方向_、_配置_等.", - "item.create.wrench.tooltip.control1": "当右键Kinetic时", - "item.create.wrench.tooltip.action1": "旋转Kinetic的方向至你点击的面", + "item.create.wrench.tooltip.summary": "一种有用的工具，能够调整_动能_的_方向_、_配置_等.", + "item.create.wrench.tooltip.control1": "当右键动能时", + "item.create.wrench.tooltip.action1": "旋转动能的方向至你点击的面", "item.create.wrench.tooltip.control2": "当潜行右键时", "item.create.wrench.tooltip.action2": "将物品取下并移动到你的背包中.", @@ -852,8 +886,8 @@ "block.create.encased_fan.tooltip": "ENCASED FAN", "block.create.encased_fan.tooltip.summary": "有多种用途,主要可以将动力转化为气流.", - "block.create.encased_fan.tooltip.condition1": "在下方点火时", - "block.create.encased_fan.tooltip.behaviour1": "可为连结的传动结构提供动力(热力>动力)", + "block.create.encased_fan.tooltip.condition1": "当被红石信号激活后", + "block.create.encased_fan.tooltip.behaviour1": "可将鼓风机下方的热能（火， 岩浆等）转化成动能， 需要将鼓风机向下摆放", "block.create.encased_fan.tooltip.condition2": "当旋转时", "block.create.encased_fan.tooltip.behaviour2": "一面推动实体,一面吸引实体,强度和速度取决于给予的动力.", "block.create.encased_fan.tooltip.condition3": "当气流通过火,水,岩浆时", @@ -870,10 +904,17 @@ "block.create.cuckoo_clock.tooltip": "CUCKOO CLOCK", "block.create.cuckoo_clock.tooltip.summary": "精致的工艺品,能够记录时间", "block.create.cuckoo_clock.tooltip.condition1": "当旋转时", - "block.create.cuckoo_clock.tooltip.behaviour1": "显示 _当前时间_ 并且一天会咕咕_两次_. ", + "block.create.cuckoo_clock.tooltip.behaviour1": "显示 _当前时间_ 并且一天会咕咕_两次_.中午咕咕一次， 黄昏可以睡觉的时候咕咕一次 ", "block.create.turntable.tooltip": "TURNTABLE", - "block.create.turntable.tooltip.summary": "一个普通的转盘.", + "block.create.turntable.tooltip.summary": "让旋转动力给你带来一场刺激的旋转风车体验.", + + "block.create.millstone.tooltip": "MILLSTONE", + "block.create.millstone.tooltip.summary": "一个能研磨物品的动能装置， 可以被临近的齿轮供能， 或者可以在底部用传动杆供能， 成品必须被提取出石磨", + "block.create.millstone.tooltip.condition1": "当旋转运作时", + "block.create.millstone.tooltip.behaviour1": "开始根据 _研磨配方_ 来处理物品.", + "block.create.millstone.tooltip.condition2": "当右键时", + "block.create.millstone.tooltip.behaviour2": "手动取出研磨后的成品.", "block.create.crushing_wheel.tooltip": "CRUSHING WHEEL", "block.create.crushing_wheel.tooltip.summary": "用于建造多方块粉碎机,粉碎轮的齿必须以相同的速度朝相对的方向旋转才可处理各种物品的粉碎合成.", @@ -897,7 +938,7 @@ "block.create.mechanical_mixer.tooltip.condition1": "当位于工作盆上方", "block.create.mechanical_mixer.tooltip.behaviour1": "只要工作盆中有必要的物品,就会将物品进行搅拌", "block.create.mechanical_mixer.tooltip.condition2": "当使用扳手时", - "block.create.mechanical_mixer.tooltip.behaviour2": "配置配方中物品的最小数目,通过这个配置能够避免不需要的、相似的配方", + "block.create.mechanical_mixer.tooltip.behaviour2": "配置配方中物品合成所需的最小数目,通过这个配置能够避免不需要的、相似的配方", "block.create.mechanical_crafter.tooltip": "MECHANICAL CRAFTER", "block.create.mechanical_crafter.tooltip.summary": "一种动态制作的工作台,根据你配置的配方进行合成.", @@ -946,7 +987,7 @@ "block.create.mechanical_bearing.tooltip": "MECHANICAL BEARING", "block.create.mechanical_bearing.tooltip.summary": "用于建造旋转的大型风力动能结构,比如风车.", "block.create.mechanical_bearing.tooltip.condition1": "当旋转时", - "block.create.mechanical_bearing.tooltip.behaviour1": "就是旋转啊还能怎么样....", + "block.create.mechanical_bearing.tooltip.behaviour1": "使用_史莱姆块_或者_底盘_来驱动更多方块", "block.create.mechanical_bearing.tooltip.condition2": "给予红石信号时", "block.create.mechanical_bearing.tooltip.behaviour2": "开始旋转并为连接的传动方块提供动力(此结构需使用羊毛建造).", @@ -1001,6 +1042,11 @@ "block.create.harvester.tooltip.summary": "适用于中型作物自动化的收割机", "block.create.harvester.tooltip.condition1": "由动力活塞推动时", "block.create.harvester.tooltip.behaviour1": "收割机移动至成熟作物收割作物并将作物变为初始生长状态.", + + "block.create.plough.tooltip": "MECHANICAL PLOUGH", + "block.create.plough.tooltip.summary": "犁是一个非常有用的多功能方块， 它可以被 _动力活塞_ 和 _动力轴承_ 等方块带动", + "block.create.plough.tooltip.condition1": "当移动时", + "block.create.plough.tooltip.behaviour1": "可以打掉无碰撞体积的一些附着方块，比如火把和雪等. 可以在不伤害实体的情况下推动它们. 能像锄头一样翻土耕田", "block.create.saw.tooltip": "MECHANICAL SAW", "block.create.saw.tooltip.summary": "可以用于砍树,也可以用于切割方块.", @@ -1041,12 +1087,17 @@ "block.create.flexcrate.tooltip.control1": "当右键方块时", "block.create.flexcrate.tooltip.action1": "打开箱子", + "block.create.creative_crate.tooltip": "THE ENDLESS CRATE", + "block.create.creative_crate.tooltip.summary": "这个容器可以给临近的 _蓝图大炮_ 提供无限物品 （创造专用物品）", + "block.create.creative_crate.tooltip.condition1": "当标记了物品时", + "block.create.creative_crate.tooltip.behaviour1": "容器将会从虚空中提供无限量的标记物品，并且任何放置到容器中的物品都会被送入虚空", + "block.create.extractor.tooltip": "EXTRACTOR", "block.create.extractor.tooltip.summary": "从连接的箱子里自动将物品输出到外面,可以设置白名单过滤.", "block.create.extractor.tooltip.condition1": "当提供红石信号时", "block.create.extractor.tooltip.behaviour1": "暂停自动输出", "block.create.extractor.tooltip.condition2": "放置在传送带上时", - "block.create.extractor.tooltip.behaviour2": "当传送带被黄铜箱加固时,使用提取器可以将传送带上的物品提取出来. 当提取器堵塞时,传送带将会停下.", + "block.create.extractor.tooltip.behaviour2": "当传送带被黄铜外壳加固时,使用提取器可以将传送带上的物品提取出来. 当提取器堵塞时,传送带将会停下.", "block.create.extractor.tooltip.control1": "当右键过滤框时", "block.create.extractor.tooltip.action1": "将当前持有的物品设置为物品过滤白名单", @@ -1055,14 +1106,14 @@ "block.create.transposer.tooltip.condition1": "当给予红石信号时", "block.create.transposer.tooltip.behaviour1": "暂停传输.", "block.create.transposer.tooltip.condition2": "放置在传送带上时", - "block.create.transposer.tooltip.behaviour2": "当传送带被黄铜箱加固时,使用传输器可以将传送带上的物品提取出来. 当传输器堵塞时,传送带将会停下.", + "block.create.transposer.tooltip.behaviour2": "当传送带被黄铜外壳加固时,使用传输器可以将传送带上的物品提取出来. 当传输器堵塞时,传送带将会停下.", "block.create.transposer.tooltip.control1": "当右键过滤框时", "block.create.transposer.tooltip.action1": "将当前持有的物品设置为物品过滤白名单.", "block.create.deployer.tooltip": "DEPLOYER", "block.create.deployer.tooltip.summary": "它是一个机械手,将尽可能模仿玩家的行为,能够将物品拿出来,也可以将物品放入物品栏中. 可以设置白名单.", "block.create.deployer.tooltip.condition1": "当旋转时", - "block.create.deployer.tooltip.behaviour1": "将可以伸出手臂2m长", + "block.create.deployer.tooltip.behaviour1": "将可以伸出手臂两个方块长", "block.create.deployer.tooltip.condition2": "当使用扳手时", "block.create.deployer.tooltip.behaviour2": "将会启用拳头模式,在拳头模式之下,机械臂将会试图使用手中的物品破坏方块,或者攻击实体.", @@ -1090,7 +1141,7 @@ "block.create.belt_funnel.tooltip.behaviour1": "位于传送带边上或者终点时,传送带漏斗可以将物品从传送带上拿出. 如果在传送带边上且传动带漏斗阻塞时,不会阻塞传送带.", "block.create.belt_tunnel.tooltip": "BELT TUNNEL", - "block.create.belt_tunnel.tooltip.summary": "这是一种美观的方块,能够让传送带穿过墙壁,但是传送带必须被黄铜箱包装.如果启动了同步模式,且旁边有传送带隧道时,将会等待另一个周围的传送带隧道的物品,一起通过. [Ctrl]", + "block.create.belt_tunnel.tooltip.summary": "这是一种美观的方块,能够让传送带穿过墙壁,但是传送带必须被黄铜外壳包装.如果启动了同步模式,且旁边有传送带隧道时,将会等待另一个周围的传送带隧道的物品,一起通过. [Ctrl]", "block.create.belt_tunnel.tooltip.control1": "当使用扳手右键前面时", "block.create.belt_tunnel.tooltip.action1": "启动同步模式", "block.create.belt_tunnel.tooltip.control2": "当使用扳手右键边上时", @@ -1099,18 +1150,18 @@ "block.create.brass_casing.tooltip": "BRASS CASING", "block.create.brass_casing.tooltip.summary": "一种坚固的外壳,有多种用处.", "block.create.brass_casing.tooltip.condition1": "当被使用在传送带上时", - "block.create.brass_casing.tooltip.behaviour1": "当传送带上装配有黄铜箱时,可以提供传送带两侧安装传送带隧道、提取器、传输器、传送带漏斗等物品", + "block.create.brass_casing.tooltip.behaviour1": "当传送带上装配有黄铜外壳时,可以提供传送带两侧安装传送带隧道、提取器、传输器、传送带漏斗等物品", "block.create.entity_detector.tooltip": "BELT OBSERVER", "block.create.entity_detector.tooltip.summary": "检测传送带上经过观察者的物品、实体. 使用扳手将可以修改它的模式.", "block.create.entity_detector.tooltip.condition1": "观测模式", "block.create.entity_detector.tooltip.behaviour1": "当观测到传送带上有物品或者实体时,将会提供红石信号", "block.create.entity_detector.tooltip.condition2": "脉冲模式", - "block.create.entity_detector.tooltip.behaviour2": "当观察者中心线匹配到物品时，将会发出脉冲", - "block.create.entity_detector.tooltip.condition3": "弹射模式", - "block.create.entity_detector.tooltip.behaviour3": "将匹配的物品弹射出传送带. 如果目标位置被堵塞,物品将会停下等待弹射.", + "block.create.entity_detector.tooltip.behaviour2": "当观察者中心线匹配到物品时，将会发出红石脉冲", + "block.create.entity_detector.tooltip.condition3": "转移模式", + "block.create.entity_detector.tooltip.behaviour3": "将匹配的物品转移至观察者前方的传送带. 如果目标位置被堵塞,物品将会停下等待转移.", "block.create.entity_detector.tooltip.condition4": "分裂模式", - "block.create.entity_detector.tooltip.behaviour4": "将匹配的物品分成两部分,一部分弹射到传送带出.", + "block.create.entity_detector.tooltip.behaviour4": "将匹配的物品分成两部分,一半的物品被传送到前方的传送带.", "block.create.pulse_repeater.tooltip": "PULSE REPEATER", "block.create.pulse_repeater.tooltip.summary": "一个简单的电路,将通过的红石信号变为1tick.", @@ -1140,6 +1191,18 @@ "block.create.stress_gauge.tooltip.condition1": "当旋转时", "block.create.stress_gauge.tooltip.behaviour1": "将会用颜色展示承受的应力", + "tool.create.sand_paper.tooltip": "SAND PAPER", + "tool.create.sand_paper.tooltip.summary": "用来打磨物品的砂纸， 可以用机械臂来实现自动化.", + "tool.create.sand_paper.tooltip.condition1": "当使用时", + "tool.create.sand_paper.tooltip.behaviour1": "打磨副手上或者准心所指向的物品", + + "item.create.super_glue.tooltip": "SUPER GLUE", + "item.create.super_glue.tooltip.summary": "让两个方块互相粘黏，他们会一直因此相爱到永远", + "item.create.super_glue.tooltip.condition1": "右键使用时", + "item.create.super_glue.tooltip.behaviour1": "有强力胶的方块的那一面会变得有粘性。和这一面相邻的方块在被活塞或者动力轴承等方块驱动的时候会被一同带动", + "item.create.super_glue.tooltip.condition2": "在副手上时", + "item.create.super_glue.tooltip.behaviour2": "主手放置的方块会被直接黏在所放置的方块上", + "item.create.refined_radiance.tooltip": "REFINED RADIANCE", "item.create.refined_radiance.tooltip.summary": "一种用光辉锻造的化合物材料.", @@ -1150,24 +1213,13 @@ "item.create.slot_cover.tooltip.summary": "用来标记制造机不放入物品.", "tool.create.shadow_steel.tooltip": "SHADOW STEEL TOOLS", - "tool.create.shadow_steel.tooltip.summary": "一种强力的武器,破坏方块将会掉落更多物品. 杀死怪物将会掉落更多经验值", + "tool.create.shadow_steel.tooltip.summary": "一种强力的工具， 但是破坏方块的同时也会破坏其掉落物。 杀死生物会掉落更多经验， 经验的数量和_抢夺_的附魔等级有关", "tool.create.blazing.tooltip": "BLAZING TOOLS", - "tool.create.blazing.tooltip.summary": "将会融化破坏的方块,并且点燃怪物,在地狱中不会减少耐久", + "tool.create.blazing.tooltip.summary": "将会冶炼被破坏的方块,并且点燃怪物,在地狱中不会减少耐久", "tool.create.rose_quartz.tooltip": "ROSE QUARTZ TOOLS", - "tool.create.rose_quartz.tooltip.summary": "这个工具将会让你更容易使用副手放置或破坏方块.", - - "item.create.logistical_controller_calculation.tooltip": "WIP", - "item.create.logistical_controller_request.tooltip": "WIP", - "item.create.logistical_controller_storage.tooltip": "WIP", - "item.create.logistical_controller_supply.tooltip": "WIP", - "item.create.logistical_controller_transactions.tooltip": "WIP", - "block.create.logistical_index.tooltip": "WIP", - "block.create.package_funnel.tooltip": "WIP", - "block.create.logisticians_table.tooltip": "WIP", - "item.create.logistical_dial.tooltip": "WIP", - "item.create.logistical_filter.tooltip": "WIP", + "tool.create.rose_quartz.tooltip.summary": "这个工具将会让你的手更长， 伸的更远.", "itemGroup.create": "机械动力" -} +} \ No newline at end of file