From bc4418a929603d222ca8717f0f6ae61f0bee2370 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sun, 4 Oct 2020 01:59:51 +0200 Subject: [PATCH] Port recent changes to compile --- src/generated/resources/.cache/cache | 398 +--- .../assets/create/blockstates/fluid_pipe.json | 220 +- .../create/blockstates/radial_chassis.json | 72 +- .../assets/create/lang/unfinished/de_de.json | 320 ++- .../assets/create/lang/unfinished/fr_fr.json | 949 ++++----- .../assets/create/lang/unfinished/it_it.json | 260 ++- .../assets/create/lang/unfinished/ja_jp.json | 1524 ++++++-------- .../assets/create/lang/unfinished/ko_kr.json | 1291 +++++------- .../assets/create/lang/unfinished/nl_nl.json | 24 +- .../assets/create/lang/unfinished/pt_br.json | 383 ++-- .../assets/create/lang/unfinished/ru_ru.json | 695 +++---- .../assets/create/lang/unfinished/zh_cn.json | 1817 +++++++---------- .../java/com/simibubi/create/AllBlocks.java | 7 +- .../simibubi/create/compat/jei/CreateJEI.java | 1 - .../create/compat/jei/EmptyBackground.java | 1 + .../jei/category/BlastingViaFanCategory.java | 1 - .../category/BlockzapperUpgradeCategory.java | 1 - .../jei/category/CreateRecipeCategory.java | 1 - .../category/MechanicalCraftingCategory.java | 1 - .../compat/jei/category/MixingCategory.java | 2 +- .../jei/category/PolishingCategory.java | 1 - .../category/ProcessingViaFanCategory.java | 1 - .../jei/category/SplashingCategory.java | 1 - .../animations/AnimatedBlazeBurner.java | 1 - .../category/animations/AnimatedCrafter.java | 1 - .../animations/AnimatedCrushingWheels.java | 1 - .../animations/AnimatedMillstone.java | 1 - .../category/animations/AnimatedMixer.java | 1 - .../category/animations/AnimatedPress.java | 1 - .../jei/category/animations/AnimatedSaw.java | 1 - .../content/contraptions/KineticDebugger.java | 2 +- .../contraptions/TorquePropagator.java | 4 +- .../components/actors/AttachedActorBlock.java | 6 +- .../components/actors/DrillBlock.java | 6 +- .../actors/HarvesterMovementBehaviour.java | 2 +- .../PortableStorageInterfaceMovement.java | 14 +- .../PortableStorageInterfaceTileEntity.java | 5 +- .../dispenser/ContraptionBlockSource.java | 6 +- .../dispenser/DispenserMovementBehaviour.java | 8 +- .../dispenser/DropperMovementBehaviour.java | 9 +- .../IMovedDispenseItemBehaviour.java | 10 +- .../MovedDefaultDispenseItemBehaviour.java | 1 + .../MovedProjectileDispenserBehaviour.java | 9 +- .../crafter/ConnectedInputHandler.java | 20 +- .../crafter/MechanicalCrafterRenderer.java | 2 +- .../components/crank/AllValveHandles.java | 9 +- .../components/crank/HandCrankTileEntity.java | 2 +- .../components/crank/ValveHandleBlock.java | 5 +- .../crusher/CrushingWheelControllerBlock.java | 2 +- .../components/deployer/DeployerBlock.java | 6 +- .../deployer/DeployerFakePlayer.java | 1 - .../components/deployer/DeployerHandler.java | 22 +- .../components/deployer/DeployerRenderer.java | 4 +- .../components/fan/AirCurrent.java | 4 +- .../components/fan/EncasedFanTileEntity.java | 2 +- .../engine/FurnaceEngineTileEntity.java | 2 +- .../mixer/MechanicalMixerTileEntity.java | 2 - .../contraptions/components/saw/SawBlock.java | 5 +- .../components/saw/SawRenderer.java | 2 +- .../BlockMovementTraits.java | 2 +- .../structureMovement/Contraption.java | 4 +- .../ContraptionCollider.java | 5 +- .../structureMovement/ContraptionEntity.java | 2 +- .../ContraptionInteractionHandler.java | 2 +- .../ContraptionRenderer.java | 2 +- .../structureMovement/MovementContext.java | 1 - .../bearing/ClockworkBearingTileEntity.java | 2 +- .../glue/SuperGlueEntity.java | 2 +- .../mounted/CartAssemblerBlock.java | 6 +- .../mounted/CartAssemblerTileEntity.java | 7 +- .../ItemHandlerModifiableFromIInventory.java | 6 +- .../mounted/MountedContraption.java | 7 +- .../piston/MechanicalPistonBlock.java | 2 +- .../piston/MechanicalPistonHeadBlock.java | 7 +- .../piston/PistonExtensionPoleBlock.java | 11 +- .../structureMovement/pulley/PulleyBlock.java | 3 +- .../pulley/PulleyTileEntity.java | 4 +- .../train/MinecartTrain.java | 2 +- .../tracks/ReinforcedRailBlock.java | 6 +- .../components/turntable/TurntableBlock.java | 2 +- .../waterwheel/WaterWheelBlock.java | 6 +- .../contraptions/fluids/FluidNetwork.java | 1 - .../contraptions/fluids/FluidPropagator.java | 3 +- .../contraptions/fluids/FluidReactions.java | 2 +- .../contraptions/fluids/OpenEndedPipe.java | 2 +- .../contraptions/fluids/PumpBlock.java | 2 +- .../fluids/pipes/FluidPipeBlock.java | 4 +- .../fluids/pipes/FluidValveTileEntity.java | 25 +- .../goggles/GoggleConfigScreen.java | 7 +- .../goggles/GoggleOverlayRenderer.java | 8 +- .../goggles/IHaveGoggleInformation.java | 4 +- .../goggles/IHaveHoveringInformation.java | 4 +- .../particle/AirFlowParticle.java | 1 - .../contraptions/particle/AirParticle.java | 1 - .../contraptions/particle/CubeParticle.java | 3 +- .../contraptions/particle/HeaterParticle.java | 1 - .../particle/RotationIndicatorParticle.java | 1 - .../processing/BasinMovementBehaviour.java | 13 +- .../processing/BasinRenderer.java | 4 +- .../processing/ProcessingRecipeBuilder.java | 1 - .../processing/burner/BlazeBurnerBlock.java | 14 +- .../sequencer/InstructionSpeedModifiers.java | 1 + .../sequencer/SequencedGearshiftScreen.java | 4 +- .../sequencer/SequencerInstructions.java | 1 + .../contraptions/relays/belt/BeltBlock.java | 2 +- .../relays/belt/BeltRenderer.java | 4 +- .../contraptions/relays/belt/BeltShapes.java | 2 +- .../belt/item/BeltConnectorHandler.java | 2 +- .../BeltFunnelInteractionHandler.java | 2 +- .../relays/belt/transport/BeltInventory.java | 1 - .../belt/transport/BeltMovementHandler.java | 2 +- .../BeltTunnelInteractionHandler.java | 2 +- .../relays/elementary/CogWheelBlock.java | 3 +- .../relays/elementary/ShaftBlock.java | 3 +- .../relays/encased/AdjustablePulleyBlock.java | 1 - .../relays/encased/EncasedShaftBlock.java | 2 +- .../contraptions/relays/gauge/GaugeBlock.java | 4 +- .../relays/gauge/GaugeShaper.java | 2 +- .../relays/gauge/SpeedGaugeTileEntity.java | 1 - .../relays/gauge/StressGaugeTileEntity.java | 1 - .../relays/gearbox/GearboxBlock.java | 2 +- .../contraptions/wrench/WrenchItem.java | 4 +- .../wrench/WrenchItemRenderer.java | 2 +- .../curiosities/ChromaticCompoundItem.java | 5 +- .../symmetry/SymmetryWandItem.java | 6 +- .../symmetry/SymmetryWandScreen.java | 3 +- .../client/SymmetryWandItemRenderer.java | 2 +- .../tools/DeforesterItemRenderer.java | 2 +- .../curiosities/tools/SandPaperItem.java | 4 +- .../tools/SandPaperItemRenderer.java | 7 +- .../curiosities/zapper/ZapperItem.java | 4 +- .../zapper/ZapperRenderHandler.java | 2 +- .../curiosities/zapper/ZapperScreen.java | 1 - .../zapper/blockzapper/BlockzapperItem.java | 1 - .../blockzapper/BlockzapperItemRenderer.java | 2 +- .../zapper/terrainzapper/CylinderBrush.java | 2 +- .../WorldshaperItemRenderer.java | 2 +- .../content/logistics/InWorldProcessing.java | 2 +- .../logistics/RedstoneLinkNetworkHandler.java | 2 +- .../belts/observer/BeltObserverBlock.java | 171 -- .../observer/BeltObserverTileEntity.java | 88 - .../belts/tunnel/BrassTunnelTileEntity.java | 3 +- .../logistics/block/funnel/FunnelBlock.java | 2 +- .../ArmInteractionPointHandler.java | 1 - .../redstone/ContentObserverTileEntity.java | 8 +- .../block/redstone/NixieTubeBlock.java | 2 +- .../block/redstone/RedstoneContactBlock.java | 8 +- .../block/redstone/StockpileSwitchScreen.java | 2 - .../item/filter/AttributeFilterScreen.java | 1 - .../logistics/item/filter/ItemAttribute.java | 3 +- .../content/palettes/PaletteBlockPartial.java | 3 +- .../palettes/PaletteBlockPatterns.java | 2 +- .../schematics/ClientSchematicLoader.java | 1 - .../content/schematics/ItemRequirement.java | 15 +- .../schematics/block/LaunchedItem.java | 2 +- .../block/SchematicTableScreen.java | 14 +- .../block/SchematicannonRenderer.java | 2 +- .../block/SchematicannonScreen.java | 69 +- .../block/SchematicannonTileEntity.java | 2 +- .../client/SchematicEditScreen.java | 2 - .../client/SchematicPromptScreen.java | 21 +- .../schematics/client/tools/Tools.java | 1 + .../schematics/item/SchematicItem.java | 4 +- .../simibubi/create/events/ClientEvents.java | 12 +- .../foundation/advancement/AllTriggers.java | 1 - .../advancement/KineticBlockTrigger.java | 2 - .../foundation/advancement/SimpleTrigger.java | 1 - .../simibubi/create/foundation/block/ITE.java | 3 +- .../collision/ContinuousOBBCollider.java | 4 +- .../foundation/collision/OBBCollider.java | 4 +- .../foundation/command/AllCommands.java | 1 + .../create/foundation/command/ChunkUtil.java | 13 +- .../foundation/command/ChunkUtilCommand.java | 1 + .../command/ConfigureConfigPacket.java | 10 +- .../command/OverlayConfigCommand.java | 1 + .../foundation/data/CreateRegistrate.java | 2 +- .../create/foundation/data/NamedTag.java | 11 +- .../foundation/data/SharedProperties.java | 1 - .../create/foundation/data/WindowGen.java | 2 +- .../data/recipe/StandardRecipeGen.java | 1 - .../foundation/fluid/FluidIngredient.java | 3 +- .../foundation/fluid/FluidRenderer.java | 4 +- .../create/foundation/gui/GuiGameElement.java | 7 +- .../foundation/gui/TextInputPromptScreen.java | 109 - .../foundation/gui/ToolSelectionScreen.java | 2 - .../gui/widgets/AbstractSimiWidget.java | 1 + .../foundation/gui/widgets/IconButton.java | 1 + .../foundation/gui/widgets/Indicator.java | 1 + .../item/PartialItemModelRenderer.java | 1 - .../create/foundation/item/TooltipHelper.java | 16 +- .../tileEntity/SyncedTileEntity.java | 4 +- .../tileEntity/behaviour/ValueBox.java | 1 - .../behaviour/ValueBoxTransform.java | 2 +- .../EdgeInteractionHandler.java | 1 - .../filtering/FilteringRenderer.java | 1 - .../inventory/InvManipulationBehaviour.java | 2 +- .../scrollvalue/BulkScrollValueBehaviour.java | 1 + .../scrollvalue/ScrollOptionBehaviour.java | 1 + .../foundation/utility/BlockHelper.java | 14 +- .../create/foundation/utility/DyeHelper.java | 1 - .../foundation/utility/MatrixStacker.java | 2 +- .../utility/ShadowRenderHelper.java | 2 +- .../foundation/utility/SuperByteBuffer.java | 4 +- .../utility/TileEntityRenderHelper.java | 4 +- .../foundation/utility/VoxelShaper.java | 2 +- .../foundation/utility/outliner/Outline.java | 2 +- .../worldWrappers/WrappedServerWorld.java | 4 +- .../utility/worldWrappers/WrappedWorld.java | 4 +- .../foundation/worldgen/AllWorldFeatures.java | 6 +- .../foundation/worldgen/OxidizingBlock.java | 9 +- 210 files changed, 3601 insertions(+), 5545 deletions(-) delete mode 100644 src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverBlock.java delete mode 100644 src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverTileEntity.java delete mode 100644 src/main/java/com/simibubi/create/foundation/gui/TextInputPromptScreen.java diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 9d81a8792..5d66a474c 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -131,13 +131,8 @@ fc652317e03b57c76e23a805da16a28d15254029 assets/create/blockstates/fancy_scoria_ 5864daf839e54789a0dc8a44505f070bf3e184bc assets/create/blockstates/fancy_weathered_limestone_bricks.json fc9ac0a7e7191b93516719455a17177fa6524ecc assets/create/blockstates/fancy_weathered_limestone_bricks_slab.json b2a7c321b1795f20e7433f81a55ce4683de081b8 assets/create/blockstates/fancy_weathered_limestone_bricks_stairs.json -<<<<<<< HEAD 8e532856c3c2b4e4e59c65a2a81a694e35d14658 assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json -ac78d52c946f9d426fa214d7323c1ae4f0d76f5c assets/create/blockstates/fluid_pipe.json -======= -6372fe02ba0065acb0758121c45a15a1a8fdc5de assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json -4c3e0500f9382d2e426e823fe876f57f4d7ee3b4 assets/create/blockstates/fluid_pipe.json ->>>>>>> mc1.15/dev +5ba9fc9e7b29c76040329367cfb45affdd473404 assets/create/blockstates/fluid_pipe.json f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json 5408d92ab02af86539ac42971d4033545970bb3a assets/create/blockstates/fluid_valve.json e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets/create/blockstates/flywheel.json @@ -309,24 +304,15 @@ a452650af5c929675b0a3c8e8bf23c6cac67152e assets/create/blockstates/polished_scor c8467d55bc22d2e2256b8b732c06c9fdc64d336f assets/create/blockstates/polished_weathered_limestone.json 5d811eab3c5e8411f98e2ea98d93d35955ce18fc assets/create/blockstates/polished_weathered_limestone_slab.json acec6cdebe772ca72de94a85d98199e827495acb assets/create/blockstates/polished_weathered_limestone_stairs.json -<<<<<<< HEAD ad721e3911f48c61c3639edac1896680a31451ff assets/create/blockstates/polished_weathered_limestone_wall.json -b7829c2ef2c47188713f8cab21b2c9bc7f9c5b79 assets/create/blockstates/portable_storage_interface.json -======= -f42ad32aefcfa7ccc6287f57ee1a5f092b65126f assets/create/blockstates/polished_weathered_limestone_wall.json 1b70b4e5792dccd2110b84e209016ac258005e28 assets/create/blockstates/portable_storage_interface.json ->>>>>>> mc1.15/dev 8296d43d5f1c2113012d127038fb319af83aaee4 assets/create/blockstates/powered_latch.json e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggle_latch.json 3a739f9d4276828d83f2d2750bf3227c87bcd438 assets/create/blockstates/pulley_magnet.json 469e430d96cb0a5e1aaf6b7cc5d401d488c9e600 assets/create/blockstates/pulse_repeater.json 92957119abd5fbcca36a113b2a80255fd70fc303 assets/create/blockstates/purple_seat.json -<<<<<<< HEAD -5c1df061eb5efe49beee7219e113206fc31a4733 assets/create/blockstates/radial_chassis.json -======= 61035f8afe75ff7bbd291da5d8690bcbebe679eb assets/create/blockstates/purple_valve_handle.json -bdd56f32ce0a148b6e466a55ab2777f69fc08cfc assets/create/blockstates/radial_chassis.json ->>>>>>> mc1.15/dev +5d1b30c2bab556f57c78e7780fd445b08f541a50 assets/create/blockstates/radial_chassis.json da1b08387af7afa0855ee8d040f620c01f20660a assets/create/blockstates/red_seat.json 722fc77bbf387af8a4016e42cbf9501d2b968881 assets/create/blockstates/red_valve_handle.json 8929677f2cc5354aa19ef182af69f9f0b41eb242 assets/create/blockstates/redstone_contact.json @@ -381,25 +367,6 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -<<<<<<< HEAD -c87674f2935327f78657f1bb44b3b10b6697a548 assets/create/lang/en_ud.json -62a4c9e5454fd6e899495c95d6fddd020d472bc7 assets/create/lang/en_us.json -db80f0a19e3327b0b7267763644d3d8b85fe4ea0 assets/create/lang/unfinished/de_de.json -018027ddd123032193b59cda440e6d844fd31ea8 assets/create/lang/unfinished/fr_fr.json -9cafa0ac988447f5bb8e3c7e950a74211c0a0aa8 assets/create/lang/unfinished/it_it.json -2487b06d32835bda79d0397e5651d37a8872e239 assets/create/lang/unfinished/ja_jp.json -08c12dd046248a36592c3580c8c9d88bdae64518 assets/create/lang/unfinished/ko_kr.json -2b2c3bac2706356b2ba5c2141cad487d3e6ed87f assets/create/lang/unfinished/nl_nl.json -2305793513d000320b89bc52a6a96f07da6cf91b assets/create/lang/unfinished/pt_br.json -6b76e956f7a045d9189e171ed5c29d3bf528c916 assets/create/lang/unfinished/ru_ru.json -c88d8ff2d4883cb5302e120b929c2438af3de64a assets/create/lang/unfinished/zh_cn.json -487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json -b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json -3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json -1358ff546e99004444fccca5355853d1738ef191 assets/create/models/block/acacia_window_pane_post.json -bd33b944ec6ad89850a1d275b3d2843fe6f831cc assets/create/models/block/acacia_window_pane_side.json -b272035cd746364a0bd3bf13061f51190e9b46d6 assets/create/models/block/acacia_window_pane_side_alt.json -======= c113d0a180880243538e9b1c3019c863df3fbdc1 assets/create/lang/en_ud.json a4cd12907a1ddfd60883077b2d11c5459d436016 assets/create/lang/en_us.json 063195daed96a4420588e6d6d13f4a9b1f099ff4 assets/create/lang/unfinished/de_de.json @@ -411,13 +378,12 @@ a908ecd03bd7ede95b5e5f0698157353ae2bec6c assets/create/lang/unfinished/nl_nl.jso ffa305b619c58bdff92d2e69b2bbc81ad5b8dcb6 assets/create/lang/unfinished/pt_br.json 6588d559aaafb4f036ba47ba2414caaa9d2f6f6a assets/create/lang/unfinished/ru_ru.json 4593a6013875039a6a30ac64d45bb4f140190fe1 assets/create/lang/unfinished/zh_cn.json -846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json -1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json -1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json -7d23c8e4543108f5f53b78ccb4908f7a5bb76c54 assets/create/models/block/acacia_window_pane_post.json -3bdcc6bd616a179ffc22e66307aab538e9bcb75f assets/create/models/block/acacia_window_pane_side.json -7b5b6809e3ef685a497ba15b549d3918aeb6c135 assets/create/models/block/acacia_window_pane_side_alt.json ->>>>>>> mc1.15/dev +487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json +b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json +3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json +1358ff546e99004444fccca5355853d1738ef191 assets/create/models/block/acacia_window_pane_post.json +bd33b944ec6ad89850a1d275b3d2843fe6f831cc assets/create/models/block/acacia_window_pane_side.json +b272035cd746364a0bd3bf13061f51190e9b46d6 assets/create/models/block/acacia_window_pane_side_alt.json 7c81658c8839fdb23429e54f847c2a0aee0e866e assets/create/models/block/adjustable_pulley_end_horizontal.json 20cfb751fc395a0e07c66ce87ab035207f9d1e0e assets/create/models/block/adjustable_pulley_end_horizontal_powered.json bb02f94b260be8fe1944b801cc4050b4d213f1df assets/create/models/block/adjustable_pulley_end_vertical.json @@ -463,49 +429,18 @@ aa5b45c6c657436bd38621344f6728d44ea974ad assets/create/models/block/andesite_cob 7c0e71f479aeef7bf02f0fb76c4333fa2227b83e assets/create/models/block/andesite_cobblestone_wall_side_tall.json 51e851b15870c0922cfbe911ef1a2f22062969f3 assets/create/models/block/andesite_funnel.json f28da6703691f1b08cfb49208f0f7bb0c5ca816d assets/create/models/block/andesite_funnel_powered.json -<<<<<<< HEAD f77390658e8aeed4352e47b94fd24df116ea1857 assets/create/models/block/andesite_pillar.json 2294f74b5c30430de89a345af60f6669c975f33a assets/create/models/block/andesite_tunnel/cross.json 17f860947f51e84a3f9b32b10cdf61f863db3afc assets/create/models/block/andesite_tunnel/straight.json e74aa39f8142293c202e57dbd92e8660818b18b5 assets/create/models/block/andesite_tunnel/t_left.json c93978d636fe70d456a6e1914b65527cbc18544c assets/create/models/block/andesite_tunnel/t_right.json 2a86780c6825edce8fbdaa118a267fc09ce410b0 assets/create/models/block/andesite_tunnel/window.json -e8bfb63e0a4426f9d95cd111640169b218dead1b assets/create/models/block/belt_observer/detect.json -a2e63810eceb028484b193ddf4315e1811950dc8 assets/create/models/block/belt_observer/detect_belt.json -034c308d46def892e6638ac0b3374849a6a88a26 assets/create/models/block/belt_observer/detect_belt_powered.json -0bddcf5449e18abbc11e984f4b125141b14baaf7 assets/create/models/block/belt_observer/detect_powered.json -c521e51b557f4643027fe7a8ec9d4f6a4ade1279 assets/create/models/block/belt_observer/eject.json -79863633fc1fec21241650a5eb3203cf4d3fd210 assets/create/models/block/belt_observer/eject_belt.json -a6d8262629371113147f8b13986a6f72c51fc100 assets/create/models/block/belt_observer/eject_belt_powered.json -2dad3c6bd49c4b608ad7c30567bb3e5845c46cf8 assets/create/models/block/belt_observer/eject_powered.json -e1b801f2f37a78f18a787f4484f7b8ec57671c4f assets/create/models/block/belt_observer/pulse.json -fc6dd3e43af11ede6ef5d402d30715ebf69dac2e assets/create/models/block/belt_observer/pulse_belt.json -7d2490e4228ce4f0ee8875d5ac5fef92eea68015 assets/create/models/block/belt_observer/pulse_belt_powered.json -fa79580db6187c864bc8148a41987ecdd1eb03b7 assets/create/models/block/belt_observer/pulse_powered.json -4f14a279e486242a65b4d6dbcdfc33db9b71942b assets/create/models/block/belt_observer/split.json -670adf5eee3f7a4b99267bd837334be6a8173e4e assets/create/models/block/belt_observer/split_belt.json -819d3107908ce21220ad45b0ae3e1c92c13c601d assets/create/models/block/belt_observer/split_belt_powered.json -76078947044ca9fc7860708ae9717a0ae47ebb1e assets/create/models/block/belt_observer/split_powered.json 0ce09f6fdfb07dead5936c118efb4064f2f6f50f assets/create/models/block/birch_window.json a5f0ed76e27d2ca706445f7f7c5f9270f98e34f9 assets/create/models/block/birch_window_pane_noside.json 9ad5224419ab7165c5208852bc4a4a5e65dcbf83 assets/create/models/block/birch_window_pane_noside_alt.json f40c4d4ea6c037158f4b9862a7c11e6024a261e6 assets/create/models/block/birch_window_pane_post.json dbfd2a996820d885d9741a3f168aa36c3538cfbd assets/create/models/block/birch_window_pane_side.json 557b35671ec417597259ba8d0239fe18c14c3d20 assets/create/models/block/birch_window_pane_side_alt.json -======= -b1d0bb538fc8285b7d3fd77a977d78a104b83b62 assets/create/models/block/andesite_pillar.json -aaf2e4259bcfcedd3400e9acb2d64c0cf06f7fb1 assets/create/models/block/andesite_tunnel/cross.json -75f628178fa21a2bd301eea8d1cebf7e94f7d5cc assets/create/models/block/andesite_tunnel/straight.json -c9aec5c30e6821c8f125202cad236afa48f6c358 assets/create/models/block/andesite_tunnel/t_left.json -1dcb8fe81a275ef8a49c04db021ad29abe8b38ae assets/create/models/block/andesite_tunnel/t_right.json -e2801a0c3fe8e1c2485291485b977f581fdc8b7c assets/create/models/block/andesite_tunnel/window.json -87f90e8256060683b834d57d3c11248d5ea84e34 assets/create/models/block/birch_window.json -94317904054cbf651846716d8af3bca618d3130f assets/create/models/block/birch_window_pane_noside.json -7a4cae5b075c4ac96a3113afafa391d024fc117f assets/create/models/block/birch_window_pane_noside_alt.json -3905ced5892afa60009bf26279f9fa4756c273d4 assets/create/models/block/birch_window_pane_post.json -62b3f2edc5ef5d7dabbcff19220921b0e3582376 assets/create/models/block/birch_window_pane_side.json -95d4230eb366f5e7684820c9337e3956ed34042a assets/create/models/block/birch_window_pane_side_alt.json ->>>>>>> mc1.15/dev 97d79ab99c0fb278a9b5dc54e1c6563868f87b76 assets/create/models/block/black_seat.json 02747ea1a0e5d4a1cd466bf26878885a89d347fa assets/create/models/block/black_valve_handle.json e58b00a7222152d7facbe0e82f00933b974df747 assets/create/models/block/blue_seat.json @@ -528,7 +463,7 @@ a959e03ca339badb49fe58ba53d86a84352e91f3 assets/create/models/block/brass_tunnel 0585fbe58da3a8ed0dc98cc7ed79ac067312078d assets/create/models/block/brass_tunnel/t_right.json a0612a633756433e1b37ddc6d290aa1fc07839ef assets/create/models/block/brass_tunnel/window.json 4eed0ad902f5e84f2b6c160f3283e8028640e77d assets/create/models/block/brown_seat.json -<<<<<<< HEAD +6c39677f8c3a84280835c717ea1ef569b7c76a1b assets/create/models/block/brown_valve_handle.json db7279f05c1d89e21da8887a15d3a1cfff4a9cf2 assets/create/models/block/chiseled_dark_scoria.json 22d4ad2de48739ab754f8dfcd6f84ad2267abf8b assets/create/models/block/chiseled_dolomite.json 550dc0622377b4736610b1c924dc890c857a0fd0 assets/create/models/block/chiseled_gabbro.json @@ -537,18 +472,7 @@ db7279f05c1d89e21da8887a15d3a1cfff4a9cf2 assets/create/models/block/chiseled_dar 041a20dd674277ff4f1613a0a89600f05458edf4 assets/create/models/block/chiseled_weathered_limestone.json f9a3f0939ea43b404eb2826b94211a25fca5ebc2 assets/create/models/block/clockwork_bearing.json 1f01a4b6608f75145734b60ddf4a33ce318425ff assets/create/models/block/copper_casing.json -======= -6c39677f8c3a84280835c717ea1ef569b7c76a1b assets/create/models/block/brown_valve_handle.json -028a07b49c05fe8a93f1d8c229d81e73d887c2df assets/create/models/block/chiseled_dark_scoria.json -b1f9ee4867373dd8f976625bab744a1c72c7fd16 assets/create/models/block/chiseled_dolomite.json -cd7751090cf3d55296b8e415d0af9b6f18d69770 assets/create/models/block/chiseled_gabbro.json -d2e195aa2e90c712e51d855a9a4a334b52f62a69 assets/create/models/block/chiseled_limestone.json -ac07568fa7b2d3fa84d0fe89a498514d30514291 assets/create/models/block/chiseled_scoria.json -ecb2b85ee210dce329d2be66b98d0f0d4e6fc223 assets/create/models/block/chiseled_weathered_limestone.json -f9a3f0939ea43b404eb2826b94211a25fca5ebc2 assets/create/models/block/clockwork_bearing.json -70406933cc4fa5471af6e562fd84a397347dba17 assets/create/models/block/copper_casing.json b2c528cfd24a5cb0cb96c45d0a914f1090f8c32b assets/create/models/block/copper_valve_handle.json ->>>>>>> mc1.15/dev 1ef7060b0ca7e9c0bfc8151f98ca08da31862cda assets/create/models/block/crate/brass/bottom.json 4ef2c7c3018f2d219f159a3ce58ceb00610b9c5d assets/create/models/block/crate/brass/left.json c76cfec1279d307c52f9502fdba3425f38219168 assets/create/models/block/crate/brass/right.json @@ -560,7 +484,7 @@ a09f639bde4c61d68592eb06c807e7a6791ff950 assets/create/models/block/crate/brass/ a123e3c8a9e2ea1665f268cf3991aa7e4b3119c6 assets/create/models/block/crate/creative/single.json 29ab5cfe7aed1271ede125e91bf78c1372b5f96e assets/create/models/block/crate/creative/top.json 6704782830b3d872321e895b6903709c18e3778f assets/create/models/block/cyan_seat.json -<<<<<<< HEAD +f45ef4a5f0aa8482d493661673b1c0ab6d061157 assets/create/models/block/cyan_valve_handle.json f5ac5007454cb04490e36f39e9047cc90501b2f6 assets/create/models/block/dark_oak_window.json d1914f0b453d360221b14ff128f5a5040441a0c6 assets/create/models/block/dark_oak_window_pane_noside.json ebee7c581235fb4166862c238469bf7c81bf0b8c assets/create/models/block/dark_oak_window_pane_noside_alt.json @@ -708,141 +632,6 @@ c395d4be2554efec583dc940e540f235d459e1c6 assets/create/models/block/fancy_weathe eaedc072f8ae70db3ffb34b0a71ffc2d40387dfe assets/create/models/block/fancy_weathered_limestone_bricks_wall_post.json fb5797cc9cbe457b7b435164d6a1622e26cf1eac assets/create/models/block/fancy_weathered_limestone_bricks_wall_side.json dd4011acc0f15444da84461387501a2ee02ad075 assets/create/models/block/fancy_weathered_limestone_bricks_wall_side_tall.json -======= -f45ef4a5f0aa8482d493661673b1c0ab6d061157 assets/create/models/block/cyan_valve_handle.json -57e70af1da4e971eca075616b787b70104189d60 assets/create/models/block/dark_oak_window.json -c7b06bc1688f3f9417d38c492d83069f493df78e assets/create/models/block/dark_oak_window_pane_noside.json -3cf8adcb5d1c8f53d2144e1a85bebe593522a34e assets/create/models/block/dark_oak_window_pane_noside_alt.json -6060e8256251807871046edb701ae9af057c6b25 assets/create/models/block/dark_oak_window_pane_post.json -6b548c48245d3f9d0cc8340495f0218c8c76968d assets/create/models/block/dark_oak_window_pane_side.json -a021dc24e218a0d12af8c1defd6eb994f3cd52ef assets/create/models/block/dark_oak_window_pane_side_alt.json -e12bf7ec94790c1fef9db1e0a209ba55b026f39e assets/create/models/block/dark_scoria.json -acbf07b2b9518dd10b03f34a46115432b6e9bf18 assets/create/models/block/dark_scoria_bricks.json -04c07c1c83371d21e79e2f54b89bed840b0b373c assets/create/models/block/dark_scoria_bricks_slab.json -b51e13fa3704c6b731062758e1bb0fdbb8d3b501 assets/create/models/block/dark_scoria_bricks_slab_top.json -f054596722c031e05403d1dfa0ebb873549364f3 assets/create/models/block/dark_scoria_bricks_stairs.json -955b30a1010ae5d1923f9759af86dee1a881d061 assets/create/models/block/dark_scoria_bricks_stairs_inner.json -f4ae0b386bdf3173a8cd30c11993395c5ff6557e assets/create/models/block/dark_scoria_bricks_stairs_outer.json -024df9c96f8004418529cfc2558f4f066eeac21a assets/create/models/block/dark_scoria_bricks_wall_post.json -3cdcc41c6b833d14a00942504c49ff2261aada88 assets/create/models/block/dark_scoria_bricks_wall_side.json -4b0850fdf9ace0f10250692c93196d5620b800ba assets/create/models/block/dark_scoria_cobblestone.json -02a39b76219bb3a52d1947cf7f72cbc1df2fd673 assets/create/models/block/dark_scoria_cobblestone_slab.json -87119cdd2e5a5793e83c534128c1da15e5ea639f assets/create/models/block/dark_scoria_cobblestone_slab_top.json -203f4fd2cfaba624620a352f6d65ba58f0412a40 assets/create/models/block/dark_scoria_cobblestone_stairs.json -4a78513a157ee7c5ed7ccaadd2bf8954268c203b assets/create/models/block/dark_scoria_cobblestone_stairs_inner.json -868362ffc0331d24e35407a27b65cbfa94c538af assets/create/models/block/dark_scoria_cobblestone_stairs_outer.json -310c6ec1d83a7731ca4baac0ebddf1b508ce1c70 assets/create/models/block/dark_scoria_cobblestone_wall_post.json -fe7666edd1e5117384c4ff032cc25cd06175df24 assets/create/models/block/dark_scoria_cobblestone_wall_side.json -b29e7589789628ddc180e146aab70ad70a461ccf assets/create/models/block/dark_scoria_pillar.json -b021c62e9c164d37bee0af97a75a0fb91dd1c9ef assets/create/models/block/diorite_bricks.json -2820f2976d73deed740356fcd19cfb4f4f493f9f assets/create/models/block/diorite_bricks_slab.json -5fb8e28b42b803199c6347f27fb06480f2d637bf assets/create/models/block/diorite_bricks_slab_top.json -70fe07eb3b04286b165d5f2e9b5fe1e75e85ad1e assets/create/models/block/diorite_bricks_stairs.json -aa23e5c6f5f3be1e7cb57f03fe044b2c6a4cfea5 assets/create/models/block/diorite_bricks_stairs_inner.json -e8dfebbc0d53bc707daafff42461fa58f4d568c4 assets/create/models/block/diorite_bricks_stairs_outer.json -5b749343983f90edcdfb07412b41014840c2b485 assets/create/models/block/diorite_bricks_wall_post.json -aed9793db091577ca75bfaf496cc9967204cb27a assets/create/models/block/diorite_bricks_wall_side.json -4a1cbe7266099a0433bc341ca5b0f750568b2355 assets/create/models/block/diorite_cobblestone.json -2ad5210a878dbe4b31c6ce5e1962fb3c0fd7f450 assets/create/models/block/diorite_cobblestone_slab.json -0587d7c549648ebd8796ad39b1887497842bbfb9 assets/create/models/block/diorite_cobblestone_slab_top.json -3e959e30e67820f14c2b5afcdd5e710025d60341 assets/create/models/block/diorite_cobblestone_stairs.json -77906d654b5601e58b1485abb4d91b10bee6d665 assets/create/models/block/diorite_cobblestone_stairs_inner.json -7e4c4297dd55ee374ed5b3599c9b86ca2001d952 assets/create/models/block/diorite_cobblestone_stairs_outer.json -98738523c2aaf9ded7f0a23edd3df05d0a1684dd assets/create/models/block/diorite_cobblestone_wall_post.json -0907ef0284c7b8624d627fca66a3bb58d0f8dbb3 assets/create/models/block/diorite_cobblestone_wall_side.json -fc589cad1cee51965d4015404ecfd3c5be7bf9e9 assets/create/models/block/diorite_pillar.json -bc70a14ba2410586e8df5df2f5f367d1160b99ca assets/create/models/block/dolomite.json -bf5a698cb710b7eea9f34224be963fd949e48fd1 assets/create/models/block/dolomite_bricks.json -6fcecec93ca2d956908e3f24e9f9c2b1a9cf6866 assets/create/models/block/dolomite_bricks_slab.json -6f0cee5268aba5a54619c51fd703fcdb5abef317 assets/create/models/block/dolomite_bricks_slab_top.json -e83a06bffddbbc901246c18451057385bbeb4368 assets/create/models/block/dolomite_bricks_stairs.json -3a77383e573704b77952cc757653347edfbea4e2 assets/create/models/block/dolomite_bricks_stairs_inner.json -92f359fa78c7a923c6093abe0e2054364c17ff4a assets/create/models/block/dolomite_bricks_stairs_outer.json -f12601207b1cf723ed84ad07b6fdc54305707689 assets/create/models/block/dolomite_bricks_wall_post.json -227729855743169df83e5795ca98af45cf7ce193 assets/create/models/block/dolomite_bricks_wall_side.json -8dfeac10f0e994714f8528608ec01f165e024e12 assets/create/models/block/dolomite_cobblestone.json -38a7bdd45f3cd806f229ae4f21df45e981c5044a assets/create/models/block/dolomite_cobblestone_slab.json -e0bc8a3e14cdab30f0304d59200392858aac6753 assets/create/models/block/dolomite_cobblestone_slab_top.json -eb3f33f313beb57f05172a60259efbb39b99b64c assets/create/models/block/dolomite_cobblestone_stairs.json -c9f925ee5d38173873e3885d34d9f2a41fb355d4 assets/create/models/block/dolomite_cobblestone_stairs_inner.json -cc6d9300cd26f2323c653dbcc61b7a885be8fa3b assets/create/models/block/dolomite_cobblestone_stairs_outer.json -a101974d906487326dc38916f828d12a278a49ae assets/create/models/block/dolomite_cobblestone_wall_post.json -9c497140dfe73abe1964479eaf1af8f1892de290 assets/create/models/block/dolomite_cobblestone_wall_side.json -999a7cd79a9dc80c47fd6103b65f006b55187402 assets/create/models/block/dolomite_pillar.json -1a8bac1e97a2a6c3cc362081568d2a7fce815ad5 assets/create/models/block/encased_fluid_pipe.json -17dae5fdc1a551d8ab1ab8a68cabf7a8c3848d86 assets/create/models/block/fancy_andesite_bricks.json -cfb2cd84a1cbd9226a77ebc1f6c29e8eaa9c577f assets/create/models/block/fancy_andesite_bricks_slab.json -8ee27601996ab577991b6a0f7e9df27db0282cad assets/create/models/block/fancy_andesite_bricks_slab_top.json -07562e409b89e641c65884e52299d01bc7bb5d4c assets/create/models/block/fancy_andesite_bricks_stairs.json -8f4ff7a0dbc504555aa4aa4034a58dac58bfddc8 assets/create/models/block/fancy_andesite_bricks_stairs_inner.json -c1e49595d1608099bbf6be79c277b37ee83cb4d1 assets/create/models/block/fancy_andesite_bricks_stairs_outer.json -ad10259e6b2afe96cf7420f53813dea061654271 assets/create/models/block/fancy_andesite_bricks_wall_post.json -a69dd114a8c6889a8cf84b3c818ec68c823d45a4 assets/create/models/block/fancy_andesite_bricks_wall_side.json -e02e5d3049e414ba2bebcbe0c9e98a7a6f668044 assets/create/models/block/fancy_dark_scoria_bricks.json -8aafa8dcba2f77ffa044d2a1a708ccb7ee9ad150 assets/create/models/block/fancy_dark_scoria_bricks_slab.json -e0349402a5d1ba7ce787cc516568aac0fe6e3a77 assets/create/models/block/fancy_dark_scoria_bricks_slab_top.json -0b70f03aa9d520826bd95848dcc50d42497c2962 assets/create/models/block/fancy_dark_scoria_bricks_stairs.json -0efa7fc5b325be824f314424273ff693eb9c1c5d assets/create/models/block/fancy_dark_scoria_bricks_stairs_inner.json -d6d1354ed26cf6b08f3f1a8d624abcd0a38c88d7 assets/create/models/block/fancy_dark_scoria_bricks_stairs_outer.json -9f622e86a49954e3ec3ad30186e2782595306786 assets/create/models/block/fancy_dark_scoria_bricks_wall_post.json -fce2c713cf10bcf22e5d67a2992e9b2cc6361fa9 assets/create/models/block/fancy_dark_scoria_bricks_wall_side.json -b5262f179a7e16a4ea38e610ad0cb5f542c3ce23 assets/create/models/block/fancy_diorite_bricks.json -613531115eb9da3e62c8f29f7bda070b9636d21d assets/create/models/block/fancy_diorite_bricks_slab.json -5b5e0ffb6dbee224e0b113e28a28cec0400fccc0 assets/create/models/block/fancy_diorite_bricks_slab_top.json -56d4280cdd32d0084891731e77719ae5b12c1343 assets/create/models/block/fancy_diorite_bricks_stairs.json -63f6a321bc330d394b0f4504e43a381ab27052f4 assets/create/models/block/fancy_diorite_bricks_stairs_inner.json -a35cf29224543bea9e410633156c6e7eb9b2cd33 assets/create/models/block/fancy_diorite_bricks_stairs_outer.json -e9c641ee32689729d020a9ec3cdf8b6f323c5d68 assets/create/models/block/fancy_diorite_bricks_wall_post.json -7aea79798d3a28172cfd5dbccbcc1bc27d6e1858 assets/create/models/block/fancy_diorite_bricks_wall_side.json -8d2d5e999618ac31fdece4a629a676e8dc123d92 assets/create/models/block/fancy_dolomite_bricks.json -a619df1e34763ba4c5d07ae09646626b47ec20ea assets/create/models/block/fancy_dolomite_bricks_slab.json -28f7c18f1a991f6ac2feb232c4d8dfacda1147c0 assets/create/models/block/fancy_dolomite_bricks_slab_top.json -76e8f44ed6c65f05e95fa092507a59b0b4ec06a9 assets/create/models/block/fancy_dolomite_bricks_stairs.json -b53c77095b44821e89199e7c060b9b51eeee08fa assets/create/models/block/fancy_dolomite_bricks_stairs_inner.json -7f3a5b2beb22180cc3eeb4c180132f3e909501be assets/create/models/block/fancy_dolomite_bricks_stairs_outer.json -0bb02cea3f7e4835503edaa6d3fb63d22750ebd9 assets/create/models/block/fancy_dolomite_bricks_wall_post.json -dc3433b852df03964bf65e7d1e2f4475741bc35c assets/create/models/block/fancy_dolomite_bricks_wall_side.json -31f49733e5fca173547c6fdb10f76b896fcc5995 assets/create/models/block/fancy_gabbro_bricks.json -b7f39739146673062d537399d3afc82c724b5487 assets/create/models/block/fancy_gabbro_bricks_slab.json -4ff85261739e4252b7d15fd35e87a7a39ba618d6 assets/create/models/block/fancy_gabbro_bricks_slab_top.json -02a8dc9079d62a138343df963c951e5a24be4967 assets/create/models/block/fancy_gabbro_bricks_stairs.json -907c443b1deb4aa1e852d038fbbbccf43439a00c assets/create/models/block/fancy_gabbro_bricks_stairs_inner.json -f573f3310f05385536c4eb285e83844faa8f97ce assets/create/models/block/fancy_gabbro_bricks_stairs_outer.json -16edcdd0330034cc27c34bf4b7962a12a9758584 assets/create/models/block/fancy_gabbro_bricks_wall_post.json -75dc73daac8c47bf032313cc2234bcd6cb1570ce assets/create/models/block/fancy_gabbro_bricks_wall_side.json -4b2759734096cbe5219d62d2f8506aecc19697af assets/create/models/block/fancy_granite_bricks.json -9dbb77b7bab451db81db5d1f4f241c710f186117 assets/create/models/block/fancy_granite_bricks_slab.json -bcface0b5cad3c2498c9bd774676d5d2ad3a7fcb assets/create/models/block/fancy_granite_bricks_slab_top.json -bfd6c7779ab9fa23fae2e3a55924d0831a3e49ca assets/create/models/block/fancy_granite_bricks_stairs.json -bbb97a95452efbc20545d9a275c3d7d45494fb41 assets/create/models/block/fancy_granite_bricks_stairs_inner.json -cfbb7d33ec6313c56731385f8321a3aac9cb0455 assets/create/models/block/fancy_granite_bricks_stairs_outer.json -1a1a92f776c558173bff0e88e736fc8c89d49603 assets/create/models/block/fancy_granite_bricks_wall_post.json -13a94c47fe855532882e22ab3c7e96c4ad101df4 assets/create/models/block/fancy_granite_bricks_wall_side.json -d2c78c1efc32154b5cb7b6994e237b12b11995c7 assets/create/models/block/fancy_limestone_bricks.json -62d3c6f4cbc5e3fb21e8b8ac1a4b6b7d13c71f4f assets/create/models/block/fancy_limestone_bricks_slab.json -c194a63f4c4759c907fdfdeefbc61a7e52b0d98c assets/create/models/block/fancy_limestone_bricks_slab_top.json -2a3524c64c9703f12f713cbb2ac629eeb7387dd7 assets/create/models/block/fancy_limestone_bricks_stairs.json -92e3cc9b274cb1cad33fc0b9a47e220030cfeab4 assets/create/models/block/fancy_limestone_bricks_stairs_inner.json -6c9ac7b68f8d0716ce6929ed4a513b00daa0ec41 assets/create/models/block/fancy_limestone_bricks_stairs_outer.json -b2f3ff1718bd599ceff121b6afa3e4b4a7121c20 assets/create/models/block/fancy_limestone_bricks_wall_post.json -28c828ae08f3a84d65b5d7a28864ea9911cc3cf1 assets/create/models/block/fancy_limestone_bricks_wall_side.json -6da75b5353a49f8c68ebc8e760a1ea9c1bd72cbb assets/create/models/block/fancy_scoria_bricks.json -aa752c7269ee79f584f2fd53b69f38ee407c5b83 assets/create/models/block/fancy_scoria_bricks_slab.json -616215efa32da630dca0e768fd2b2c4f3587ee3b assets/create/models/block/fancy_scoria_bricks_slab_top.json -0d1e864a85aee0a4e0b734d2c6fe7298195e056b assets/create/models/block/fancy_scoria_bricks_stairs.json -2910394962403031789e07ff7ce6cff411ee0d85 assets/create/models/block/fancy_scoria_bricks_stairs_inner.json -fb318bb52c43acfc0f371b69905ba4d286f85754 assets/create/models/block/fancy_scoria_bricks_stairs_outer.json -1888c192a0e765dbd264f64ae658ccbe1aa04a15 assets/create/models/block/fancy_scoria_bricks_wall_post.json -46351521c89870d27c8ed12937f5fdf8f4a234b2 assets/create/models/block/fancy_scoria_bricks_wall_side.json -daa7dca22c363d09a81f01716c80f09b22c65226 assets/create/models/block/fancy_weathered_limestone_bricks.json -857392d468416cdb55fdfa090e2c321c3fdf7024 assets/create/models/block/fancy_weathered_limestone_bricks_slab.json -8a63a56cf3ece060b1804ededdf103376691baa7 assets/create/models/block/fancy_weathered_limestone_bricks_slab_top.json -852a1dbcae18274080f6fe14483c21b8134bf56e assets/create/models/block/fancy_weathered_limestone_bricks_stairs.json -fff01c45f01d2b1c4c0555f2ab4d66442c90148e assets/create/models/block/fancy_weathered_limestone_bricks_stairs_inner.json -1ea72b0ca54c8237351b4be0a7b44b94a8b0bb87 assets/create/models/block/fancy_weathered_limestone_bricks_stairs_outer.json -d7385af6e7c8124fda4d391c2e7fba55cdc9977e assets/create/models/block/fancy_weathered_limestone_bricks_wall_post.json -215671ac8e468015e8d52054c863110465c33fc9 assets/create/models/block/fancy_weathered_limestone_bricks_wall_side.json ->>>>>>> mc1.15/dev 71f74388319567d4ab13c508bf3b4d59f1a19b2f assets/create/models/block/fluid_pipe/ld_x.json bd6b0c6d773e3996d949de55873d20b0e192499d assets/create/models/block/fluid_pipe/ld_y.json ddba92d010016a0147ceecc30a30c9c1622d3daa assets/create/models/block/fluid_pipe/ld_z.json @@ -912,12 +701,8 @@ f55c5825c63f345a95e822a2113e76b5a62d8f7c assets/create/models/block/granite_pill 6eb5e59e803e1055968b90f3099cd0a17a1d3fd5 assets/create/models/block/gray_seat.json 7e213be39cc928363bf2b096f055439211050b8d assets/create/models/block/gray_valve_handle.json 1438b8ce54ac5557b8f10dcef94f3525eae19461 assets/create/models/block/green_seat.json -<<<<<<< HEAD -b1e94d2858c3a8807def6c5131b6f63fe586fb91 assets/create/models/block/horizontal_framed_glass.json -======= cc7ce9b6bc687ad5027a67c3bf22bdf5bcd71674 assets/create/models/block/green_valve_handle.json -9730fcb02f679087e81e24c836751e625be6a298 assets/create/models/block/horizontal_framed_glass.json ->>>>>>> mc1.15/dev +b1e94d2858c3a8807def6c5131b6f63fe586fb91 assets/create/models/block/horizontal_framed_glass.json d13df8a5920c5778d98081fb0e97f045e2fd46a2 assets/create/models/block/horizontal_framed_glass_pane_noside.json 3e975bec02e2670ce2b1868cebcbd780a5ebf3f8 assets/create/models/block/horizontal_framed_glass_pane_noside_alt.json a5938ddd48109f067a19a90a0f9abab655c18821 assets/create/models/block/horizontal_framed_glass_pane_post.json @@ -943,7 +728,7 @@ cecf946818c65370b685dfeaade50819183acb41 assets/create/models/block/layered_lime 292bec1b9f962b17b29147d982a9b177618b7eb9 assets/create/models/block/light_gray_seat.json 42338c4965da63962ea08077dc9e899aaf4c3c65 assets/create/models/block/light_gray_valve_handle.json 31c9474210d8535c5417021fe042d4cc31e17328 assets/create/models/block/lime_seat.json -<<<<<<< HEAD +74008bd0d775b0e2e96b43be2e51d0f3c3abdf21 assets/create/models/block/lime_valve_handle.json fccac0de94fff5f4e180fc9dbddeb0f8ddf3baab assets/create/models/block/limesand.json 3c49d63386b3f5326051edbf6e2f0f8f0e2ff4f3 assets/create/models/block/limestone.json 84920646b4df506f94e64611ee231f3af51b5379 assets/create/models/block/limestone_bricks.json @@ -969,32 +754,6 @@ c54e5a17495f88fa21b3488e8da32a365452c36c assets/create/models/block/limestone_co 7991d6620d2225b1a026e2b62dc076cf0a33613d assets/create/models/block/linear_chassis_bottom.json 56e585805c6235552ce5e15ff2f125ff8ec0fa2d assets/create/models/block/linear_chassis_top.json 12b35c916e3ee83ee4fd1e309c73403dec9a7297 assets/create/models/block/linear_chassis_top_bottom.json -======= -74008bd0d775b0e2e96b43be2e51d0f3c3abdf21 assets/create/models/block/lime_valve_handle.json -ce6fb36a386c895486e021823eb008b0fa4862c3 assets/create/models/block/limesand.json -a2cbc86d24fdd70c5f33c8b30ba52a8928dde63f assets/create/models/block/limestone.json -447686a6861773e03c5c18f2de4bc11d06c65f78 assets/create/models/block/limestone_bricks.json -4aa8f22c5c48b20170f7050ad7ecf65d08c1a6fe assets/create/models/block/limestone_bricks_slab.json -7a890ab6513ead1b4d20b023e7a04a4d4d8b8c3d assets/create/models/block/limestone_bricks_slab_top.json -180c37c3ecec8e036a12840b1440c6b9d7b21cef assets/create/models/block/limestone_bricks_stairs.json -a30fc3563f85b189a16cb4b2af6cbb587b33b354 assets/create/models/block/limestone_bricks_stairs_inner.json -cb8d4ba5a0e1372520f55ddd659ed8f944700730 assets/create/models/block/limestone_bricks_stairs_outer.json -bd46a9a9650fc893b0403a4427dace9fc2c0002a assets/create/models/block/limestone_bricks_wall_post.json -774de72109796d55c5548e4194461ce27083a20d assets/create/models/block/limestone_bricks_wall_side.json -59202c99e39fc26497cd7c27b2e5edc9b1310457 assets/create/models/block/limestone_cobblestone.json -fe6a5228bf9ca394b234afd82467efe65544afc2 assets/create/models/block/limestone_cobblestone_slab.json -d1718b257af8f892a6ed28638399a57cc6c3d8dd assets/create/models/block/limestone_cobblestone_slab_top.json -3a15866b7c6df7e035afcc4b32321d8dad07d5f8 assets/create/models/block/limestone_cobblestone_stairs.json -fd0a970c68c7025040bede0a07fef46c9047f611 assets/create/models/block/limestone_cobblestone_stairs_inner.json -abef3f97c28321ded3bafc90918377981038d7b2 assets/create/models/block/limestone_cobblestone_stairs_outer.json -eee8ae85daa99fcd594da3d4af393726af69493b assets/create/models/block/limestone_cobblestone_wall_post.json -0effd13c1ff224f4c2d7017c6505f48d31815934 assets/create/models/block/limestone_cobblestone_wall_side.json -7336e008b3af80e054c9f15be381b7fe307e97d4 assets/create/models/block/limestone_pillar.json -20432687c62402a4bc0f2415113e7470231cdf03 assets/create/models/block/linear_chassis.json -595bfec2293c44deae49147016cb7971bdd721df assets/create/models/block/linear_chassis_bottom.json -999ce855842170f47db9d1e8e8636c24f7d3ad3d assets/create/models/block/linear_chassis_top.json -b9abbd1dcf71e0a1416fd998a82a560c06cef5a3 assets/create/models/block/linear_chassis_top_bottom.json ->>>>>>> mc1.15/dev cbee001cd1bb1125a97d1bb2d1e6e5a68f129303 assets/create/models/block/magenta_seat.json bc5a03a5552eb4a518abefe5e8615f14ee13ca29 assets/create/models/block/magenta_valve_handle.json 0492070642fda75b943080022368505f2d065730 assets/create/models/block/mechanical_bearing.json @@ -1015,12 +774,8 @@ b9c27f90d4d258e3fdcd713aaa42142f5d46a79e assets/create/models/block/oak_window_p 8f77db5a66b165d2ca85f9119666907dcf65105f assets/create/models/block/oak_window_pane_side.json b3e056a176e86660fc2d3a51f9ba8b01eebb56c5 assets/create/models/block/oak_window_pane_side_alt.json fda0628a09ef726e3e8323b2f38b6a3e612dc2ca assets/create/models/block/orange_seat.json -<<<<<<< HEAD -de5ecd753303b2c5dc3819299b9a316f0d7035f6 assets/create/models/block/ornate_iron_window.json -======= 3b07f3f1985495051d173725b01ddd52b5f70ac4 assets/create/models/block/orange_valve_handle.json -006115bf8e36367c0c409effdeab939a54c20776 assets/create/models/block/ornate_iron_window.json ->>>>>>> mc1.15/dev +de5ecd753303b2c5dc3819299b9a316f0d7035f6 assets/create/models/block/ornate_iron_window.json cc9614e892b12c6053d45a35d534eddf36285cf1 assets/create/models/block/ornate_iron_window_pane_noside.json 6b935d54de7c37f835df48f7b6e5e614a0d12b6e assets/create/models/block/ornate_iron_window_pane_noside_alt.json 19942331411716035d79adabe6d2daadd6025e90 assets/create/models/block/ornate_iron_window_pane_post.json @@ -1158,7 +913,7 @@ f924c6104378768a3a645f5e77f9ed80d2c31e5a assets/create/models/block/paved_weathe c7941c0bcbdf7ec7e2d34679afac744cf81b7489 assets/create/models/block/paved_weathered_limestone_wall_side.json 39aaea370e31fa032e471d3b8f0ebf0586ee1a03 assets/create/models/block/paved_weathered_limestone_wall_side_tall.json ecc60ce7ee6b753073a99c597db95d6d9df3d438 assets/create/models/block/pink_seat.json -<<<<<<< HEAD +7ada61878d3a3c1d3cc33bcf9a80c21b8f9aaff2 assets/create/models/block/pink_valve_handle.json 84fdb35acc12ae9580496f458def3e49aa0551ea assets/create/models/block/polished_dark_scoria.json 5ca3d6cbbf1fdd6437d9951b9d2937838ec480f1 assets/create/models/block/polished_dark_scoria_slab.json 737cbe0048415e9e5c5c112fbad541ef17eab94c assets/create/models/block/polished_dark_scoria_slab_double.json @@ -1219,63 +974,6 @@ a25db26c0639a9d07219ff6e4e4cc0576bec8913 assets/create/models/block/polished_wea 96b3a50bb338484a88c448bb9a412b47e6faf45a assets/create/models/block/polished_weathered_limestone_wall_post.json d31088540cd68cf1156d9ebd328129aef36e17ca assets/create/models/block/polished_weathered_limestone_wall_side.json c934df1cfe097bcc0f0c21d1b1a3f3b53e50e831 assets/create/models/block/polished_weathered_limestone_wall_side_tall.json -======= -7ada61878d3a3c1d3cc33bcf9a80c21b8f9aaff2 assets/create/models/block/pink_valve_handle.json -83a4922d5799a5a1391a2675e9273caa24cde192 assets/create/models/block/polished_dark_scoria.json -3fcab24848791fcd591bf4a2a73147c3391e24b8 assets/create/models/block/polished_dark_scoria_slab.json -7c1b4b3b22c711224a54d55d7c49429c4238d5a7 assets/create/models/block/polished_dark_scoria_slab_double.json -3ea396a641bb21c15badaff996be3bca3076f73d assets/create/models/block/polished_dark_scoria_slab_top.json -9bbd768f40e839ac73f58f8cb5d53ae01c3fdf70 assets/create/models/block/polished_dark_scoria_stairs.json -9d1d2165a7c802518add0defccf6ae97e2d3b3d1 assets/create/models/block/polished_dark_scoria_stairs_inner.json -7b4401d6edb395052d409605a9d475e6345bd001 assets/create/models/block/polished_dark_scoria_stairs_outer.json -bc8ee0c03f6894b38bfa778fe5874d46fc2b6931 assets/create/models/block/polished_dark_scoria_wall_post.json -e2ba5f686d9bd400073073d40f571e7f780f60e9 assets/create/models/block/polished_dark_scoria_wall_side.json -3467c7239bcd6122ce8636f249e29f04dc3bec21 assets/create/models/block/polished_dolomite.json -69307691e26a042a769d9d9d223707083e42efab assets/create/models/block/polished_dolomite_slab.json -b6dadea740a2dec5edd6322994102d5014886d6f assets/create/models/block/polished_dolomite_slab_double.json -1085bcf23b13a587d620cce624546fa287104526 assets/create/models/block/polished_dolomite_slab_top.json -640ad613dce98a4fb37bf1c896fc12bf44762a8b assets/create/models/block/polished_dolomite_stairs.json -2d14ccf702b3d0074d12c04f84cea8a61d122ea3 assets/create/models/block/polished_dolomite_stairs_inner.json -0590c2b945abb66adb859cc85ebe22092f262180 assets/create/models/block/polished_dolomite_stairs_outer.json -298fa4cafd59612cac9cf9f2e8fe20228c02d28d assets/create/models/block/polished_dolomite_wall_post.json -7c52b561d00133ef0ed81036ad5552fbbe10285b assets/create/models/block/polished_dolomite_wall_side.json -ab65a7a8f0c12a441c8653043c59385b834ef71e assets/create/models/block/polished_gabbro.json -2931c767a92c642c7c0d296e38af8f08217263da assets/create/models/block/polished_gabbro_slab.json -f50506b204f2245893df223c86a9245af5ee7cc4 assets/create/models/block/polished_gabbro_slab_double.json -052969eeefba6fd97feb520bcfda97c994dad91d assets/create/models/block/polished_gabbro_slab_top.json -353ab3fa0c2250bff91efd7827f12af5d89f8ad9 assets/create/models/block/polished_gabbro_stairs.json -4c7796d26f3d0bda10244c3243d3e11691a90083 assets/create/models/block/polished_gabbro_stairs_inner.json -fa9f24ab6291189812c5697323c7b66bc960b23a assets/create/models/block/polished_gabbro_stairs_outer.json -bce13297eea7998073f998dffb5dfbd858f3c4ab assets/create/models/block/polished_gabbro_wall_post.json -04b2e4985401f484dfcd226ecb332247773b2f8a assets/create/models/block/polished_gabbro_wall_side.json -77cc6a327584ca4cef6ec3bab9eb1df1053a3fac assets/create/models/block/polished_limestone.json -78b4bc45cb2a89f07d7d012859aae4a995788ec4 assets/create/models/block/polished_limestone_slab.json -d4d74fcd6d6cb63d44392796bd7d8818dd117b57 assets/create/models/block/polished_limestone_slab_double.json -f1204df2a6e31679375045ea57cd07dff1d783ca assets/create/models/block/polished_limestone_slab_top.json -378038e958728919a2239eb0dd65ca5d72112b7f assets/create/models/block/polished_limestone_stairs.json -270091da3f63a2fb2af45ec0cc9200ecb45f5844 assets/create/models/block/polished_limestone_stairs_inner.json -4a7764d8e3aca090ccf34ab53b49941addd30523 assets/create/models/block/polished_limestone_stairs_outer.json -58620d0d6ac6bf70c5cf89951f6de84cf033ad7f assets/create/models/block/polished_limestone_wall_post.json -50b1a7510912db50bca9df368a7f1aade846cee8 assets/create/models/block/polished_limestone_wall_side.json -714126588c571fb7e56eab01b0a638de20f45270 assets/create/models/block/polished_scoria.json -d45780fed06163c231393bfff4ccd70a99e6ff4c assets/create/models/block/polished_scoria_slab.json -f7b96f804379f377038d07af4f1fbf6890ba7f7a assets/create/models/block/polished_scoria_slab_double.json -73d5e1cd975a506f2b07139d0506d5fa1021af75 assets/create/models/block/polished_scoria_slab_top.json -4eb1e9b1235141a2a1c529ca09a3353ee4be5cf8 assets/create/models/block/polished_scoria_stairs.json -0316333eddde04727d7def7c5b7555df6a4a8900 assets/create/models/block/polished_scoria_stairs_inner.json -e4e00e01fa479c6fc9aa450a2e7999ce94504987 assets/create/models/block/polished_scoria_stairs_outer.json -1b9e41ac5b2a89557613c2c8c2cd2c8abcf11af0 assets/create/models/block/polished_scoria_wall_post.json -46227ab60086f0978ba12b8c071b295060e775c2 assets/create/models/block/polished_scoria_wall_side.json -0975a5158ea64238f78c7db8e2a1ddbb4c49d9e6 assets/create/models/block/polished_weathered_limestone.json -8fdfd28ea7b9053b956a93c09d90129ba94baab9 assets/create/models/block/polished_weathered_limestone_slab.json -9243b6fa9210da0fed582b802d0ffc2e1923789a assets/create/models/block/polished_weathered_limestone_slab_double.json -9f3ff426e79bb446a3e913cb7fca0056bed57f0f assets/create/models/block/polished_weathered_limestone_slab_top.json -39bd43b67badad90e1377142facec0ef3e3cbbbb assets/create/models/block/polished_weathered_limestone_stairs.json -1eedeb1b66b7c48c848c66d3ed2d99f4d9e58966 assets/create/models/block/polished_weathered_limestone_stairs_inner.json -97c066d14c3ee37ce4f580d25d3c29ac94a6adf4 assets/create/models/block/polished_weathered_limestone_stairs_outer.json -6d690b231f60496f9b3103e71adda09f8e649158 assets/create/models/block/polished_weathered_limestone_wall_post.json -ba4e86079668f2c03070c99b8d8ef642b60fd634 assets/create/models/block/polished_weathered_limestone_wall_side.json ->>>>>>> mc1.15/dev 1c5e97ce8e5b3f5b320873120a4f3084915c0af7 assets/create/models/block/powered_latch.json 3e414b053b973729577a61bb1d73b9a2c2eb56a4 assets/create/models/block/powered_latch_powered.json f22d7d8263dcabd726aa04784031ae9062633579 assets/create/models/block/powered_toggle_latch_off_powered.json @@ -1291,7 +989,7 @@ a9885a3f69e3e2a2812c33bafd9140fcc5cc7c25 assets/create/models/block/radial_chass 522f4733118d6fba172696e9478c8f9fe88b236e assets/create/models/block/radial_chassis_side_z.json bffca231a146a6ac49e028f3790cdcbf375e98b0 assets/create/models/block/radial_chassis_side_z_sticky.json 12d4f4119b994c5d71c96ab3aa09beb89dad1e10 assets/create/models/block/red_seat.json -<<<<<<< HEAD +0064825ee3c1702c524d34abb6adb66906586851 assets/create/models/block/red_valve_handle.json 61ce6e1ba7fee30683c86b09ec35da4fbff8f9cb assets/create/models/block/refined_radiance_casing.json 0fa50139aa2ff171feaecf3062b2037fab10b786 assets/create/models/block/scoria.json 055249d2dec8b94abb919cfb834767c9fbfb89ee assets/create/models/block/scoria_bricks.json @@ -1324,39 +1022,6 @@ f6096d529b8f97f0bfdec75c13e4b31958346c58 assets/create/models/block/spruce_windo ea7952f49c78f0d7b95f3ed34df35a44a921ce15 assets/create/models/block/spruce_window_pane_post.json 04b92ecb2aea4264c58e2d3df0d77ab9fcdcf2d7 assets/create/models/block/spruce_window_pane_side.json a5bb90cb3f5353bbfe767b3d42f4d1dbac3b498a assets/create/models/block/spruce_window_pane_side_alt.json -======= -0064825ee3c1702c524d34abb6adb66906586851 assets/create/models/block/red_valve_handle.json -c4bb40ed2bddabff154a34f4eff7a485bf6488a0 assets/create/models/block/refined_radiance_casing.json -c145d8e0d7f8f41afa80b9727a107b2ad2f0c3c9 assets/create/models/block/scoria.json -59c6f6a4ffe43485244a8561d7e8341f796e268b assets/create/models/block/scoria_bricks.json -d86ca38a0c1bac89e545916c59f23f6f0c9f7d7a assets/create/models/block/scoria_bricks_slab.json -ac0731b633bf1d1af38fcb6b5c17dea405a017c8 assets/create/models/block/scoria_bricks_slab_top.json -aefdd0cf03f7b07ecbd20aa9743d8b0c1ac01c7b assets/create/models/block/scoria_bricks_stairs.json -fd93d2aa5e2e1646ddf12c3ca8c011eb0791653d assets/create/models/block/scoria_bricks_stairs_inner.json -54e43e6e17dd9df3696005cfb803fc20d403c1ae assets/create/models/block/scoria_bricks_stairs_outer.json -6e01226f5586ff2885b001a020386dcd9da4cea5 assets/create/models/block/scoria_bricks_wall_post.json -eb72b9a4daf4a045a7583d8187107edbad9d7856 assets/create/models/block/scoria_bricks_wall_side.json -a5feba461b74c57a9583ef855b779142a618a844 assets/create/models/block/scoria_cobblestone.json -b5de7b127d49a69ae57e4be6fa6a0299d9df357b assets/create/models/block/scoria_cobblestone_slab.json -7e5a50dbafa8f3b8e285fa6efb995ad234377242 assets/create/models/block/scoria_cobblestone_slab_top.json -0da9d63d95f0cc05e764c0db65dc9f05d9f6b803 assets/create/models/block/scoria_cobblestone_stairs.json -6fb83d3bfb13d62822fbab12bb991e7fc595c8ad assets/create/models/block/scoria_cobblestone_stairs_inner.json -de66b504054f37eca6e5eeee6245fb8f9db2e1bf assets/create/models/block/scoria_cobblestone_stairs_outer.json -34aa3f34fce851ac6f87be0c276e074dacd9bbf4 assets/create/models/block/scoria_cobblestone_wall_post.json -43cd43cc26ba06f953c52c3fb67841141a99da6e assets/create/models/block/scoria_cobblestone_wall_side.json -0e70dc21ac625a0796ded99c734087c97fa5966b assets/create/models/block/scoria_pillar.json -74cd7c13043f6a5c680a7c73ed46a44a7507b8bf assets/create/models/block/secondary_linear_chassis.json -fbe57e52b0234c2c379d82d6cc425d6ce9492454 assets/create/models/block/secondary_linear_chassis_bottom.json -e439d642f3c2049dce444b7b4bea8532eb22699c assets/create/models/block/secondary_linear_chassis_top.json -5fc7d8839c6de9363d22fd22be7f440aab853121 assets/create/models/block/secondary_linear_chassis_top_bottom.json -3020d66d33996dd4b203905a54538d3dd5f01330 assets/create/models/block/shadow_steel_casing.json -3fc9a7ae552095d0f45f8e632e2bf04d1378946f assets/create/models/block/spruce_window.json -f39904a8a73a25e440d6a35fad931f8ce7ef165e assets/create/models/block/spruce_window_pane_noside.json -7446e12a5ba91c008b17fd70484468caa36500b9 assets/create/models/block/spruce_window_pane_noside_alt.json -f15dfc9e4e6b991ee9fe10e8af3d9c98cb3d7e47 assets/create/models/block/spruce_window_pane_post.json -0e8be4d143d1fd8300c00ce709139a0e577cdec3 assets/create/models/block/spruce_window_pane_side.json -aea7061aed39bc8c9ab51c8d7d0d86b11fc9e6b4 assets/create/models/block/spruce_window_pane_side_alt.json ->>>>>>> mc1.15/dev 3bda065e24a71b82b92b9c805790ba6d1791ef6a assets/create/models/block/stockpile_switch_0.json 335d6bc2b19d3cdbc9ed8b344142e2e3aa397994 assets/create/models/block/stockpile_switch_1.json 655d5cd249291a550bb3508c97f5a7a3606a7848 assets/create/models/block/stockpile_switch_2.json @@ -1399,14 +1064,9 @@ acf3900465101f9dd78d2301eab1063cdb461582 assets/create/models/block/weathered_li 1377e12f56dce1466ce44078d7154870c5cf7b2a assets/create/models/block/white_seat.json 899f33d51cf36cb1c283bc7e6363f9d451e5736e assets/create/models/block/white_valve_handle.json 0a0e2cc973e35586ae00ed17b919383868e992e8 assets/create/models/block/yellow_seat.json -<<<<<<< HEAD +55edee7b0833ab19b98694fab21ae0c8e91f76fd assets/create/models/block/yellow_valve_handle.json 36c27bad342c82aa8dc097da87637dca042cce17 assets/create/models/block/zinc_block.json f3059145a84ddbd54d08167e984112c7baf5ef4a assets/create/models/block/zinc_ore.json -======= -55edee7b0833ab19b98694fab21ae0c8e91f76fd assets/create/models/block/yellow_valve_handle.json -c94c60d1d77404af7d74a29a094c7bdf7501b385 assets/create/models/block/zinc_block.json -a3ff06384fff574ac4cd6c253259f0734b025cab assets/create/models/block/zinc_ore.json ->>>>>>> mc1.15/dev 67ef6fd6ec26fc216fa5319b8538beb223da1530 assets/create/models/item/acacia_window.json c695dab3964186a857767b2b4975aebffa86dcf9 assets/create/models/item/acacia_window_pane.json 06d8b6e8f050b8ec0bef88b7633f3741baad4571 assets/create/models/item/adjustable_crate.json @@ -1428,12 +1088,7 @@ b0f664dd6de3d0ee9afcb6223fbcd53b97fa0d65 assets/create/models/item/andesite_cobb 75b8b00c2418b9660d35a7fabd0774925cf1c02f assets/create/models/item/andesite_pillar.json 795541cf7205d90531a23cd5b388f93a03bbf925 assets/create/models/item/andesite_tunnel.json bf1fc6bdf7fca6f1958a2d3e96202c1cecb50669 assets/create/models/item/basin.json -<<<<<<< HEAD ffdb36349fa2e50451c208585162b6a8386ec494 assets/create/models/item/belt_connector.json -695a69d5854e2eb134b55d855bd2b7b18808a01d assets/create/models/item/belt_observer.json -======= -1da382e7e58eaa9788f5b1d92221ccac573e068f assets/create/models/item/belt_connector.json ->>>>>>> mc1.15/dev 9044243882cfd49a2827e1b910a4c9b0e46daa47 assets/create/models/item/birch_window.json d537fffaede521efa525fb2a7f9863fe6a80054e assets/create/models/item/birch_window_pane.json 22632bd681c8a605f0845f7549770389a741156a assets/create/models/item/black_seat.json @@ -1471,12 +1126,8 @@ c2a320162daa2d24cef969d1d14a0cbd55eb574f assets/create/models/item/copper_ingot. 177dafb51d70c55ec62036332868efed4e01f353 assets/create/models/item/copper_sheet.json d7cb2f7bac8fae893fc5179af8140786a908f3f5 assets/create/models/item/copper_shingles.json f56bf22324faf8958eaef4d94b958f1108d52e5a assets/create/models/item/copper_tiles.json -<<<<<<< HEAD -4e253e7c0626dfd76e2d39786ce1a34e0baaa62d assets/create/models/item/crafter_slot_cover.json -======= 5583368909c319acfcf0f7a419bedf23272fe613 assets/create/models/item/copper_valve_handle.json -4e9126b349d55c65aa5407f05700579e52101c1f assets/create/models/item/crafter_slot_cover.json ->>>>>>> mc1.15/dev +4e253e7c0626dfd76e2d39786ce1a34e0baaa62d assets/create/models/item/crafter_slot_cover.json 7b333dea353afaa27b182aedc647c9e9e34e92ef assets/create/models/item/creative_crate.json 5b39403f6c81f05e566b621b62e267267de47c41 assets/create/models/item/creative_motor.json 6281a7439c92459761893835f91fde25467fae76 assets/create/models/item/crushed_brass.json @@ -1745,28 +1396,17 @@ e95125318055b8557afd7d108488cf0bdd81fe49 assets/create/models/item/polished_scor 8197d4494ff1d8d81be8fac9285246cc1c6bcf54 assets/create/models/item/polished_weathered_limestone.json 68fb04f7a89c8117bb641e347df9bfc1f1248335 assets/create/models/item/polished_weathered_limestone_slab.json 6d92ee7112aa20e8a1adfe73d8933031c299bed1 assets/create/models/item/polished_weathered_limestone_stairs.json -<<<<<<< HEAD d98a1d479dff88d7a6f084f2c9de8fbbf80961ef assets/create/models/item/polished_weathered_limestone_wall.json -ef2c9dcd5f6385a0f0cdc2e9120c984827863100 assets/create/models/item/portable_storage_interface.json -417c301eb7e54f14c564975570f59d048cc88987 assets/create/models/item/powdered_obsidian.json -======= -b4995fb4799f33508cd6bf2ded80c0b3e866ad43 assets/create/models/item/polished_weathered_limestone_wall.json 3bc60b0d9884c2ee0f1dd530e90fceb699eea737 assets/create/models/item/portable_storage_interface.json -d3cfc1a1137c4bc98848947d425d2972df144c95 assets/create/models/item/powdered_obsidian.json ->>>>>>> mc1.15/dev +417c301eb7e54f14c564975570f59d048cc88987 assets/create/models/item/powdered_obsidian.json 1e501c1f2e9250aaaadcf17db62646d08177d4e1 assets/create/models/item/powered_latch.json 3a6dfc7f36e31ebfcd650c3144a7f2210e8a4f9f assets/create/models/item/powered_toggle_latch.json 4a3c3d81097d56bbd3aefeeb9eb7db87f514b5b4 assets/create/models/item/propeller.json 4b8a27ff05ed5331889dfc4b0b4562f3e94b0dfe assets/create/models/item/pulse_repeater.json a598b2f5eb34b061e81efb8a55267a02f8e08a61 assets/create/models/item/purple_seat.json -<<<<<<< HEAD +e5138f9e37ca4d24cda2eb7b24a021eb7c8ae21c assets/create/models/item/purple_valve_handle.json efbda15b53084acdac2d36b8e0a764a9ab34d723 assets/create/models/item/radial_chassis.json fc05c4492da3d17add7e410323a47456c0d21e0e assets/create/models/item/red_sand_paper.json -======= -e5138f9e37ca4d24cda2eb7b24a021eb7c8ae21c assets/create/models/item/purple_valve_handle.json -469652eb5baa92008dbfc4deec232c3381684af6 assets/create/models/item/radial_chassis.json -ba99e2fdb64892f4f479a8ac51c226cb5f71f659 assets/create/models/item/red_sand_paper.json ->>>>>>> mc1.15/dev 3e251514aa698076b73fdbfef720b78b21d3bd93 assets/create/models/item/red_seat.json b959a1b35105c2c21933418bd29ce12a090716f8 assets/create/models/item/red_valve_handle.json b9a4ac219a27e60a82f55129f2df5ae6183981e2 assets/create/models/item/redstone_contact.json diff --git a/src/generated/resources/assets/create/blockstates/fluid_pipe.json b/src/generated/resources/assets/create/blockstates/fluid_pipe.json index 745b1500a..d79073dc8 100644 --- a/src/generated/resources/assets/create/blockstates/fluid_pipe.json +++ b/src/generated/resources/assets/create/blockstates/fluid_pipe.json @@ -60,10 +60,10 @@ }, { "when": { - "north": "true", "up": "true", + "down": "false", "south": "false", - "down": "false" + "north": "true" }, "apply": { "model": "create:block/fluid_pipe/lu_x" @@ -71,10 +71,10 @@ }, { "when": { - "north": "false", "up": "true", + "down": "false", "south": "true", - "down": "false" + "north": "false" }, "apply": { "model": "create:block/fluid_pipe/ru_x" @@ -82,10 +82,10 @@ }, { "when": { - "north": "true", "up": "false", + "down": "true", "south": "false", - "down": "true" + "north": "true" }, "apply": { "model": "create:block/fluid_pipe/ld_x" @@ -93,10 +93,10 @@ }, { "when": { - "north": "false", "up": "false", + "down": "true", "south": "true", - "down": "true" + "north": "false" }, "apply": { "model": "create:block/fluid_pipe/rd_x" @@ -104,10 +104,10 @@ }, { "when": { - "north": "false", "up": "true", + "down": "true", "south": "false", - "down": "true" + "north": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_x" @@ -115,10 +115,10 @@ }, { "when": { - "north": "false", "up": "true", + "down": "false", "south": "false", - "down": "false" + "north": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_x" @@ -126,10 +126,10 @@ }, { "when": { - "north": "false", "up": "false", + "down": "true", "south": "false", - "down": "true" + "north": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_x" @@ -137,10 +137,10 @@ }, { "when": { - "north": "true", "up": "false", + "down": "false", "south": "true", - "down": "false" + "north": "true" }, "apply": { "model": "create:block/fluid_pipe/lr_x" @@ -148,10 +148,10 @@ }, { "when": { - "north": "true", "up": "false", + "down": "false", "south": "false", - "down": "false" + "north": "true" }, "apply": { "model": "create:block/fluid_pipe/lr_x" @@ -159,10 +159,10 @@ }, { "when": { - "north": "false", "up": "false", + "down": "false", "south": "true", - "down": "false" + "north": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_x" @@ -170,10 +170,10 @@ }, { "when": { - "north": "false", "up": "false", + "down": "false", "south": "false", - "down": "false" + "north": "false" }, "apply": { "model": "create:block/fluid_pipe/none_x" @@ -181,10 +181,10 @@ }, { "when": { - "north": "false", "west": "true", - "east": "false", - "south": "true" + "south": "true", + "north": "false", + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/lu_y" @@ -192,10 +192,10 @@ }, { "when": { - "north": "false", "west": "false", - "east": "true", - "south": "true" + "south": "true", + "north": "false", + "east": "true" }, "apply": { "model": "create:block/fluid_pipe/ru_y" @@ -203,10 +203,10 @@ }, { "when": { - "north": "true", "west": "true", - "east": "false", - "south": "false" + "south": "false", + "north": "true", + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/ld_y" @@ -214,10 +214,10 @@ }, { "when": { - "north": "true", "west": "false", - "east": "true", - "south": "false" + "south": "false", + "north": "true", + "east": "true" }, "apply": { "model": "create:block/fluid_pipe/rd_y" @@ -225,10 +225,10 @@ }, { "when": { + "west": "false", + "south": "true", "north": "true", - "west": "false", - "east": "false", - "south": "true" + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_y" @@ -236,10 +236,10 @@ }, { "when": { + "west": "false", + "south": "true", "north": "false", - "west": "false", - "east": "false", - "south": "true" + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_y" @@ -247,10 +247,10 @@ }, { "when": { + "west": "false", + "south": "false", "north": "true", - "west": "false", - "east": "false", - "south": "false" + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_y" @@ -258,10 +258,10 @@ }, { "when": { - "north": "false", "west": "true", - "east": "true", - "south": "false" + "south": "false", + "north": "false", + "east": "true" }, "apply": { "model": "create:block/fluid_pipe/lr_y" @@ -269,10 +269,10 @@ }, { "when": { - "north": "false", "west": "true", - "east": "false", - "south": "false" + "south": "false", + "north": "false", + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_y" @@ -280,10 +280,10 @@ }, { "when": { - "north": "false", "west": "false", - "east": "true", - "south": "false" + "south": "false", + "north": "false", + "east": "true" }, "apply": { "model": "create:block/fluid_pipe/lr_y" @@ -291,10 +291,10 @@ }, { "when": { - "north": "false", "west": "false", - "east": "false", - "south": "false" + "south": "false", + "north": "false", + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/none_y" @@ -302,16 +302,10 @@ }, { "when": { - "west": "false", -<<<<<<< HEAD - "east": "true", "up": "true", - "down": "false" -======= + "west": "false", "down": "false", - "east": "true", - "up": "true" ->>>>>>> mc1.15/dev + "east": "true" }, "apply": { "model": "create:block/fluid_pipe/lu_z" @@ -319,16 +313,10 @@ }, { "when": { - "west": "true", -<<<<<<< HEAD - "east": "false", "up": "true", - "down": "false" -======= + "west": "true", "down": "false", - "east": "false", - "up": "true" ->>>>>>> mc1.15/dev + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/ru_z" @@ -336,16 +324,10 @@ }, { "when": { - "west": "false", -<<<<<<< HEAD - "east": "true", "up": "false", - "down": "true" -======= + "west": "false", "down": "true", - "east": "true", - "up": "false" ->>>>>>> mc1.15/dev + "east": "true" }, "apply": { "model": "create:block/fluid_pipe/ld_z" @@ -353,16 +335,10 @@ }, { "when": { - "west": "true", -<<<<<<< HEAD - "east": "false", "up": "false", - "down": "true" -======= + "west": "true", "down": "true", - "east": "false", - "up": "false" ->>>>>>> mc1.15/dev + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/rd_z" @@ -370,16 +346,10 @@ }, { "when": { - "west": "false", -<<<<<<< HEAD - "east": "false", "up": "true", - "down": "true" -======= + "west": "false", "down": "true", - "east": "false", - "up": "true" ->>>>>>> mc1.15/dev + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_z" @@ -387,16 +357,10 @@ }, { "when": { - "west": "false", -<<<<<<< HEAD - "east": "false", "up": "true", - "down": "false" -======= + "west": "false", "down": "false", - "east": "false", - "up": "true" ->>>>>>> mc1.15/dev + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_z" @@ -404,16 +368,10 @@ }, { "when": { - "west": "false", -<<<<<<< HEAD - "east": "false", "up": "false", - "down": "true" -======= + "west": "false", "down": "true", - "east": "false", - "up": "false" ->>>>>>> mc1.15/dev + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/ud_z" @@ -421,16 +379,10 @@ }, { "when": { + "up": "false", "west": "true", -<<<<<<< HEAD - "east": "true", - "up": "false", - "down": "false" -======= "down": "false", - "east": "true", - "up": "false" ->>>>>>> mc1.15/dev + "east": "true" }, "apply": { "model": "create:block/fluid_pipe/lr_z" @@ -438,16 +390,10 @@ }, { "when": { + "up": "false", "west": "false", -<<<<<<< HEAD - "east": "true", - "up": "false", - "down": "false" -======= "down": "false", - "east": "true", - "up": "false" ->>>>>>> mc1.15/dev + "east": "true" }, "apply": { "model": "create:block/fluid_pipe/lr_z" @@ -455,16 +401,10 @@ }, { "when": { + "up": "false", "west": "true", -<<<<<<< HEAD - "east": "false", - "up": "false", - "down": "false" -======= "down": "false", - "east": "false", - "up": "false" ->>>>>>> mc1.15/dev + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/lr_z" @@ -472,16 +412,10 @@ }, { "when": { - "west": "false", -<<<<<<< HEAD - "east": "false", "up": "false", - "down": "false" -======= + "west": "false", "down": "false", - "east": "false", - "up": "false" ->>>>>>> mc1.15/dev + "east": "false" }, "apply": { "model": "create:block/fluid_pipe/none_z" diff --git a/src/generated/resources/assets/create/blockstates/radial_chassis.json b/src/generated/resources/assets/create/blockstates/radial_chassis.json index c930cf0b5..04e5c08ae 100644 --- a/src/generated/resources/assets/create/blockstates/radial_chassis.json +++ b/src/generated/resources/assets/create/blockstates/radial_chassis.json @@ -29,8 +29,8 @@ }, { "when": { - "sticky_south": "true", - "axis": "x" + "axis": "x", + "sticky_south": "true" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -39,8 +39,8 @@ }, { "when": { - "sticky_south": "true", - "axis": "y" + "axis": "y", + "sticky_south": "true" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky" @@ -48,8 +48,8 @@ }, { "when": { - "sticky_south": "true", - "axis": "z" + "axis": "z", + "sticky_south": "true" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -59,8 +59,8 @@ }, { "when": { - "sticky_south": "false", - "axis": "x" + "axis": "x", + "sticky_south": "false" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -69,8 +69,8 @@ }, { "when": { - "sticky_south": "false", - "axis": "y" + "axis": "y", + "sticky_south": "false" }, "apply": { "model": "create:block/radial_chassis_side_y" @@ -78,8 +78,8 @@ }, { "when": { - "sticky_south": "false", - "axis": "z" + "axis": "z", + "sticky_south": "false" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -149,8 +149,8 @@ }, { "when": { - "sticky_north": "true", - "axis": "x" + "axis": "x", + "sticky_north": "true" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky" @@ -158,8 +158,8 @@ }, { "when": { - "sticky_north": "true", - "axis": "y" + "axis": "y", + "sticky_north": "true" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -168,8 +168,8 @@ }, { "when": { - "sticky_north": "true", - "axis": "z" + "axis": "z", + "sticky_north": "true" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -178,8 +178,8 @@ }, { "when": { - "sticky_north": "false", - "axis": "x" + "axis": "x", + "sticky_north": "false" }, "apply": { "model": "create:block/radial_chassis_side_x" @@ -187,8 +187,8 @@ }, { "when": { - "sticky_north": "false", - "axis": "y" + "axis": "y", + "sticky_north": "false" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -197,8 +197,8 @@ }, { "when": { - "sticky_north": "false", - "axis": "z" + "axis": "z", + "sticky_north": "false" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -207,8 +207,8 @@ }, { "when": { - "axis": "x", - "sticky_east": "true" + "sticky_east": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -217,8 +217,8 @@ }, { "when": { - "axis": "y", - "sticky_east": "true" + "sticky_east": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -227,8 +227,8 @@ }, { "when": { - "axis": "z", - "sticky_east": "true" + "sticky_east": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z_sticky" @@ -236,8 +236,8 @@ }, { "when": { - "axis": "x", - "sticky_east": "false" + "sticky_east": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -246,8 +246,8 @@ }, { "when": { - "axis": "y", - "sticky_east": "false" + "sticky_east": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -256,8 +256,8 @@ }, { "when": { - "axis": "z", - "sticky_east": "false" + "sticky_east": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_z" diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index 3a7a5652e..aec16a020 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -8,7 +8,7 @@ "block.create.adjustable_crate": "adjustable_crate", "block.create.adjustable_pulley": "UNLOCALIZED: Adjustable Pulley", "block.create.adjustable_pulse_repeater": "UNLOCALIZED: Adjustable Pulse Repeater", - "block.create.adjustable_repeater": "Verzögernder Verstärker", + "block.create.adjustable_repeater": "Verzögernder Verstärker", "block.create.analog_lever": "UNLOCALIZED: Analog Lever", "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", "block.create.andesite_bricks": "Andesitziegel", @@ -25,10 +25,6 @@ "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "UNLOCALIZED: Basin", "block.create.belt": "Mechanischer Riemen", -<<<<<<< HEAD - "block.create.belt_observer": "Fließband-Beobachter", -======= ->>>>>>> mc1.15/dev "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", "block.create.black_seat": "UNLOCALIZED: Black Seat", @@ -100,7 +96,7 @@ "block.create.dolomite_cobblestone_slab": "UNLOCALIZED: Dolomite Cobblestone Slab", "block.create.dolomite_cobblestone_stairs": "UNLOCALIZED: Dolomite Cobblestone Stairs", "block.create.dolomite_cobblestone_wall": "UNLOCALIZED: Dolomite Cobblestone Wall", - "block.create.dolomite_pillar": "Dolomitsäule", + "block.create.dolomite_pillar": "Dolomitsäule", "block.create.encased_belt": "Eingeschlossener Riemen", "block.create.encased_fan": "Eingeschlossener Propeller", "block.create.encased_fluid_pipe": "UNLOCALIZED: Encased Fluid Pipe", @@ -179,7 +175,7 @@ "block.create.horizontal_framed_glass_pane": "UNLOCALIZED: Horizontal Framed Glass Pane", "block.create.jungle_window": "UNLOCALIZED: Jungle Window", "block.create.jungle_window_pane": "UNLOCALIZED: Jungle Window Pane", - "block.create.large_cogwheel": "Großes Zahnrad", + "block.create.large_cogwheel": "Großes Zahnrad", "block.create.layered_andesite": "UNLOCALIZED: Layered Andesite", "block.create.layered_dark_scoria": "UNLOCALIZED: Layered Dark Scoria", "block.create.layered_diorite": "UNLOCALIZED: Layered Diorite", @@ -205,8 +201,8 @@ "block.create.limestone_cobblestone_slab": "UNLOCALIZED: Limestone Cobblestone Slab", "block.create.limestone_cobblestone_stairs": "UNLOCALIZED: Limestone Cobblestone Stairs", "block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall", - "block.create.limestone_pillar": "Kalksteinsäule", - "block.create.linear_chassis": "Schubgerüst", + "block.create.limestone_pillar": "Kalksteinsäule", + "block.create.linear_chassis": "Schubgerüst", "block.create.magenta_seat": "UNLOCALIZED: Magenta Seat", "block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle", "block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm", @@ -288,12 +284,8 @@ "block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs", "block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall", "block.create.pink_seat": "UNLOCALIZED: Pink Seat", -<<<<<<< HEAD - "block.create.piston_extension_pole": "Kolben-Pleuelverlängerung", -======= "block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle", "block.create.piston_extension_pole": "Kolben-Pleuelverlängerung", ->>>>>>> mc1.15/dev "block.create.polished_dark_scoria": "UNLOCALIZED: Polished Dark Scoria", "block.create.polished_dark_scoria_slab": "UNLOCALIZED: Polished Dark Scoria Slab", "block.create.polished_dark_scoria_stairs": "UNLOCALIZED: Polished Dark Scoria Stairs", @@ -322,14 +314,10 @@ "block.create.powered_latch": "UNLOCALIZED: Powered Latch", "block.create.powered_toggle_latch": "UNLOCALIZED: Powered Toggle Latch", "block.create.pulley_magnet": "UNLOCALIZED: Pulley Magnet", - "block.create.pulse_repeater": "Pulsierender Verstärker", + "block.create.pulse_repeater": "Pulsierender Verstärker", "block.create.purple_seat": "UNLOCALIZED: Purple Seat", -<<<<<<< HEAD - "block.create.radial_chassis": "Drehgerüst", -======= "block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle", "block.create.radial_chassis": "Drehgerüst", ->>>>>>> mc1.15/dev "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle", "block.create.redstone_contact": "Redstone-Kontakt", @@ -377,7 +365,7 @@ "block.create.weathered_limestone_cobblestone_slab": "UNLOCALIZED: Weathered Limestone Cobblestone Slab", "block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs", "block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall", - "block.create.weathered_limestone_pillar": "Verwitterte Kalksteinsäule", + "block.create.weathered_limestone_pillar": "Verwitterte Kalksteinsäule", "block.create.white_seat": "UNLOCALIZED: White Seat", "block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle", "block.create.yellow_seat": "UNLOCALIZED: Yellow Seat", @@ -436,7 +424,7 @@ "item.create.schematic_and_quill": "Bauplan und Feder", "item.create.shadow_steel": "UNLOCALIZED: Shadow Steel", "item.create.super_glue": "UNLOCALIZED: Super Glue", - "item.create.tree_fertilizer": "Baumdünger", + "item.create.tree_fertilizer": "Baumdünger", "item.create.vertical_gearbox": "UNLOCALIZED: Vertical Gearbox", "item.create.wand_of_symmetry": "Symmetriestab", "item.create.wheat_flour": "UNLOCALIZED: Wheat Flour", @@ -540,9 +528,9 @@ "itemGroup.create.palettes": "UNLOCALIZED: Create Palettes", "death.attack.create.crush": "%1$s stolperte in ein Mahlwerk", - "death.attack.create.fan_fire": "%1$s hat heiße Luft eingeatmet", + "death.attack.create.fan_fire": "%1$s hat heiße Luft eingeatmet", "death.attack.create.fan_lava": "%1$s wurde von Lava verweht", - "death.attack.create.mechanical_drill": "%1$s wurde von einem Bohrer durchlöchert", + "death.attack.create.mechanical_drill": "%1$s wurde von einem Bohrer durchlöchert", "death.attack.create.mechanical_saw": "UNLOCALIZED: %1$s got cut in half by a Mechanical Saw", "death.attack.create.cuckoo_clock_explosion": "UNLOCALIZED: %1$s was blown up by tampered cuckoo clock", @@ -552,8 +540,8 @@ "create.recipe.crushing": "Mahlen", "create.recipe.milling": "UNLOCALIZED: Milling", "create.recipe.splashing": "Waschen", - "create.recipe.splashing.fan": "Propeller hinter fließendem Wasser", - "create.recipe.smoking_via_fan": "Räuchern", + "create.recipe.splashing.fan": "Propeller hinter fließendem Wasser", + "create.recipe.smoking_via_fan": "Räuchern", "create.recipe.smoking_via_fan.fan": "Propeller hinter Feuer", "create.recipe.blasting_via_fan": "Schmelzen", "create.recipe.blasting_via_fan.fan": "Propeller hinter Lava", @@ -576,7 +564,7 @@ "create.generic.height": "UNLOCALIZED: Height", "create.generic.length": "UNLOCALIZED: Length", "create.generic.speed": "Geschwindigkeit", - "create.generic.delay": "Verzögerung", + "create.generic.delay": "Verzögerung", "create.generic.unit.ticks": "Ticks", "create.generic.unit.seconds": "Sekunden", "create.generic.unit.minutes": "Minuten", @@ -585,20 +573,20 @@ "create.generic.unit.degrees": "UNLOCALIZED: °", "create.action.scroll": "Wechseln", - "create.action.confirm": "Bestätigen", + "create.action.confirm": "Bestätigen", "create.action.abort": "Abbrechen", "create.action.saveToFile": "Speichern", - "create.action.discard": "Löschen", + "create.action.discard": "Löschen", - "create.keyinfo.toolmenu": "Werkzeugmenü", + "create.keyinfo.toolmenu": "Werkzeugmenü", "create.keyinfo.scrollup": "UNLOCALIZED: Simulate Mousewheel Up (inworld)", "create.keyinfo.scrolldown": "UNLOCALIZED: Simulate Mousewheel Down (inworld)", - "create.gui.scrollInput.defaultTitle": "Wähle eine Option:", - "create.gui.scrollInput.scrollToModify": "Mausrad zum Ändern", + "create.gui.scrollInput.defaultTitle": "Wähle eine Option:", + "create.gui.scrollInput.scrollToModify": "Mausrad zum Ändern", "create.gui.scrollInput.scrollToAdjustAmount": "UNLOCALIZED: Scroll to Adjust Amount", - "create.gui.scrollInput.scrollToSelect": "Mausrad zum Auswählen", - "create.gui.scrollInput.shiftScrollsFaster": "Shift zum schnelleren Auswählen", + "create.gui.scrollInput.scrollToSelect": "Mausrad zum Auswählen", + "create.gui.scrollInput.shiftScrollsFaster": "Shift zum schnelleren Auswählen", "create.gui.toolmenu.focusKey": "Halte [%1$s] zum Fokussieren", "create.gui.toolmenu.cycle": "[Mausrad] zum Wechseln", "create.gui.symmetryWand.mirrorType": "Spiegeln", @@ -619,7 +607,7 @@ "create.gui.blockzapper.searchDiagonal": "Diagonalen folgen", "create.gui.blockzapper.searchFuzzy": "Materialgrenzen ignorieren", "create.gui.blockzapper.range": "Reichweite", - "create.gui.blockzapper.needsUpgradedAmplifier": "Benötigt besseren Verstärker", + "create.gui.blockzapper.needsUpgradedAmplifier": "Benötigt besseren Verstärker", "create.gui.blockzapper.patternSection": "Muster", "create.gui.blockzapper.pattern.solid": "Fest", "create.gui.blockzapper.pattern.checkered": "Schachbrett", @@ -649,15 +637,15 @@ "create.blockzapper.usingBlock": "Auswahl: %1$s", "create.blockzapper.componentUpgrades": "Bauteil-Upgrades:", "create.blockzapper.component.body": "Rumpf", - "create.blockzapper.component.amplifier": "Verstärker", + "create.blockzapper.component.amplifier": "Verstärker", "create.blockzapper.component.accelerator": "Beschleuniger", - "create.blockzapper.component.retriever": "Empfänger", + "create.blockzapper.component.retriever": "Empfänger", "create.blockzapper.component.scope": "Fernrohr", "create.blockzapper.componentTier.none": "Nichts", "create.blockzapper.componentTier.brass": "UNLOCALIZED: Brass", "create.blockzapper.componentTier.chromatic": "UNLOCALIZED: Chromatic", - "create.blockzapper.leftClickToSet": "Linksklick auf einen Block zum Auswählen", - "create.blockzapper.empty": "Keine Blöcke übrig!", + "create.blockzapper.leftClickToSet": "Linksklick auf einen Block zum Auswählen", + "create.blockzapper.empty": "Keine Blöcke übrig!", "create.contraptions.movement_mode": "UNLOCALIZED: Movement Mode", "create.contraptions.movement_mode.move_place": "UNLOCALIZED: Always Place when Stopped", @@ -691,18 +679,9 @@ "create.gui.adjustable_crate.title": "adjustable_crate", "create.gui.adjustable_crate.storageSpace": "Lagerraum", "create.gui.stockpile_switch.title": "Vorratssensor", -<<<<<<< HEAD - "create.gui.stockpile_switch.lowerLimit": "Untergrenze", - "create.gui.stockpile_switch.upperLimit": "Obergrenze", - "create.gui.stockpile_switch.startAt": "Signal bei", - "create.gui.stockpile_switch.startAbove": "Signal über", - "create.gui.stockpile_switch.stopAt": "Signalstopp bei", - "create.gui.stockpile_switch.stopBelow": "Signalstopp über", -======= "create.gui.stockpile_switch.invert_signal": "UNLOCALIZED: Invert Signal", "create.gui.stockpile_switch.move_to_lower_at": "UNLOCALIZED: Move to lower lane at %1$s%%", "create.gui.stockpile_switch.move_to_upper_at": "UNLOCALIZED: Move to upper lane at %1$s%%", ->>>>>>> mc1.15/dev "create.gui.sequenced_gearshift.title": "UNLOCALIZED: Sequenced Gearshift", "create.gui.sequenced_gearshift.instruction": "UNLOCALIZED: Instruction", "create.gui.sequenced_gearshift.instruction.turn_angle": "UNLOCALIZED: Turn", @@ -718,31 +697,26 @@ "create.gui.sequenced_gearshift.speed.back": "UNLOCALIZED: Input speed, Reversed", "create.gui.sequenced_gearshift.speed.back_fast": "UNLOCALIZED: Double speed, Reversed", - "create.schematicAndQuill.dimensions": "Bauplangröße: %1$sx%2$sx%3$s", + "create.schematicAndQuill.dimensions": "Bauplangröße: %1$sx%2$sx%3$s", "create.schematicAndQuill.firstPos": "Erste Position festgelegt.", "create.schematicAndQuill.secondPos": "Zweite Position festgelegt.", "create.schematicAndQuill.noTarget": "Halte [Strg] zur Auswahl von Luft.", -<<<<<<< HEAD - "create.schematicAndQuill.abort": "Auswahl zurückgesetzt.", - "create.schematicAndQuill.prompt": "Gib dem Bauplan einen Namen:", -======= "create.schematicAndQuill.abort": "Auswahl zurückgesetzt.", "create.schematicAndQuill.title": "UNLOCALIZED: Schematic Name:", "create.schematicAndQuill.convert": "UNLOCALIZED: Save and Deploy Immediately", ->>>>>>> mc1.15/dev "create.schematicAndQuill.fallbackName": "Mein Bauplan", "create.schematicAndQuill.saved": "Gespeichert als %1$s", - "create.schematic.invalid": "[!] Ungültiger Gegenstand - Benutze einen Bauplantisch.", + "create.schematic.invalid": "[!] Ungültiger Gegenstand - Benutze einen Bauplantisch.", "create.schematic.position": "Position", "create.schematic.rotation": "Rotation", "create.schematic.rotation.none": "Nein", - "create.schematic.rotation.cw90": "90° im Uhrzeigersinn", - "create.schematic.rotation.cw180": "180° im Uhrzeigersinn", - "create.schematic.rotation.cw270": "270° im Uhrzeigersinn", + "create.schematic.rotation.cw90": "90° im Uhrzeigersinn", + "create.schematic.rotation.cw180": "180° im Uhrzeigersinn", + "create.schematic.rotation.cw270": "270° im Uhrzeigersinn", "create.schematic.mirror": "Spiegeln", "create.schematic.mirror.none": "Nein", - "create.schematic.mirror.frontBack": "Vor-Zurück", + "create.schematic.mirror.frontBack": "Vor-Zurück", "create.schematic.mirror.leftRight": "Links-Rechts", "create.schematic.tool.deploy": "Positionieren", "create.schematic.tool.move": "XZ Bewegen", @@ -753,7 +727,7 @@ "create.schematic.tool.deploy.description.0": "Bewegt die Struktur an einen anderen ort.", "create.schematic.tool.deploy.description.1": "Mit Rechtsklick auf den Boden platzieren.", "create.schematic.tool.deploy.description.2": "[Strg] halten, um in einer bestimmten Entfernung zu arbeiten.", - "create.schematic.tool.deploy.description.3": "[Strg]-Mausrad um die Entfernung zu ändern.", + "create.schematic.tool.deploy.description.3": "[Strg]-Mausrad um die Entfernung zu ändern.", "create.schematic.tool.move.description.0": "Bewegt das Schema horizontal", "create.schematic.tool.move.description.1": "Zeig auf das Schema und benutze [Strg]-Mausrad.", "create.schematic.tool.move.description.2": "", @@ -763,55 +737,36 @@ "create.schematic.tool.movey.description.2": "", "create.schematic.tool.movey.description.3": "", "create.schematic.tool.rotate.description.0": "Rotiert das Schema um seine Mitte.", - "create.schematic.tool.rotate.description.1": "[Strg]-Mausrad für eine Drehung um 90°", + "create.schematic.tool.rotate.description.1": "[Strg]-Mausrad für eine Drehung um 90°", "create.schematic.tool.rotate.description.2": "", "create.schematic.tool.rotate.description.3": "", "create.schematic.tool.print.description.0": "Platziert sofort die Struktur in der Welt", - "create.schematic.tool.print.description.1": "[Rechtsklick] zum Bestätigen der Platzierung an der aktuellen Position.", - "create.schematic.tool.print.description.2": "Dieses Werkzeug ist nur für den Kreativ-Modus.", + "create.schematic.tool.print.description.1": "[Rechtsklick] zum Bestätigen der Platzierung an der aktuellen Position.", + "create.schematic.tool.print.description.2": "Dieses Werkzeug ist nur für den Kreativ-Modus.", "create.schematic.tool.print.description.3": "", - "create.schematic.tool.flip.description.0": "Kehrt das Schema entlang der ausgewählten Oberfläche um.", + "create.schematic.tool.flip.description.0": "Kehrt das Schema entlang der ausgewählten Oberfläche um.", "create.schematic.tool.flip.description.1": "Zeige auf das Schema und benutze [Strg]-Mausrad.", "create.schematic.tool.flip.description.2": "", "create.schematic.tool.flip.description.3": "", "create.schematics.synchronizing": "Synchronisation...", - "create.schematics.uploadTooLarge": "Dein Bauplan ist zu groß.", - "create.schematics.maxAllowedSize": "Die maximale Bauplan-Dateigröße ist:", + "create.schematics.uploadTooLarge": "Dein Bauplan ist zu groß.", + "create.schematics.maxAllowedSize": "Die maximale Bauplan-Dateigröße ist:", "create.gui.schematicTable.title": "Bauplantisch", -<<<<<<< HEAD - "create.gui.schematicTable.availableSchematics": "Verfügbare Baupläne", - "create.gui.schematicTable.noSchematics": "Keine gespeicherten Baupläne", -======= "create.gui.schematicTable.refresh": "UNLOCALIZED: Refresh Files", "create.gui.schematicTable.open_folder": "UNLOCALIZED: Open Folder", "create.gui.schematicTable.availableSchematics": "Verfügbare Baupläne", "create.gui.schematicTable.noSchematics": "Keine gespeicherten Baupläne", ->>>>>>> mc1.15/dev "create.gui.schematicTable.uploading": "Hochladen...", "create.gui.schematicTable.finished": "Hochgeladen!", "create.gui.schematicannon.title": "Bauplankanone", "create.gui.schematicannon.listPrinter": "Materiallistendruck", "create.gui.schematicannon.gunpowderLevel": "Schwarzpulver bei %1$s%%", - "create.gui.schematicannon.shotsRemaining": "%1$s Schuss übrig", + "create.gui.schematicannon.shotsRemaining": "%1$s Schuss übrig", "create.gui.schematicannon.shotsRemainingWithBackup": "Mit Reserve: %1$s", "create.gui.schematicannon.optionEnabled": "Aktiviert", "create.gui.schematicannon.optionDisabled": "Deaktiviert", -<<<<<<< HEAD - "create.gui.schematicannon.option.dontReplaceSolid": "Feste Blöcke nicht ersetzen", - "create.gui.schematicannon.option.replaceWithSolid": "Feste Blöcke mit festen ersetzen", - "create.gui.schematicannon.option.replaceWithAny": "Feste Blöcke immer ersetzen", - "create.gui.schematicannon.option.replaceWithEmpty": "Feste Blöcke mit Leere ersetzen", - "create.gui.schematicannon.option.skipMissing": "Fehlende Blöcke ignorieren", - "create.gui.schematicannon.option.skipTileEntities": "Tile Entities ignorieren", - "create.gui.schematicannon.option.skipMissing.description": "Wenn die Bauplankanone einen benötigten Block nicht finden kann, wird sie einfach beim nächsten weiter machen.", - "create.gui.schematicannon.option.skipTileEntities.description": "Die Bauplankanone wird versuchen, Blöcke mit extra Daten, beispielsweise Truhen, nicht zu ersetzen.", - "create.gui.schematicannon.option.dontReplaceSolid.description": "Die Kanone wird ausschließlich nicht feste Blöcke und Luft in ihrem Arbeitsbereich ersetzen.", - "create.gui.schematicannon.option.replaceWithSolid.description": "Die Kanone wird feste Blöcke nur dann ersetzen, wenn an der Position vorher bereits ein fester Block war.", - "create.gui.schematicannon.option.replaceWithAny.description": "Die Kanone wird feste Blöcke ersetzen, wenn der Bauplan an der Position einen Block enthält.", - "create.gui.schematicannon.option.replaceWithEmpty.description": "Die Kanone wird alle Blöcke im Arbeitsbereich entfernen.", -======= "create.gui.schematicannon.showOptions": "UNLOCALIZED: Show Printer Settings", "create.gui.schematicannon.option.dontReplaceSolid": "Feste Blöcke nicht ersetzen", "create.gui.schematicannon.option.replaceWithSolid": "Feste Blöcke mit festen ersetzen", @@ -828,7 +783,6 @@ "create.gui.schematicannon.option.replaceWithSolid.description": "Die Kanone wird feste Blöcke nur dann ersetzen, wenn an der Position vorher bereits ein fester Block war.", "create.gui.schematicannon.option.replaceWithAny.description": "Die Kanone wird feste Blöcke ersetzen, wenn der Bauplan an der Position einen Block enthält.", "create.gui.schematicannon.option.replaceWithEmpty.description": "Die Kanone wird alle Blöcke im Arbeitsbereich entfernen.", ->>>>>>> mc1.15/dev "create.schematicannon.status.idle": "Aus", "create.schematicannon.status.ready": "Bereit", @@ -840,11 +794,11 @@ "create.schematicannon.status.targetNotLoaded": "Kein Block geladen", "create.schematicannon.status.targetOutsideRange": "Ziel zu weit weg", "create.schematicannon.status.searching": "Suchen", - "create.schematicannon.status.skipping": "Ãœberspringen", + "create.schematicannon.status.skipping": "Überspringen", "create.schematicannon.status.missingBlock": "Fehlender Block:", "create.schematicannon.status.placing": "Platzieren", - "create.schematicannon.status.clearing": "Blöcke entfernen", - "create.schematicannon.status.schematicInvalid": "Bauplan ungültig", + "create.schematicannon.status.clearing": "Blöcke entfernen", + "create.schematicannon.status.schematicInvalid": "Bauplan ungültig", "create.schematicannon.status.schematicNotPlaced": "Bauplan nicht positioniert", "create.schematicannon.status.schematicExpired": "Bauplandatei abgelaufen", @@ -977,29 +931,29 @@ "item.create.example_item.tooltip.condition1": "Wenn dies", "item.create.example_item.tooltip.behaviour1": "dann tut dieser Gegenstand das. (Verhalten wird mit der Shift-Taste angezeigt)", "item.create.example_item.tooltip.condition2": "Und wenn dies", - "item.create.example_item.tooltip.behaviour2": "kannst du so viele Verhaltensweisen hinzufügen wie du magst", - "item.create.example_item.tooltip.control1": "Wenn Strg gedrückt ist", + "item.create.example_item.tooltip.behaviour2": "kannst du so viele Verhaltensweisen hinzufügen wie du magst", + "item.create.example_item.tooltip.control1": "Wenn Strg gedrückt ist", "item.create.example_item.tooltip.action1": "wird diese Steuerung gezeigt.", "item.create.wand_of_symmetry.tooltip": "SYMMETRIESTAB", - "item.create.wand_of_symmetry.tooltip.summary": "Spiegelt deine Blockplatzierung perfekt über die konfigurierten Ebenen.", + "item.create.wand_of_symmetry.tooltip.summary": "Spiegelt deine Blockplatzierung perfekt über die konfigurierten Ebenen.", "item.create.wand_of_symmetry.tooltip.condition1": "Wenn in der Schnellleiste", "item.create.wand_of_symmetry.tooltip.behaviour1": "Bleibt aktiv", "item.create.wand_of_symmetry.tooltip.control1": "R-Klick auf Boden", "item.create.wand_of_symmetry.tooltip.action1": "_Erstellt_ oder _Bewegt_ den Spiegel", "item.create.wand_of_symmetry.tooltip.control2": "R-Klick in die Luft", - "item.create.wand_of_symmetry.tooltip.action2": "_Löscht_ den aktiven Spiegel", + "item.create.wand_of_symmetry.tooltip.action2": "_Löscht_ den aktiven Spiegel", "item.create.wand_of_symmetry.tooltip.control3": "R-Klick beim Schleichen", - "item.create.wand_of_symmetry.tooltip.action3": "Öffnet das _Konfigurationsmenü_", + "item.create.wand_of_symmetry.tooltip.action3": "Öffnet das _Konfigurationsmenü_", "item.create.handheld_blockzapper.tooltip": "BLOCKPISTOLE", - "item.create.handheld_blockzapper.tooltip.summary": "Ermöglicht das Platzieren und Austauschen von Blöcken aus großer Entfernung.", + "item.create.handheld_blockzapper.tooltip.summary": "Ermöglicht das Platzieren und Austauschen von Blöcken aus großer Entfernung.", "item.create.handheld_blockzapper.tooltip.control1": "L-Klick auf Block", - "item.create.handheld_blockzapper.tooltip.action1": "Legt die von dem Werkzeug platzierten Blöcke auf den angeschauten Block fest.", + "item.create.handheld_blockzapper.tooltip.action1": "Legt die von dem Werkzeug platzierten Blöcke auf den angeschauten Block fest.", "item.create.handheld_blockzapper.tooltip.control2": "R-Klick auf Block", - "item.create.handheld_blockzapper.tooltip.action2": "_Platziert_ oder _Ersetzt_ den ausgewählten Block.", + "item.create.handheld_blockzapper.tooltip.action2": "_Platziert_ oder _Ersetzt_ den ausgewählten Block.", "item.create.handheld_blockzapper.tooltip.control3": "R-Klick beim Schleichen", - "item.create.handheld_blockzapper.tooltip.action3": "Öffnet das _Konfigurationsmenü_", + "item.create.handheld_blockzapper.tooltip.action3": "Öffnet das _Konfigurationsmenü_", "item.create.handheld_worldshaper.tooltip": "UNLOCALIZED: HANDHELD WORLDSHAPER", "item.create.handheld_worldshaper.tooltip.summary": "UNLOCALIZED: Handy tool for creating _landscapes_ and _terrain_ _features_.", @@ -1010,10 +964,10 @@ "item.create.handheld_worldshaper.tooltip.control3": "UNLOCALIZED: R-Click while Sneaking", "item.create.handheld_worldshaper.tooltip.action3": "UNLOCALIZED: Opens the _Configuration_ _Interface_", - "item.create.tree_fertilizer.tooltip": "BAUMDÃœNGER", - "item.create.tree_fertilizer.tooltip.summary": "Eine Mischung aus Mineralien, die sich für weit verbreitete Baumarten eignet", + "item.create.tree_fertilizer.tooltip": "BAUMDÜNGER", + "item.create.tree_fertilizer.tooltip.summary": "Eine Mischung aus Mineralien, die sich für weit verbreitete Baumarten eignet", "item.create.tree_fertilizer.tooltip.condition1": "Wenn auf einen Setzling angewendet", - "item.create.tree_fertilizer.tooltip.behaviour1": "Lässt Bäume unabhängig vom Platz um sie herum wachsen", + "item.create.tree_fertilizer.tooltip.behaviour1": "Lässt Bäume unabhängig vom Platz um sie herum wachsen", "item.create.deforester.tooltip": "UNLOCALIZED: DEFORESTER", "item.create.deforester.tooltip.summary": "UNLOCALIZED: A _radiant_ _axe_ able to chop down trees in a split second.", @@ -1038,49 +992,49 @@ "item.create.attribute_filter.tooltip.behaviour2": "UNLOCALIZED: Opens the _configuration_ _interface_.", "item.create.empty_schematic.tooltip": "LEERER BAUPLAN", - "item.create.empty_schematic.tooltip.summary": "Wird für die Herstellung und das Schreiben auf dem _Bauplantisch_ verwendet", + "item.create.empty_schematic.tooltip.summary": "Wird für die Herstellung und das Schreiben auf dem _Bauplantisch_ verwendet", "item.create.schematic.tooltip": "BAUPLAN", - "item.create.schematic.tooltip.summary": "Beschreibt eine Struktur, die in der Welt platziert werden kann. Positioniere das Hologramm wie gewünscht und verwende eine _Bauplankanone_, um die Struktur zu bauen.", + "item.create.schematic.tooltip.summary": "Beschreibt eine Struktur, die in der Welt platziert werden kann. Positioniere das Hologramm wie gewünscht und verwende eine _Bauplankanone_, um die Struktur zu bauen.", "item.create.schematic.tooltip.condition1": "Wenn gehalten", "item.create.schematic.tooltip.behaviour1": "Kann mit den Werkzeugen auf dem Bildschirm positioniert werden", "item.create.schematic.tooltip.control1": "R-Klick beim Schleichen", - "item.create.schematic.tooltip.action1": "Öffnet ein Menü zur Eingabe exakter _Koordinaten_.", + "item.create.schematic.tooltip.action1": "Öffnet ein Menü zur Eingabe exakter _Koordinaten_.", "item.create.schematic_and_quill.tooltip": "BAUPLAN UND FEDER", "item.create.schematic_and_quill.tooltip.summary": "Wird benutzt, um eine existierende Struktur in der Welt als eine .nbt-Datei zu speichern.", "item.create.schematic_and_quill.tooltip.condition1": "Schritt 1", - "item.create.schematic_and_quill.tooltip.behaviour1": "Wähle zwei Eckpunkte mit R-Klick aus", + "item.create.schematic_and_quill.tooltip.behaviour1": "Wähle zwei Eckpunkte mit R-Klick aus", "item.create.schematic_and_quill.tooltip.condition2": "Schritt 2", - "item.create.schematic_and_quill.tooltip.behaviour2": "Auf den Oberflächen _Strg-Scrollen_ um die Größe zu verändern. Nochmals R-Klick um zu speichern.", + "item.create.schematic_and_quill.tooltip.behaviour2": "Auf den Oberflächen _Strg-Scrollen_ um die Größe zu verändern. Nochmals R-Klick um zu speichern.", "item.create.schematic_and_quill.tooltip.control1": "R-Klick", - "item.create.schematic_and_quill.tooltip.action1": "Einen Eckpunkt auswählen / Speichern bestätigen", - "item.create.schematic_and_quill.tooltip.control2": "Strg gedrückt halten", - "item.create.schematic_and_quill.tooltip.action2": "Wählt Punkte _mitten_ _in_ _der_ _Luft._ _Scrolle,_ um die Distanz anzupassen.", + "item.create.schematic_and_quill.tooltip.action1": "Einen Eckpunkt auswählen / Speichern bestätigen", + "item.create.schematic_and_quill.tooltip.control2": "Strg gedrückt halten", + "item.create.schematic_and_quill.tooltip.action2": "Wählt Punkte _mitten_ _in_ _der_ _Luft._ _Scrolle,_ um die Distanz anzupassen.", "item.create.schematic_and_quill.tooltip.control3": "R-Klick beim Schleichen", - "item.create.schematic_and_quill.tooltip.action3": "_Setzt_ die Auswahl _zurück_ und löscht sie.", + "item.create.schematic_and_quill.tooltip.action3": "_Setzt_ die Auswahl _zurück_ und löscht sie.", "block.create.schematicannon.tooltip": "BAUPLANKANONE", - "block.create.schematicannon.tooltip.summary": "Schießt Blöcke, um eine Struktur nach einem positionierten _Bauplan_ zu errichten. Benutzt Gegenstände aus benachbarten Inventaren und _Schießpulver_ als Treibstoff.", + "block.create.schematicannon.tooltip.summary": "Schießt Blöcke, um eine Struktur nach einem positionierten _Bauplan_ zu errichten. Benutzt Gegenstände aus benachbarten Inventaren und _Schießpulver_ als Treibstoff.", "block.create.schematicannon.tooltip.control1": "Wenn R-Geklickt", - "block.create.schematicannon.tooltip.action1": "Öffnet das _Menü_", + "block.create.schematicannon.tooltip.action1": "Öffnet das _Menü_", "block.create.schematic_table.tooltip": "BAUPLANTISCH", - "block.create.schematic_table.tooltip.summary": "Schreibt gespeicherte Baupläne auf einen _Leeren_ _Bauplan_", + "block.create.schematic_table.tooltip.summary": "Schreibt gespeicherte Baupläne auf einen _Leeren_ _Bauplan_", "block.create.schematic_table.tooltip.condition1": "Wenn ein Leerer Bauplan bereitgestellt wird", - "block.create.schematic_table.tooltip.behaviour1": "Lädt eine ausgewählte Datei von deinem Bauplan-Ordner hoch", + "block.create.schematic_table.tooltip.behaviour1": "Lädt eine ausgewählte Datei von deinem Bauplan-Ordner hoch", "block.create.shaft.tooltip": "WELLE", - "block.create.shaft.tooltip.summary": "_Ãœberträgt_ _Rotation_ entlang ihrer Achse.", + "block.create.shaft.tooltip.summary": "_Überträgt_ _Rotation_ entlang ihrer Achse.", "block.create.cogwheel.tooltip": "ZAHNRAD", - "block.create.cogwheel.tooltip.summary": "_Ãœberträgt_ _Rotation_ entlang seiner Achse und auf benachbarte _Zahnräder._", + "block.create.cogwheel.tooltip.summary": "_Überträgt_ _Rotation_ entlang seiner Achse und auf benachbarte _Zahnräder._", - "block.create.large_cogwheel.tooltip": "GROẞES ZAHNRAD", - "block.create.large_cogwheel.tooltip.summary": "Eine größere Version des _Zahnrads,_ ermöglicht eine _Änderung_ der _Rotationsgeschwindigket_, wenn es mit einem kleinerem Zahnrad verbunden wird.", + "block.create.large_cogwheel.tooltip": "GROẞES ZAHNRAD", + "block.create.large_cogwheel.tooltip.summary": "Eine größere Version des _Zahnrads,_ ermöglicht eine _Änderung_ der _Rotationsgeschwindigket_, wenn es mit einem kleinerem Zahnrad verbunden wird.", "block.create.encased_shaft.tooltip": "EINGESCHLOSSENE WELLE", - "block.create.encased_shaft.tooltip.summary": "_Ãœberträgt_ _Rotation_ entlang ihrer Achse. Nützlich für die Ãœbertragung von Rotation durch Wände hindurch.", + "block.create.encased_shaft.tooltip.summary": "_Überträgt_ _Rotation_ entlang ihrer Achse. Nützlich für die Übertragung von Rotation durch Wände hindurch.", "block.create.gearbox.tooltip": "GETRIEBE", "block.create.gearbox.tooltip.summary": "_Leitet_ _Rotation_ in _vier_ _Richtungen_ weiter. Kehrt geradlinige Verbindungen um.", @@ -1089,19 +1043,19 @@ "item.create.vertical_gearbox.tooltip.summary": "UNLOCALIZED: _Relays_ _Rotation_ in _four_ _directions_ Reverses straight connections.", "block.create.gearshift.tooltip": "GANGSCHALTUNG", - "block.create.gearshift.tooltip.summary": "Ein kontrollierbarer _Rotationsschalter_ für angeschlossene Wellen.", + "block.create.gearshift.tooltip.summary": "Ein kontrollierbarer _Rotationsschalter_ für angeschlossene Wellen.", "block.create.gearshift.tooltip.condition1": "Wenn aktiv", "block.create.gearshift.tooltip.behaviour1": "_Kehrt_ die ausgehende Drehrichtung _um._", "block.create.clutch.tooltip": "KUPPLUNG", - "block.create.clutch.tooltip.summary": "Ein kontrollierbarer _Rotationsschalter_ für angeschlossene Wellen.", + "block.create.clutch.tooltip.summary": "Ein kontrollierbarer _Rotationsschalter_ für angeschlossene Wellen.", "block.create.clutch.tooltip.condition1": "Wenn aktiv", "block.create.clutch.tooltip.behaviour1": "_Stoppt_ das Weiterleiten von Rotation zur anderen Seite.", "block.create.encased_belt.tooltip": "EINGESCHLOSSENER RIEMEN", - "block.create.encased_belt.tooltip.summary": "_Ãœberträgt_ _Rotation_ durch seinen Block und zu einem angeschlossenen _Eingeschlossenen_ _Riemen._", + "block.create.encased_belt.tooltip.summary": "_Überträgt_ _Rotation_ durch seinen Block und zu einem angeschlossenen _Eingeschlossenen_ _Riemen._", "block.create.encased_belt.tooltip.condition1": "Wenn an einem anderen Eingeschlossenen Riemen angeschlossen", - "block.create.encased_belt.tooltip.behaviour1": "Wird der angeschlossene Block die exakt gleiche Rotationsgeschwindigkeit und Richtung haben. Angeschlossene Riemen müssen nicht in die gleiche Richtung schauen.", + "block.create.encased_belt.tooltip.behaviour1": "Wird der angeschlossene Block die exakt gleiche Rotationsgeschwindigkeit und Richtung haben. Angeschlossene Riemen müssen nicht in die gleiche Richtung schauen.", "block.create.adjustable_pulley.tooltip": "UNLOCALIZED: ANALOG BELT PULLEY", "block.create.adjustable_pulley.tooltip.summary": "UNLOCALIZED: _Relays_ _Rotation_ through its block and to attached _Encased_ _Belts_. Attached encased belts will _rotate_ _faster_ based on the _analog_ _redstone_ _signal_ this block receives.", @@ -1111,9 +1065,9 @@ "item.create.belt_connector.tooltip": "MECHANISCHER RIEMEN", "item.create.belt_connector.tooltip.summary": "Verbindet zwei _Wellen_ mit einem _Mechanischen_ _Riemen._ Verbundene Wellen haben die exakt gleiche Rotationsgeschwindigkeit und Richtung.", "item.create.belt_connector.tooltip.control1": "R-Klick auf Welle", - "item.create.belt_connector.tooltip.action1": "Wählt die Welle als Verbindungspunkt für den Riemen aus. Beide ausgewählten Wellen müssen _horizontal,_ _vertikal_ oder _diagonal_ entlang der Richtung des Riemens zeigen.", + "item.create.belt_connector.tooltip.action1": "Wählt die Welle als Verbindungspunkt für den Riemen aus. Beide ausgewählten Wellen müssen _horizontal,_ _vertikal_ oder _diagonal_ entlang der Richtung des Riemens zeigen.", "item.create.belt_connector.tooltip.control2": "R-Klick beim Schleichen", - "item.create.belt_connector.tooltip.action2": "_Setzt_ die erste ausgewählte Position des Riemens _zurück._", + "item.create.belt_connector.tooltip.action2": "_Setzt_ die erste ausgewählte Position des Riemens _zurück._", "item.create.goggles.tooltip": "UNLOCALIZED: GOGGLES", "item.create.goggles.tooltip.summary": "UNLOCALIZED: A pair of glasses to augment your vision with useful _kinetic_ _information_.", @@ -1133,16 +1087,16 @@ "block.create.creative_motor.tooltip.summary": "UNLOCALIZED: A configurable source of _Rotational_ _Force_.", "block.create.water_wheel.tooltip": "WASSERRAD", - "block.create.water_wheel.tooltip.summary": "Liefert _Rotationsenergie_ von benachbarten _Wasserströmungen._", + "block.create.water_wheel.tooltip.summary": "Liefert _Rotationsenergie_ von benachbarten _Wasserströmungen._", "block.create.encased_fan.tooltip": "EINGESCHLOSSENER PROPELLER", - "block.create.encased_fan.tooltip.summary": "Wandelt _Rotationsenergie_ in _Luftstöme_ um und wieder zurück. Hat mehrere Verwendungsmöglichkeiten.", - "block.create.encased_fan.tooltip.condition1": "Wenn über Feuer", + "block.create.encased_fan.tooltip.summary": "Wandelt _Rotationsenergie_ in _Luftstöme_ um und wieder zurück. Hat mehrere Verwendungsmöglichkeiten.", + "block.create.encased_fan.tooltip.condition1": "Wenn über Feuer", "block.create.encased_fan.tooltip.behaviour1": "Liefert _Rotationsenergie_ (muss vertikal ausgerichtet sein)", "block.create.encased_fan.tooltip.condition2": "Wenn angetrieben", - "block.create.encased_fan.tooltip.behaviour2": "_Bläst_ Dinge auf einer Seite von sich weg, _zieht_ sie auf der anderen zu sich hin. Kraft und Geschwindigkeit sind abhängig von der eingehenden Rotation.", - "block.create.encased_fan.tooltip.condition3": "Wenn Luft durch spezielle Blöcke fließt", - "block.create.encased_fan.tooltip.behaviour3": "Werden Gegenstände vor dem Block verarbeitet: _Wasser_ wäscht, _Feuer_ räuchert, und _Lava_ schmilzt den Gegenstand.", + "block.create.encased_fan.tooltip.behaviour2": "_Bläst_ Dinge auf einer Seite von sich weg, _zieht_ sie auf der anderen zu sich hin. Kraft und Geschwindigkeit sind abhängig von der eingehenden Rotation.", + "block.create.encased_fan.tooltip.condition3": "Wenn Luft durch spezielle Blöcke fließt", + "block.create.encased_fan.tooltip.behaviour3": "Werden Gegenstände vor dem Block verarbeitet: _Wasser_ wäscht, _Feuer_ räuchert, und _Lava_ schmilzt den Gegenstand.", "block.create.nozzle.tooltip": "UNLOCALIZED: NOZZLE", "block.create.nozzle.tooltip.summary": "UNLOCALIZED: Attach to the front of an _Encased_ _Fan_ to distribute its effect on Entities in _all_ _directions_.", @@ -1158,7 +1112,7 @@ "block.create.cuckoo_clock.tooltip.behaviour1": "UNLOCALIZED: Shows the _current_ _time_ and plays a tune twice a day. _Activates_ once at _noon_ and at dusk, as soon as _players_ _can_ _sleep_.", "block.create.turntable.tooltip": "DREHTISCH", - "block.create.turntable.tooltip.summary": "Wandelt _Rotationsenergie_ in starkes Schwindelgefühl um.", + "block.create.turntable.tooltip.summary": "Wandelt _Rotationsenergie_ in starkes Schwindelgefühl um.", "block.create.millstone.tooltip": "UNLOCALIZED: MILLSTONE", "block.create.millstone.tooltip.summary": "UNLOCALIZED: A kinetic component suitable for _grinding_ inserted _materials_. Can be powered by an adjacent cogwheel or by connecting to the shaft at the bottom. Results have to be extracted from the component.", @@ -1168,16 +1122,16 @@ "block.create.millstone.tooltip.behaviour2": "UNLOCALIZED: Collects the outputs manually.", "block.create.crushing_wheel.tooltip": "MAHLWERKRAD", - "block.create.crushing_wheel.tooltip.summary": "Riesige, drehbare Räder, die alles _zermalmen_ das zwischen ihnen landet.", + "block.create.crushing_wheel.tooltip.summary": "Riesige, drehbare Räder, die alles _zermalmen_ das zwischen ihnen landet.", "block.create.crushing_wheel.tooltip.condition1": "Wenn mit einem anderem Mahlwerkrad verbunden", - "block.create.crushing_wheel.tooltip.behaviour1": "Formt einen Schredder, mit dem man verschiedene Sachen verarbeiten kann. Die Zähne der Räder müssen ineinandergreifen und mit der _gleichen_ _Geschwindigkeit_ in _gegengesetzte_ _Richtungen_ drehen.", + "block.create.crushing_wheel.tooltip.behaviour1": "Formt einen Schredder, mit dem man verschiedene Sachen verarbeiten kann. Die Zähne der Räder müssen ineinandergreifen und mit der _gleichen_ _Geschwindigkeit_ in _gegengesetzte_ _Richtungen_ drehen.", "block.create.mechanical_press.tooltip": "MECHANISCHE PRESSE", - "block.create.mechanical_press.tooltip.summary": "Ein starker Kolben, welcher Gegenstände unter ihm zusammenpresst. Benötigt konstante _Rotationsenergie._", + "block.create.mechanical_press.tooltip.summary": "Ein starker Kolben, welcher Gegenstände unter ihm zusammenpresst. Benötigt konstante _Rotationsenergie._", "block.create.mechanical_press.tooltip.condition1": "Wenn durch Redstone aktiviert", - "block.create.mechanical_press.tooltip.behaviour1": "_Fängt_ _an_, Gegenstände, die darunter liegen, zusammenzudrücken.", - "block.create.mechanical_press.tooltip.condition2": "Wenn über einem Mechanischem Riemen", - "block.create.mechanical_press.tooltip.behaviour2": "Presst _automatisch_ alle auf dem Riemen vorbeigeführten Gegenstände zusammen.", + "block.create.mechanical_press.tooltip.behaviour1": "_Fängt_ _an_, Gegenstände, die darunter liegen, zusammenzudrücken.", + "block.create.mechanical_press.tooltip.condition2": "Wenn über einem Mechanischem Riemen", + "block.create.mechanical_press.tooltip.behaviour2": "Presst _automatisch_ alle auf dem Riemen vorbeigeführten Gegenstände zusammen.", "block.create.mechanical_press.tooltip.condition3": "UNLOCALIZED: When above Basin", "block.create.mechanical_press.tooltip.behaviour3": "UNLOCALIZED: Starts to _compact_ _items_ in the basin whenever all necessary ingredients are present.", @@ -1235,26 +1189,26 @@ "block.create.rotation_speed_controller.tooltip.behaviour1": "UNLOCALIZED: Relays incoming rotational force to the wheel, trying to _match_ the _speed_ it is configured to target. The _cogwheel_ has to be _attached_ _on_ _top_ of the controller.", "block.create.mechanical_piston.tooltip": "MECHANISCHER KOLBEN", - "block.create.mechanical_piston.tooltip.summary": "Eine fortgeschrittene Version des _Kolbens,_ welcher _Rotationsenergie_ benutzt, um verbundene Strukturen präzise zu bewegen. _Kolben-Pleuelverlängerungen_ auf der Hinterseite bestimmen die _Reichweite_ des Kolbens. Ohne Verlängerungen bewegt sich dieser nicht. Verwende ein _Schubgerüst,_ um mehr als nur eine Reihe von Blöcken zu bewegen.", + "block.create.mechanical_piston.tooltip.summary": "Eine fortgeschrittene Version des _Kolbens,_ welcher _Rotationsenergie_ benutzt, um verbundene Strukturen präzise zu bewegen. _Kolben-Pleuelverlängerungen_ auf der Hinterseite bestimmen die _Reichweite_ des Kolbens. Ohne Verlängerungen bewegt sich dieser nicht. Verwende ein _Schubgerüst,_ um mehr als nur eine Reihe von Blöcken zu bewegen.", "block.create.mechanical_piston.tooltip.condition1": "Wenn angetrieben", - "block.create.mechanical_piston.tooltip.behaviour1": "Fängt an, die angeschlossene Struktur zu bewegen. Geschwindigkeit und Richtung korrelieren mit der eingehenden Rotationsgeschwindigkeit.", + "block.create.mechanical_piston.tooltip.behaviour1": "Fängt an, die angeschlossene Struktur zu bewegen. Geschwindigkeit und Richtung korrelieren mit der eingehenden Rotationsgeschwindigkeit.", "block.create.sticky_mechanical_piston.tooltip": "KLEBRIGER MECHANISCHER KOLBEN", - "block.create.sticky_mechanical_piston.tooltip.summary": "Eine fortgeschrittene Version des _Klebrigen_ _Kolbens,_ welcher _Rotationsenergie_ benutzt, um verbundene Strukturen präzise zu bewegen. _Klolben-Pleuelverlängerungen_ auf der Hinterseite bestimmen die _Reichweite_ des Kolbens. Ohne Verlängerungen bewegt sich dieser nicht. Verwende ein _Schubgerüst,_ um mehr als nur eine Reihe von Blöcken zu bewegen.", + "block.create.sticky_mechanical_piston.tooltip.summary": "Eine fortgeschrittene Version des _Klebrigen_ _Kolbens,_ welcher _Rotationsenergie_ benutzt, um verbundene Strukturen präzise zu bewegen. _Klolben-Pleuelverlängerungen_ auf der Hinterseite bestimmen die _Reichweite_ des Kolbens. Ohne Verlängerungen bewegt sich dieser nicht. Verwende ein _Schubgerüst,_ um mehr als nur eine Reihe von Blöcken zu bewegen.", "block.create.sticky_mechanical_piston.tooltip.condition1": "Wenn angetrieben", - "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Fängt an, die angeschlossene Struktur zu bewegen. Geschwindigkeit und Richtung korrelieren mit der eingehenden Rotationsgeschwindigkeit.", + "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Fängt an, die angeschlossene Struktur zu bewegen. Geschwindigkeit und Richtung korrelieren mit der eingehenden Rotationsgeschwindigkeit.", - "block.create.piston_extension_pole.tooltip": "KOLBEN-PLEUELVERÄNGERUNG", - "block.create.piston_extension_pole.tooltip.summary": "Wird benutzt, um die Reichweite von _Mechanischen_ _Kolben_ zu erhöhen.", + "block.create.piston_extension_pole.tooltip": "KOLBEN-PLEUELVERÄNGERUNG", + "block.create.piston_extension_pole.tooltip.summary": "Wird benutzt, um die Reichweite von _Mechanischen_ _Kolben_ zu erhöhen.", "block.create.piston_extension_pole.tooltip.condition1": "Wenn an einem Mechanischen Kolben angebracht", - "block.create.piston_extension_pole.tooltip.behaviour1": "Erhöht die Länge des Kolbens um 1 Block.", + "block.create.piston_extension_pole.tooltip.behaviour1": "Erhöht die Länge des Kolbens um 1 Block.", "block.create.mechanical_bearing.tooltip": "MECHANISCHES LAGER", - "block.create.mechanical_bearing.tooltip.summary": "Wird benutzt, um _größere_ _Strukturen_ zu drehen oder um _Rotationsenergie_ aus Wind zu erzeugen.", + "block.create.mechanical_bearing.tooltip.summary": "Wird benutzt, um _größere_ _Strukturen_ zu drehen oder um _Rotationsenergie_ aus Wind zu erzeugen.", "block.create.mechanical_bearing.tooltip.condition1": "Wenn angetrieben", - "block.create.mechanical_bearing.tooltip.behaviour1": "Fängt an, angeschlossene _Drehgerüste_ und an ihnen angebrachte Blöcke zu drehen.", + "block.create.mechanical_bearing.tooltip.behaviour1": "Fängt an, angeschlossene _Drehgerüste_ und an ihnen angebrachte Blöcke zu drehen.", "block.create.mechanical_bearing.tooltip.condition2": "Wenn durch Redstone aktiviert", - "block.create.mechanical_bearing.tooltip.behaviour2": "Fängt an, _Rotationsenergie_ durch das Drehen der angebrachten Struktur zu erzeugen. Die Struktur muss _geeignete_ _Segelblöcke_ beinhalten. (Momentan jede Art von Wolle).", + "block.create.mechanical_bearing.tooltip.behaviour2": "Fängt an, _Rotationsenergie_ durch das Drehen der angebrachten Struktur zu erzeugen. Die Struktur muss _geeignete_ _Segelblöcke_ beinhalten. (Momentan jede Art von Wolle).", "block.create.clockwork_bearing.tooltip": "UNLOCALIZED: CLOCKWORK BEARING", "block.create.clockwork_bearing.tooltip.summary": "UNLOCALIZED: An advanced version of the _Mechanical_ _Bearing_ for rotating up to two _clock_ _hands_ according to current _in-game_ _time_.", @@ -1284,35 +1238,35 @@ "block.create.rope_pulley.tooltip.condition1": "UNLOCALIZED: When Rotated", "block.create.rope_pulley.tooltip.behaviour1": "UNLOCALIZED: Starts moving the attached structure. Speed and direction correlate to the incoming Rotation Speed.", - "block.create.linear_chassis.tooltip": "SCHUBGERÃœST", - "block.create.linear_chassis.tooltip.summary": "Eine konfigurierbare Basis für Strukturen, die durch _Mechanische_ _Kolben_ bewegt werden sollen. Diese Blöcke müssen die erste Reihe von Blöcken vor dem Kloben bilden.", + "block.create.linear_chassis.tooltip": "SCHUBGERÜST", + "block.create.linear_chassis.tooltip.summary": "Eine konfigurierbare Basis für Strukturen, die durch _Mechanische_ _Kolben_ bewegt werden sollen. Diese Blöcke müssen die erste Reihe von Blöcken vor dem Kloben bilden.", "block.create.linear_chassis.tooltip.condition1": "Wenn durch einen Mechanischen Kolben bewegt", - "block.create.linear_chassis.tooltip.behaviour1": "_Bewegt_ alle _verbundenen_ _Gerüste_ mit der gleichen Orientierung, und angebrachte Blöcke davor. Wenn der Kolben zurückgezogen wird, werden Blöcke nur zurückgezogen, wenn die Fläche des Gerüsts _klebrig_ ist (Siehe [Strg]).", + "block.create.linear_chassis.tooltip.behaviour1": "_Bewegt_ alle _verbundenen_ _Gerüste_ mit der gleichen Orientierung, und angebrachte Blöcke davor. Wenn der Kolben zurückgezogen wird, werden Blöcke nur zurückgezogen, wenn die Fläche des Gerüsts _klebrig_ ist (Siehe [Strg]).", "block.create.linear_chassis.tooltip.condition2": "UNLOCALIZED: With Wrench", "block.create.linear_chassis.tooltip.behaviour2": "UNLOCALIZED: Configure the _range_ for this chassis block. Hold CTRL to modify the range of all attached chassis blocks as well.", "block.create.linear_chassis.tooltip.control1": "Wenn mit einem Schleimball R-geklickt", - "block.create.linear_chassis.tooltip.action1": "Lässt die Oberfläche _klebrig_ werden. Wenn der Kolben zurückgezogen wird, _zieht_ das Gerüst alle verbundenen Blöcke _zurück_ in seine Spalte und innerhalb der konfigurierten Reichweite.", + "block.create.linear_chassis.tooltip.action1": "Lässt die Oberfläche _klebrig_ werden. Wenn der Kolben zurückgezogen wird, _zieht_ das Gerüst alle verbundenen Blöcke _zurück_ in seine Spalte und innerhalb der konfigurierten Reichweite.", - "block.create.radial_chassis.tooltip": "DREHGERÃœST", - "block.create.radial_chassis.tooltip.summary": "Wird für das Drehen von Strukturen mit dem _Mechanischem_ _Lager_ benutzt.", + "block.create.radial_chassis.tooltip": "DREHGERÜST", + "block.create.radial_chassis.tooltip.summary": "Wird für das Drehen von Strukturen mit dem _Mechanischem_ _Lager_ benutzt.", "block.create.radial_chassis.tooltip.condition1": "Wenn durch ein Lager gedreht", - "block.create.radial_chassis.tooltip.behaviour1": "_Dreht_ alle an _klebrigen_ Seiten angebrachten Blöcke (Siehe [Strg]) innerhalb der konfigurierten Reichweite um sich. _Ãœberträgt_ die Rotation zu weiter angebrachten Rotationsgerüsten.", + "block.create.radial_chassis.tooltip.behaviour1": "_Dreht_ alle an _klebrigen_ Seiten angebrachten Blöcke (Siehe [Strg]) innerhalb der konfigurierten Reichweite um sich. _Überträgt_ die Rotation zu weiter angebrachten Rotationsgerüsten.", "block.create.radial_chassis.tooltip.condition2": "UNLOCALIZED: With Wrench", "block.create.radial_chassis.tooltip.behaviour2": "UNLOCALIZED: Configure the _range_ for this chassis block. Hold CTRL to modify the range of all attached chassis blocks as well.", "block.create.radial_chassis.tooltip.control1": "Wenn mit einem Schleimball R-geklickt", - "block.create.radial_chassis.tooltip.action1": "Lässt die geklickte Fläche _klebrig_ werden. Wenn das Gerüst gedreht wird, werden alle verbundenen Blöcke an dieser Seite mit dem Gerüst mitgedreht.", + "block.create.radial_chassis.tooltip.action1": "Lässt die geklickte Fläche _klebrig_ werden. Wenn das Gerüst gedreht wird, werden alle verbundenen Blöcke an dieser Seite mit dem Gerüst mitgedreht.", "block.create.mechanical_drill.tooltip": "MECHANISCHER BOHRER", - "block.create.mechanical_drill.tooltip.summary": "Ein mechanisches Gerät, welches sich dazu eignet _Blöcke_ _zu_ _brechen._", + "block.create.mechanical_drill.tooltip.summary": "Ein mechanisches Gerät, welches sich dazu eignet _Blöcke_ _zu_ _brechen._", "block.create.mechanical_drill.tooltip.condition1": "Wenn angetrieben", - "block.create.mechanical_drill.tooltip.behaviour1": "Funktioniert als _stationärer_ Blockbrecher. _Schadet_ außerdem _Wesen_ in seiner effektiven Reichweite.", + "block.create.mechanical_drill.tooltip.behaviour1": "Funktioniert als _stationärer_ Blockbrecher. _Schadet_ außerdem _Wesen_ in seiner effektiven Reichweite.", "block.create.mechanical_drill.tooltip.condition2": "Wenn durch einem Mechanischen Kolben bewegt", - "block.create.mechanical_drill.tooltip.behaviour2": "Bricht Blöcke die der Bohrer trifft.", + "block.create.mechanical_drill.tooltip.behaviour2": "Bricht Blöcke die der Bohrer trifft.", "block.create.mechanical_harvester.tooltip": "MECHANISCHE ERNTEMASCHINE", - "block.create.mechanical_harvester.tooltip.summary": "Ein mechanischer Pflanzenschneider für die Automatisierung deiner Ernte.", + "block.create.mechanical_harvester.tooltip.summary": "Ein mechanischer Pflanzenschneider für die Automatisierung deiner Ernte.", "block.create.mechanical_harvester.tooltip.condition1": "Wenn durch einem Mechanischen Kolben bewegt", - "block.create.mechanical_harvester.tooltip.behaviour1": "Werden alle _reifen_ _Pflanzen_ _geerntet_, die die Klinge treffen, und auf ihren anfänglichen Wachstumszustand zurückgesetzt.", + "block.create.mechanical_harvester.tooltip.behaviour1": "Werden alle _reifen_ _Pflanzen_ _geerntet_, die die Klinge treffen, und auf ihren anfänglichen Wachstumszustand zurückgesetzt.", "block.create.mechanical_plough.tooltip": "UNLOCALIZED: MECHANICAL PLOUGH", "block.create.mechanical_plough.tooltip.summary": "UNLOCALIZED: A mechanical plough has a variety of uses. It is movable with _Mechanical_ _Pistons_, _Bearings_ or other controllers.", @@ -1329,22 +1283,22 @@ "block.create.mechanical_saw.tooltip.behaviour3": "UNLOCALIZED: _Cuts_ all _Trees_ with which the saw collides.", "block.create.stockpile_switch.tooltip": "VORRATSSENSOR", - "block.create.stockpile_switch.tooltip.summary": "Schaltet ein Redstone-Signal ein oder aus, basierend auf der _Speichermenge_ im verbundenen Behälter.", + "block.create.stockpile_switch.tooltip.summary": "Schaltet ein Redstone-Signal ein oder aus, basierend auf der _Speichermenge_ im verbundenen Behälter.", "block.create.stockpile_switch.tooltip.condition1": "Wenn unter dem unteren Limit", "block.create.stockpile_switch.tooltip.behaviour1": "Wird das Redstone-Signal ausgeschaltet.", - "block.create.stockpile_switch.tooltip.condition2": "Wenn über dem oberen Limit", + "block.create.stockpile_switch.tooltip.condition2": "Wenn über dem oberen Limit", "block.create.stockpile_switch.tooltip.behaviour2": "Wird das Redstone-Signal eingeschaltet bis das untere Limit wieder erreicht wird.", "block.create.stockpile_switch.tooltip.control1": "Wenn R-geklickt", - "block.create.stockpile_switch.tooltip.action1": "Wird das _Konfigurationsmenü_ geöffnet", + "block.create.stockpile_switch.tooltip.action1": "Wird das _Konfigurationsmenü_ geöffnet", "block.create.redstone_link.tooltip": "REDSTONE-VERBINDUNG", - "block.create.redstone_link.tooltip.summary": "Endpunkte für _Drahtlose_ _Redstone-Verbindungen._ Mithilfe von Gegenständen kann die Frequenz eingestellt werden. Signalreichweite ist begrenzt, aber angemessen.", + "block.create.redstone_link.tooltip.summary": "Endpunkte für _Drahtlose_ _Redstone-Verbindungen._ Mithilfe von Gegenständen kann die Frequenz eingestellt werden. Signalreichweite ist begrenzt, aber angemessen.", "block.create.redstone_link.tooltip.condition1": "Wenn aktiv", "block.create.redstone_link.tooltip.behaviour1": "Liefern eingehende Verbindungen mit derselben _Frequenz_ ein Redstone-Signal.", "block.create.redstone_link.tooltip.control1": "Wenn mit einem Gegenstand R-geklickt", - "block.create.redstone_link.tooltip.action1": "Setzt die _Frequenz_ auf diesen Gegenstand. Insgesamt können _zwei_ _verschiedene_ _Gegenstände_ benutzt werden, um die Frequenz zu definieren.", - "block.create.redstone_link.tooltip.control2": "Wenn während dem Schleichen R-geklickt", - "block.create.redstone_link.tooltip.action2": "Schaltet zwischen _Empfänger-_ und _Transmittermodus_ um.", + "block.create.redstone_link.tooltip.action1": "Setzt die _Frequenz_ auf diesen Gegenstand. Insgesamt können _zwei_ _verschiedene_ _Gegenstände_ benutzt werden, um die Frequenz zu definieren.", + "block.create.redstone_link.tooltip.control2": "Wenn während dem Schleichen R-geklickt", + "block.create.redstone_link.tooltip.action2": "Schaltet zwischen _Empfänger-_ und _Transmittermodus_ um.", "block.create.nixie_tube.tooltip": "UNLOCALIZED: NIXIE TUBE", "block.create.nixie_tube.tooltip.summary": "UNLOCALIZED: A fancy redstone-powered _Number_ _Display_ ranging from 0 to 15.", @@ -1352,19 +1306,19 @@ "block.create.nixie_tube.tooltip.behaviour1": "UNLOCALIZED: Shows the current redstone _Signal_ _Strength_ as its displayed value.", "block.create.redstone_contact.tooltip": "REDSTONE-KONTAKT", - "block.create.redstone_contact.tooltip.summary": "Ein einfaches Gerät für fortgeschrittene Redstone-Apparate.", - "block.create.redstone_contact.tooltip.condition1": "Wenn gegenüber einem anderen Kontakt", + "block.create.redstone_contact.tooltip.summary": "Ein einfaches Gerät für fortgeschrittene Redstone-Apparate.", + "block.create.redstone_contact.tooltip.condition1": "Wenn gegenüber einem anderen Kontakt", "block.create.redstone_contact.tooltip.behaviour1": "Liefert ein _Redstone-Signal._", "block.create.redstone_contact.tooltip.condition2": "Wenn durch einen Mechanischen Kolben bewegt", - "block.create.redstone_contact.tooltip.behaviour2": "Löst im Vorbeifahren stationären Kontakte aus", + "block.create.redstone_contact.tooltip.behaviour2": "Löst im Vorbeifahren stationären Kontakte aus", "block.create.adjustable_crate.tooltip": "adjustable_crate", - "block.create.adjustable_crate.tooltip.summary": "Dieser _Speicherbehälter_ erlaubt manuelle Kontrolle über seine Kapazität. Er kann bis zu _16_ _Stacks_ von jeglichem Gegenstand beinhalten.", + "block.create.adjustable_crate.tooltip.summary": "Dieser _Speicherbehälter_ erlaubt manuelle Kontrolle über seine Kapazität. Er kann bis zu _16_ _Stacks_ von jeglichem Gegenstand beinhalten.", "block.create.adjustable_crate.tooltip.control1": "Wenn R-geklickt", - "block.create.adjustable_crate.tooltip.action1": "Öffnet das _Menü_", + "block.create.adjustable_crate.tooltip.action1": "Öffnet das _Menü_", "block.create.creative_crate.tooltip": "BAUPLANKANONENMACHER", - "block.create.creative_crate.tooltip.summary": "Stellt einen unendlichen Vorrat an Blöcken für benachbarte _Bauplaenkanonen_ bereit.", + "block.create.creative_crate.tooltip.summary": "Stellt einen unendlichen Vorrat an Blöcken für benachbarte _Bauplaenkanonen_ bereit.", "block.create.creative_crate.tooltip.condition1": "UNLOCALIZED: When Item in Filter Slot", "block.create.creative_crate.tooltip.behaviour1": "UNLOCALIZED: Anything _extracting_ from this container will provide an _endless_ _supply_ of the item specified. Items _inserted_ into this crate will be _voided._", @@ -1375,8 +1329,8 @@ "block.create.deployer.tooltip.condition2": "UNLOCALIZED: R-Clicked with Wrench", "block.create.deployer.tooltip.behaviour2": "UNLOCALIZED: Toggles punch mode. In _punch_ _mode_, the Deployer will attempt to use its item to _break_ _blocks_ or _hurt_ _entities_.", - "block.create.funnel.tooltip": "FLIEẞBANDTRICHTER", - "block.create.funnel.tooltip.summary": "Sammelt eingehende Gegenstände auf einem _Mechanischen_ _Riemen_ und fügt diese in einen verbundenen _Behälter_ ein, wenn möglich. Muss direkt _auf_ dem Riemen sein, mit der Öffnung entgegen der Bewegungsrichtung des Riemens zeigend. Der Behälter muss auf der gleichen Höhe wie der Trichter sein.", + "block.create.funnel.tooltip": "FLIEẞBANDTRICHTER", + "block.create.funnel.tooltip.summary": "Sammelt eingehende Gegenstände auf einem _Mechanischen_ _Riemen_ und fügt diese in einen verbundenen _Behälter_ ein, wenn möglich. Muss direkt _auf_ dem Riemen sein, mit der Öffnung entgegen der Bewegungsrichtung des Riemens zeigend. Der Behälter muss auf der gleichen Höhe wie der Trichter sein.", "block.create.funnel.tooltip.condition1": "UNLOCALIZED: Passive Belt pulling", "block.create.funnel.tooltip.behaviour1": "UNLOCALIZED: Funnels can pull items _from_ _belts_ when placed above them, either sideways or at the end. When a side-ways funnel is backed up, items on the _belt_ _will_ _not_ _stall_.", @@ -1392,10 +1346,10 @@ "block.create.brass_casing.tooltip.condition1": "UNLOCALIZED: When used on Mechanical Belt", "block.create.brass_casing.tooltip.behaviour1": "UNLOCALIZED: _Reinforces_ _belts_ with a brass foundation. Reinforced Belts can support _Belt_ _Tunnels_, _Extractors_, _Funnels_, and _Transposers_ interacting with the belt from the sides and below.", - "block.create.belt_observer.tooltip": "FLIEẞBAND-BEOBACHTER", - "block.create.belt_observer.tooltip.summary": "Erkennt Gegenstände, die vor ihm auf einem _Mechanischen_ _Riemen_ vorbeilaufen. Funktioniert wunderbar mit einem _Kolben_ über ihm, der gewisse Gegenstände runterschubst. ", - "block.create.belt_observer.tooltip.condition1": "Wenn ein Gegenstand mit dem Filter übereinstimmt", - "block.create.belt_observer.tooltip.behaviour1": "Sendet einen kurzen _Redstone-Puls_ an alle Seiten. Bei einem leeren Filter passiert dies mit allen Gegenständen.", + "block.create.belt_observer.tooltip": "FLIEẞBAND-BEOBACHTER", + "block.create.belt_observer.tooltip.summary": "Erkennt Gegenstände, die vor ihm auf einem _Mechanischen_ _Riemen_ vorbeilaufen. Funktioniert wunderbar mit einem _Kolben_ über ihm, der gewisse Gegenstände runterschubst. ", + "block.create.belt_observer.tooltip.condition1": "Wenn ein Gegenstand mit dem Filter übereinstimmt", + "block.create.belt_observer.tooltip.behaviour1": "Sendet einen kurzen _Redstone-Puls_ an alle Seiten. Bei einem leeren Filter passiert dies mit allen Gegenständen.", "block.create.belt_observer.tooltip.condition2": "UNLOCALIZED: Pulse Mode", "block.create.belt_observer.tooltip.behaviour2": "UNLOCALIZED: Emits a _pulse_ when a _matching_ _item_ _passes_ the center of the observed belt segment.", "block.create.belt_observer.tooltip.condition3": "UNLOCALIZED: Eject Mode", @@ -1403,11 +1357,11 @@ "block.create.belt_observer.tooltip.condition4": "UNLOCALIZED: Split Mode", "block.create.belt_observer.tooltip.behaviour4": "UNLOCALIZED: _Splits_ a _matching_ _item_ _stack_ and _ejects_ _half_ of it off the side.", - "block.create.pulse_repeater.tooltip": "PULSIERENDER VERSTÄRKER", - "block.create.pulse_repeater.tooltip.summary": "Ein einfacher Schaltkreis, um durchgehende Redstone-Signale auf eine Länge von _1_ _tick_ zu reduzieren.", + "block.create.pulse_repeater.tooltip": "PULSIERENDER VERSTÄRKER", + "block.create.pulse_repeater.tooltip.summary": "Ein einfacher Schaltkreis, um durchgehende Redstone-Signale auf eine Länge von _1_ _tick_ zu reduzieren.", - "block.create.adjustable_repeater.tooltip": "VERZÖGERNDER VERSTÄRKER", - "block.create.adjustable_repeater.tooltip.summary": "Ein fortgeschrittener _Redstone-Verstärker_ mit einer _konfigurierbaren_ _Verzögerung_ von bis zu 30 Minuten.", + "block.create.adjustable_repeater.tooltip": "VERZÖGERNDER VERSTÄRKER", + "block.create.adjustable_repeater.tooltip.summary": "Ein fortgeschrittener _Redstone-Verstärker_ mit einer _konfigurierbaren_ _Verzögerung_ von bis zu 30 Minuten.", "block.create.adjustable_pulse_repeater.tooltip": "UNLOCALIZED: FLEX PULSE REPEATER", "block.create.adjustable_pulse_repeater.tooltip.summary": "UNLOCALIZED: A _Pulse_ _Repeater_ with a _configurable_ _Delay_ up to 30 Minutes.", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index c457a033d..cac22b50d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -7,15 +7,15 @@ "block.create.acacia_window_pane": "UNLOCALIZED: Acacia Window Pane", "block.create.adjustable_crate": "Caisse ajustable", "block.create.adjustable_pulley": "Poulie de tapis roulant analogique", - "block.create.adjustable_pulse_repeater": "Répéteur d'impulsions réglable", - "block.create.adjustable_repeater": "Répéteur réglable", + "block.create.adjustable_pulse_repeater": "Répéteur d'impulsions réglable", + "block.create.adjustable_repeater": "Répéteur réglable", "block.create.analog_lever": "Levier analogique", "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", - "block.create.andesite_bricks": "Briques d'andésite", + "block.create.andesite_bricks": "Briques d'andésite", "block.create.andesite_bricks_slab": "UNLOCALIZED: Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "UNLOCALIZED: Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "UNLOCALIZED: Andesite Bricks Wall", - "block.create.andesite_casing": "Boîtier en andésite", + "block.create.andesite_casing": "Boîtier en andésite", "block.create.andesite_cobblestone": "UNLOCALIZED: Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "UNLOCALIZED: Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "UNLOCALIZED: Andesite Cobblestone Stairs", @@ -25,10 +25,6 @@ "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "Bassin", "block.create.belt": "Tapis roulant", -<<<<<<< HEAD - "block.create.belt_observer": "Observateur d'entité", -======= ->>>>>>> mc1.15/dev "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", "block.create.black_seat": "UNLOCALIZED: Black Seat", @@ -38,7 +34,7 @@ "block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle", "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", "block.create.brass_block": "UNLOCALIZED: Brass Block", - "block.create.brass_casing": "Boîtier en laiton", + "block.create.brass_casing": "Boîtier en laiton", "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.brown_seat": "UNLOCALIZED: Brown Seat", @@ -51,29 +47,21 @@ "block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria", "block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone", "block.create.chute": "UNLOCALIZED: Chute", - "block.create.clockwork_bearing": "Roulement mécanique horloger", + "block.create.clockwork_bearing": "Roulement mécanique horloger", "block.create.clutch": "Embrayage", -<<<<<<< HEAD - "block.create.cogwheel": "Roue dentée", -======= "block.create.cogwheel": "Roue dentée", "block.create.content_observer": "UNLOCALIZED: Content Observer", ->>>>>>> mc1.15/dev "block.create.copper_block": "Bloc de cuivre", - "block.create.copper_casing": "Boîtier en cuivre", + "block.create.copper_casing": "Boîtier en cuivre", "block.create.copper_ore": "Minerai de cuivre", "block.create.copper_shingles": "Bardeaux de cuivre", "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", -<<<<<<< HEAD - "block.create.creative_crate": "Créateur de schémacanon", -======= "block.create.copper_valve_handle": "UNLOCALIZED: Copper Valve Handle", "block.create.creative_crate": "Créateur de schémacanon", ->>>>>>> mc1.15/dev "block.create.creative_motor": "Moteur", "block.create.crushing_wheel": "Roue de concassage", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", - "block.create.cuckoo_clock": "Horloge à coucou", + "block.create.cuckoo_clock": "Horloge à coucou", "block.create.cyan_seat": "UNLOCALIZED: Cyan Seat", "block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle", "block.create.dark_oak_window": "UNLOCALIZED: Dark Oak Window", @@ -88,7 +76,7 @@ "block.create.dark_scoria_cobblestone_stairs": "UNLOCALIZED: Dark Scoria Cobblestone Stairs", "block.create.dark_scoria_cobblestone_wall": "UNLOCALIZED: Dark Scoria Cobblestone Wall", "block.create.dark_scoria_pillar": "UNLOCALIZED: Dark Scoria Pillar", - "block.create.deployer": "Déployeur", + "block.create.deployer": "Déployeur", "block.create.depot": "UNLOCALIZED: Depot", "block.create.diorite_bricks": "Briques de diorite", "block.create.diorite_bricks_slab": "UNLOCALIZED: Diorite Bricks Slab", @@ -109,10 +97,10 @@ "block.create.dolomite_cobblestone_stairs": "UNLOCALIZED: Dolomite Cobblestone Stairs", "block.create.dolomite_cobblestone_wall": "UNLOCALIZED: Dolomite Cobblestone Wall", "block.create.dolomite_pillar": "Pillier de dolomie", - "block.create.encased_belt": "Tapis roulant enfermé", - "block.create.encased_fan": "Ventilateur enfermé", + "block.create.encased_belt": "Tapis roulant enfermé", + "block.create.encased_fan": "Ventilateur enfermé", "block.create.encased_fluid_pipe": "UNLOCALIZED: Encased Fluid Pipe", - "block.create.encased_shaft": "Arbre mécanique enfermé", + "block.create.encased_shaft": "Arbre mécanique enfermé", "block.create.fancy_andesite_bricks": "UNLOCALIZED: Fancy Andesite Bricks", "block.create.fancy_andesite_bricks_slab": "UNLOCALIZED: Fancy Andesite Bricks Slab", "block.create.fancy_andesite_bricks_stairs": "UNLOCALIZED: Fancy Andesite Bricks Stairs", @@ -153,8 +141,8 @@ "block.create.fluid_tank": "UNLOCALIZED: Fluid Tank", "block.create.fluid_valve": "UNLOCALIZED: Fluid Valve", "block.create.flywheel": "Volant d'inertie", - "block.create.framed_glass": "Grande fenêtre en verre", - "block.create.framed_glass_pane": "Grande vitre encadrée", + "block.create.framed_glass": "Grande fenêtre en verre", + "block.create.framed_glass_pane": "Grande vitre encadrée", "block.create.furnace_engine": "Moteur de four", "block.create.gabbro": "Gabbro", "block.create.gabbro_bricks": "Briques de gabbro", @@ -166,8 +154,8 @@ "block.create.gabbro_cobblestone_stairs": "UNLOCALIZED: Gabbro Cobblestone Stairs", "block.create.gabbro_cobblestone_wall": "UNLOCALIZED: Gabbro Cobblestone Wall", "block.create.gabbro_pillar": "UNLOCALIZED: Gabbro Pillar", - "block.create.gearbox": "Boîte à roue dentée", - "block.create.gearshift": "Décaleur de rotation", + "block.create.gearbox": "Boîte à roue dentée", + "block.create.gearshift": "Décaleur de rotation", "block.create.glass_fluid_pipe": "UNLOCALIZED: Glass Fluid Pipe", "block.create.granite_bricks": "Briques de granite", "block.create.granite_bricks_slab": "UNLOCALIZED: Granite Bricks Slab", @@ -183,11 +171,11 @@ "block.create.green_seat": "UNLOCALIZED: Green Seat", "block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle", "block.create.hand_crank": "Manivelle", - "block.create.horizontal_framed_glass": "Fenêtre en verre horizontale", - "block.create.horizontal_framed_glass_pane": "Vitre encadrée horizontale", + "block.create.horizontal_framed_glass": "Fenêtre en verre horizontale", + "block.create.horizontal_framed_glass_pane": "Vitre encadrée horizontale", "block.create.jungle_window": "UNLOCALIZED: Jungle Window", "block.create.jungle_window_pane": "UNLOCALIZED: Jungle Window Pane", - "block.create.large_cogwheel": "Grande roue dentée", + "block.create.large_cogwheel": "Grande roue dentée", "block.create.layered_andesite": "UNLOCALIZED: Layered Andesite", "block.create.layered_dark_scoria": "UNLOCALIZED: Layered Dark Scoria", "block.create.layered_diorite": "UNLOCALIZED: Layered Diorite", @@ -214,21 +202,21 @@ "block.create.limestone_cobblestone_stairs": "UNLOCALIZED: Limestone Cobblestone Stairs", "block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall", "block.create.limestone_pillar": "Pillier de calcaire", - "block.create.linear_chassis": "Châssis linéaire", + "block.create.linear_chassis": "Châssis linéaire", "block.create.magenta_seat": "UNLOCALIZED: Magenta Seat", "block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle", "block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm", - "block.create.mechanical_bearing": "Roulement mécanique", - "block.create.mechanical_crafter": "Établi mécanique", - "block.create.mechanical_drill": "Perceuse mécanique", - "block.create.mechanical_harvester": "Récolteuse mécanique", - "block.create.mechanical_mixer": "Mixeur mécanique", - "block.create.mechanical_piston": "Piston mécanique", - "block.create.mechanical_piston_head": "Tête de piston mécanique", + "block.create.mechanical_bearing": "Roulement mécanique", + "block.create.mechanical_crafter": "Établi mécanique", + "block.create.mechanical_drill": "Perceuse mécanique", + "block.create.mechanical_harvester": "Récolteuse mécanique", + "block.create.mechanical_mixer": "Mixeur mécanique", + "block.create.mechanical_piston": "Piston mécanique", + "block.create.mechanical_piston_head": "Tête de piston mécanique", "block.create.mechanical_plough": "UNLOCALIZED: Mechanical Plough", - "block.create.mechanical_press": "Presse mécanique", + "block.create.mechanical_press": "Presse mécanique", "block.create.mechanical_pump": "UNLOCALIZED: Mechanical Pump", - "block.create.mechanical_saw": "Scie mécanique", + "block.create.mechanical_saw": "Scie mécanique", "block.create.millstone": "UNLOCALIZED: Millstone", "block.create.minecart_anchor": "UNLOCALIZED: Minecart Anchor", "block.create.mossy_andesite": "UNLOCALIZED: Mossy Andesite", @@ -296,12 +284,8 @@ "block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs", "block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall", "block.create.pink_seat": "UNLOCALIZED: Pink Seat", -<<<<<<< HEAD - "block.create.piston_extension_pole": "Pôle d'extension de piston", -======= "block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle", "block.create.piston_extension_pole": "Pôle d'extension de piston", ->>>>>>> mc1.15/dev "block.create.polished_dark_scoria": "Scorie sombre polie", "block.create.polished_dark_scoria_slab": "UNLOCALIZED: Polished Dark Scoria Slab", "block.create.polished_dark_scoria_stairs": "UNLOCALIZED: Polished Dark Scoria Stairs", @@ -322,22 +306,18 @@ "block.create.polished_scoria_slab": "Dalle de scorie polie", "block.create.polished_scoria_stairs": "UNLOCALIZED: Polished Scoria Stairs", "block.create.polished_scoria_wall": "UNLOCALIZED: Polished Scoria Wall", - "block.create.polished_weathered_limestone": "Calcaire patinées polies", - "block.create.polished_weathered_limestone_slab": "Dalle de calcaire patinées", + "block.create.polished_weathered_limestone": "Calcaire patinées polies", + "block.create.polished_weathered_limestone_slab": "Dalle de calcaire patinées", "block.create.polished_weathered_limestone_stairs": "UNLOCALIZED: Polished Weathered Limestone Stairs", "block.create.polished_weathered_limestone_wall": "UNLOCALIZED: Polished Weathered Limestone Wall", "block.create.portable_storage_interface": "Interface de stockage portable", - "block.create.powered_latch": "Verrou alimenté", - "block.create.powered_toggle_latch": "Verrou alimenté à bascule", + "block.create.powered_latch": "Verrou alimenté", + "block.create.powered_toggle_latch": "Verrou alimenté à bascule", "block.create.pulley_magnet": "Aimant de poulie", - "block.create.pulse_repeater": "Répéteur d'impulsions", + "block.create.pulse_repeater": "Répéteur d'impulsions", "block.create.purple_seat": "UNLOCALIZED: Purple Seat", -<<<<<<< HEAD - "block.create.radial_chassis": "Châssis radial", -======= "block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle", "block.create.radial_chassis": "Châssis radial", ->>>>>>> mc1.15/dev "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle", "block.create.redstone_contact": "redstone_contact Redstone", @@ -345,10 +325,10 @@ "block.create.refined_radiance_casing": "UNLOCALIZED: Radiant Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "Corde", - "block.create.rope_pulley": "Poulie à corde", - "block.create.rotation_speed_controller": "Contrôleur de vitesse de rotation", - "block.create.schematic_table": "Table à schéma", - "block.create.schematicannon": "Schémacanon", + "block.create.rope_pulley": "Poulie à corde", + "block.create.rotation_speed_controller": "Contrôleur de vitesse de rotation", + "block.create.schematic_table": "Table à schéma", + "block.create.schematicannon": "Schémacanon", "block.create.scoria": "Scorie", "block.create.scoria_bricks": "Briques de scorie", "block.create.scoria_bricks_slab": "UNLOCALIZED: Scoria Bricks Slab", @@ -360,32 +340,32 @@ "block.create.scoria_cobblestone_wall": "UNLOCALIZED: Scoria Cobblestone Wall", "block.create.scoria_pillar": "Pillier de scorie", "block.create.secondary_linear_chassis": "UNLOCALIZED: Secondary Linear Chassis", - "block.create.sequenced_gearshift": "Décaleur de rotation séquencé", + "block.create.sequenced_gearshift": "Décaleur de rotation séquencé", "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Casing", - "block.create.shaft": "Arbre mécanique", + "block.create.shaft": "Arbre mécanique", "block.create.speedometer": "Compteur de vitesse", "block.create.spout": "UNLOCALIZED: Spout", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", "block.create.spruce_window_pane": "UNLOCALIZED: Spruce Window Pane", - "block.create.sticky_mechanical_piston": "Piston mécanique collant", - "block.create.stockpile_switch": "Détecteur de stockage", - "block.create.stressometer": "Stressomètre", - "block.create.tiled_glass": "Verre carrelé", - "block.create.tiled_glass_pane": "Vitre carrelé", + "block.create.sticky_mechanical_piston": "Piston mécanique collant", + "block.create.stockpile_switch": "Détecteur de stockage", + "block.create.stressometer": "Stressomètre", + "block.create.tiled_glass": "Verre carrelé", + "block.create.tiled_glass_pane": "Vitre carrelé", "block.create.turntable": "Plaque tournante", - "block.create.vertical_framed_glass": "Fenêtre en verre verticale", - "block.create.vertical_framed_glass_pane": "Vitre encadrée verticale", - "block.create.water_wheel": "Roue à eau", - "block.create.weathered_limestone": "Calcaire patinées", - "block.create.weathered_limestone_bricks": "Briques de calcaire patinées", - "block.create.weathered_limestone_bricks_slab": "Dalle de briques de calcaire patinées", - "block.create.weathered_limestone_bricks_stairs": "Escaliers de briques de calcaire patinées", - "block.create.weathered_limestone_bricks_wall": "Muret de briques de calcaire patinées", + "block.create.vertical_framed_glass": "Fenêtre en verre verticale", + "block.create.vertical_framed_glass_pane": "Vitre encadrée verticale", + "block.create.water_wheel": "Roue à eau", + "block.create.weathered_limestone": "Calcaire patinées", + "block.create.weathered_limestone_bricks": "Briques de calcaire patinées", + "block.create.weathered_limestone_bricks_slab": "Dalle de briques de calcaire patinées", + "block.create.weathered_limestone_bricks_stairs": "Escaliers de briques de calcaire patinées", + "block.create.weathered_limestone_bricks_wall": "Muret de briques de calcaire patinées", "block.create.weathered_limestone_cobblestone": "UNLOCALIZED: Weathered Limestone Cobblestone", "block.create.weathered_limestone_cobblestone_slab": "UNLOCALIZED: Weathered Limestone Cobblestone Slab", "block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs", "block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall", - "block.create.weathered_limestone_pillar": "Pillier de calcaire patinées", + "block.create.weathered_limestone_pillar": "Pillier de calcaire patinées", "block.create.white_seat": "UNLOCALIZED: White Seat", "block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle", "block.create.yellow_seat": "UNLOCALIZED: Yellow Seat", @@ -398,60 +378,60 @@ "entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption", "entity.create.super_glue": "UNLOCALIZED: Super Glue", - "item.create.andesite_alloy": "Alliage d'andésite", + "item.create.andesite_alloy": "Alliage d'andésite", "item.create.attribute_filter": "Filtre d'attribut", "item.create.belt_connector": "Tapis roulant", "item.create.brass_hand": "Main", "item.create.brass_ingot": "Lingot de laiton", - "item.create.brass_nugget": "Pépite de laiton", + "item.create.brass_nugget": "Pépite de laiton", "item.create.brass_sheet": "Plaques de laiton", - "item.create.chromatic_compound": "Composé chromatique", + "item.create.chromatic_compound": "Composé chromatique", "item.create.copper_ingot": "Lingot de cuivre", - "item.create.copper_nugget": "Pépite de cuivre", + "item.create.copper_nugget": "Pépite de cuivre", "item.create.copper_sheet": "Plaques de cuivre", "item.create.crafter_slot_cover": "Couvercle", - "item.create.crushed_brass": "Laiton concassé", + "item.create.crushed_brass": "Laiton concassé", "item.create.crushed_copper_ore": "UNLOCALIZED: Crushed Copper Ore", "item.create.crushed_gold_ore": "UNLOCALIZED: Crushed Gold Ore", "item.create.crushed_iron_ore": "UNLOCALIZED: Crushed Iron Ore", "item.create.crushed_zinc_ore": "UNLOCALIZED: Crushed Zinc Ore", - "item.create.deforester": "Déforesteur", - "item.create.dough": "Pâte", - "item.create.electron_tube": "Tube électronique", + "item.create.deforester": "Déforesteur", + "item.create.dough": "Pâte", + "item.create.electron_tube": "Tube électronique", "item.create.empty_blaze_burner": "UNLOCALIZED: Empty Blaze Burner", - "item.create.empty_schematic": "Schéma vide", + "item.create.empty_schematic": "Schéma vide", "item.create.extendo_grip": "UNLOCALIZED: Extendo Grip", "item.create.filter": "Filtre", "item.create.fuel_pellet": "UNLOCALIZED: Fuel Pellet", "item.create.furnace_minecart_contraption": "UNLOCALIZED: Furnace Minecart Contraption", - "item.create.goggles": "Lunettes d'ingénieur", + "item.create.goggles": "Lunettes d'ingénieur", "item.create.golden_sheet": "UNLOCALIZED: Golden Sheet", "item.create.handheld_blockzapper": "Blockzappeur portable", - "item.create.handheld_worldshaper": "Térraformeur portable", - "item.create.integrated_circuit": "Circuit intégré", + "item.create.handheld_worldshaper": "Térraformeur portable", + "item.create.integrated_circuit": "Circuit intégré", "item.create.iron_sheet": "Plaque de Fer", "item.create.lapis_sheet": "UNLOCALIZED: Lapis Sheet", "item.create.minecart_contraption": "UNLOCALIZED: Minecart Contraption", "item.create.minecart_coupling": "UNLOCALIZED: Minecart Coupling", "item.create.polished_rose_quartz": "Quartz rose poli", "item.create.powdered_obsidian": "UNLOCALIZED: Powdered Obsidian", - "item.create.propeller": "Hélice", + "item.create.propeller": "Hélice", "item.create.red_sand_paper": "Papier de verre rouge", - "item.create.refined_radiance": "Éclat raffiné", + "item.create.refined_radiance": "Éclat raffiné", "item.create.rose_quartz": "Quartz rose", "item.create.sand_paper": "Papier de verre", - "item.create.schematic": "Schéma", - "item.create.schematic_and_quill": "Schéma et plume", + "item.create.schematic": "Schéma", + "item.create.schematic_and_quill": "Schéma et plume", "item.create.shadow_steel": "Acier sombre", "item.create.super_glue": "UNLOCALIZED: Super Glue", "item.create.tree_fertilizer": "Engrais pour arbre", "item.create.vertical_gearbox": "UNLOCALIZED: Vertical Gearbox", - "item.create.wand_of_symmetry": "Bâton de symétrie", + "item.create.wand_of_symmetry": "Bâton de symétrie", "item.create.wheat_flour": "UNLOCALIZED: Wheat Flour", "item.create.whisk": "Fouet", - "item.create.wrench": "Clé", + "item.create.wrench": "Clé", "item.create.zinc_ingot": "Barre de zinc", - "item.create.zinc_nugget": "Pépite de zinc", + "item.create.zinc_nugget": "Pépite de zinc", "_": "->------------------------] Advancements [------------------------<-", @@ -547,38 +527,38 @@ "itemGroup.create.base": "UNLOCALIZED: Create", "itemGroup.create.palettes": "UNLOCALIZED: Create Palettes", - "death.attack.create.crush": "%1$s nanana a été traitée par une roue de concassage", - "death.attack.create.fan_fire": "%1$s a été brûlé à mort par l'air chaud", - "death.attack.create.fan_lava": "%1$s a été brûlé à mort par un ventilateur de lave", - "death.attack.create.mechanical_drill": "%1$s a été empalé par une perceuse mécanique", - "death.attack.create.mechanical_saw": "%1$s a été coupé en deux par une scie mécanique", - "death.attack.create.cuckoo_clock_explosion": "%1$s a été explosé par un coucou trafiquée", + "death.attack.create.crush": "%1$s nanana a été traitée par une roue de concassage", + "death.attack.create.fan_fire": "%1$s a été brûlé à mort par l'air chaud", + "death.attack.create.fan_lava": "%1$s a été brûlé à mort par un ventilateur de lave", + "death.attack.create.mechanical_drill": "%1$s a été empalé par une perceuse mécanique", + "death.attack.create.mechanical_saw": "%1$s a été coupé en deux par une scie mécanique", + "death.attack.create.cuckoo_clock_explosion": "%1$s a été explosé par un coucou trafiquée", - "create.block.deployer.damage_source_name": "un déployeur voyou", + "create.block.deployer.damage_source_name": "un déployeur voyou", "create.block.cart_assembler.invalid": "UNLOCALIZED: Place your Cart Assembler on a rail block", "create.recipe.crushing": "Ecrasement", "create.recipe.milling": "UNLOCALIZED: Milling", "create.recipe.splashing": "Lavage en vrac", - "create.recipe.splashing.fan": "Ventilateur derrière de l'eau qui coule", + "create.recipe.splashing.fan": "Ventilateur derrière de l'eau qui coule", "create.recipe.smoking_via_fan": "Fumer en vrac", "create.recipe.smoking_via_fan.fan": "Fan behind Fire", - "create.recipe.blasting_via_fan": "Ventilateur derrière du feu", - "create.recipe.blasting_via_fan.fan": "Ventilateur derrière de la lave", + "create.recipe.blasting_via_fan": "Ventilateur derrière du feu", + "create.recipe.blasting_via_fan.fan": "Ventilateur derrière de la lave", "create.recipe.pressing": "Pressage", "create.recipe.mixing": "Mixage", "create.recipe.packing": "Compactage", "create.recipe.mechanical_sawing": "Sciage", - "create.recipe.mechanical_crafting": "Fabrication mécanique", + "create.recipe.mechanical_crafting": "Fabrication mécanique", "create.recipe.block_cutting": "Coupe de bloc", "create.recipe.blockzapper_upgrade": "Blockzappeur portable", "create.recipe.sandpaper_polishing": "Polissage au papier de verre", - "create.recipe.mystery_conversion": "Métamorphose chromatique", + "create.recipe.mystery_conversion": "Métamorphose chromatique", "create.recipe.processing.catalyst": "Catalyseur", "create.recipe.processing.chance": "%1$s%% de chance", "create.recipe.processing.chanceToReturn": "%1$s%% de chance de retour", - "create.generic.range": "Portée", + "create.generic.range": "Portée", "create.generic.radius": "Rayon", "create.generic.width": "Largeur", "create.generic.height": "Hauteur", @@ -590,9 +570,9 @@ "create.generic.unit.minutes": "Minutes", "create.generic.unit.rpm": "tr/min", "create.generic.unit.stress": "us", - "create.generic.unit.degrees": "°", + "create.generic.unit.degrees": "°", - "create.action.scroll": "Faire défiler", + "create.action.scroll": "Faire défiler", "create.action.confirm": "Confirmer", "create.action.abort": "Abandonner", "create.action.saveToFile": "Sauvegarder", @@ -603,10 +583,10 @@ "create.keyinfo.scrolldown": "UNLOCALIZED: Simulate Mousewheel Down (inworld)", "create.gui.scrollInput.defaultTitle": "Choisissez une option:", - "create.gui.scrollInput.scrollToModify": "Faites défiler pour modifier", - "create.gui.scrollInput.scrollToAdjustAmount": "Faites défiler pour ajuster le montant", - "create.gui.scrollInput.scrollToSelect": "Faites défiler pour sélectionner", - "create.gui.scrollInput.shiftScrollsFaster": "Maj pour défiler plus rapidement", + "create.gui.scrollInput.scrollToModify": "Faites défiler pour modifier", + "create.gui.scrollInput.scrollToAdjustAmount": "Faites défiler pour ajuster le montant", + "create.gui.scrollInput.scrollToSelect": "Faites défiler pour sélectionner", + "create.gui.scrollInput.shiftScrollsFaster": "Maj pour défiler plus rapidement", "create.gui.toolmenu.focusKey": "Enfoncez [%1$s] pour focus", "create.gui.toolmenu.cycle": "[SCROLL] pour cycler", "create.gui.symmetryWand.mirrorType": "Mirroir", @@ -625,24 +605,24 @@ "create.gui.blockzapper.title": "Blockzappeur portable", "create.gui.blockzapper.replaceMode": "Mode de remplacement", "create.gui.blockzapper.searchDiagonal": "Suivez les diagonales", - "create.gui.blockzapper.searchFuzzy": "Ignorer les bordures de matériau", + "create.gui.blockzapper.searchFuzzy": "Ignorer les bordures de matériau", "create.gui.blockzapper.range": "Plage de propagation", - "create.gui.blockzapper.needsUpgradedAmplifier": "Nécessite un amplificateur amélioré", + "create.gui.blockzapper.needsUpgradedAmplifier": "Nécessite un amplificateur amélioré", "create.gui.blockzapper.patternSection": "Motif", "create.gui.blockzapper.pattern.solid": "Solide", "create.gui.blockzapper.pattern.checkered": "Quamechanical_drillage", - "create.gui.blockzapper.pattern.inversecheckered": "Quamechanical_drillage inversé", + "create.gui.blockzapper.pattern.inversecheckered": "Quamechanical_drillage inversé", "create.gui.blockzapper.pattern.chance25": "25%", "create.gui.blockzapper.pattern.chance50": "50%", "create.gui.blockzapper.pattern.chance75": "75%", - "create.gui.terrainzapper.title": "Térraformeur portable", + "create.gui.terrainzapper.title": "Térraformeur portable", "create.gui.terrainzapper.placement": "Placement", "create.gui.terrainzapper.placement.merged": "Fusionner", "create.gui.terrainzapper.placement.attached": "Attacher", "create.gui.terrainzapper.placement.inserted": "Inserer", "create.gui.terrainzapper.brush": "Pinceau", - "create.gui.terrainzapper.brush.cuboid": "Cuboïde", - "create.gui.terrainzapper.brush.sphere": "Sphère", + "create.gui.terrainzapper.brush.cuboid": "Cuboïde", + "create.gui.terrainzapper.brush.sphere": "Sphère", "create.gui.terrainzapper.brush.cylinder": "Cylindre", "create.gui.terrainzapper.tool": "Outil", "create.gui.terrainzapper.tool.fill": "Remplir", @@ -652,28 +632,28 @@ "create.gui.terrainzapper.tool.overlay": "Recouvrir", "create.gui.terrainzapper.tool.flatten": "Applatir", - "create.terrainzapper.shiftRightClickToSet": "Maj + clic droit pour sélectionner une forme", + "create.terrainzapper.shiftRightClickToSet": "Maj + clic droit pour sélectionner une forme", "create.blockzapper.usingBlock": "Utilisation: %1$s", - "create.blockzapper.componentUpgrades": "Mises à niveau des composants:", + "create.blockzapper.componentUpgrades": "Mises à niveau des composants:", "create.blockzapper.component.body": "Corps", "create.blockzapper.component.amplifier": "Amplifieur", - "create.blockzapper.component.accelerator": "Accélérateur", - "create.blockzapper.component.retriever": "Récupérateur", + "create.blockzapper.component.accelerator": "Accélérateur", + "create.blockzapper.component.retriever": "Récupérateur", "create.blockzapper.component.scope": "Lunette", "create.blockzapper.componentTier.none": "Aucun", "create.blockzapper.componentTier.brass": "Laiton", "create.blockzapper.componentTier.chromatic": "Chromatique", - "create.blockzapper.leftClickToSet": "Clic gauche sur un bloc pour en définir le matériau", + "create.blockzapper.leftClickToSet": "Clic gauche sur un bloc pour en définir le matériau", "create.blockzapper.empty": "Plus de blocs!", "create.contraptions.movement_mode": "Mode de mouvement", - "create.contraptions.movement_mode.move_place": "Toujours placer à l'arrêt", - "create.contraptions.movement_mode.move_place_returned": "Placer uniquement en position de départ", - "create.contraptions.movement_mode.move_never_place": "Ne placer que lorsque l'ancre est détruite", - "create.contraptions.movement_mode.rotate_place": "Toujours placer à l'arrêt", - "create.contraptions.movement_mode.rotate_place_returned": "Placer uniquement près de l'angle initial", - "create.contraptions.movement_mode.rotate_never_place": "Ne placer que lorsque l'ancre est détruite", + "create.contraptions.movement_mode.move_place": "Toujours placer à l'arrêt", + "create.contraptions.movement_mode.move_place_returned": "Placer uniquement en position de départ", + "create.contraptions.movement_mode.move_never_place": "Ne placer que lorsque l'ancre est détruite", + "create.contraptions.movement_mode.rotate_place": "Toujours placer à l'arrêt", + "create.contraptions.movement_mode.rotate_place_returned": "Placer uniquement près de l'angle initial", + "create.contraptions.movement_mode.rotate_never_place": "Ne placer que lorsque l'ancre est détruite", "create.contraptions.cart_movement_mode": "UNLOCALIZED: Cart Movement Mode", "create.contraptions.cart_movement_mode.rotate": "UNLOCALIZED: Always face toward motion", "create.contraptions.cart_movement_mode.rotate_paused": "UNLOCALIZED: Pause actors while rotating", @@ -684,61 +664,36 @@ "create.logistics.firstFrequency": "Freq. #1", "create.logistics.secondFrequency": "Freq. #2", - "create.gui.goggles.generator_stats": "Statistiques du générateur:", - "create.gui.goggles.kinetic_stats": "Statistiques cinétiques:", - "create.gui.goggles.at_current_speed": "À la vitesse actuelle", + "create.gui.goggles.generator_stats": "Statistiques du générateur:", + "create.gui.goggles.kinetic_stats": "Statistiques cinétiques:", + "create.gui.goggles.at_current_speed": "À la vitesse actuelle", "create.gui.goggles.base_value": "Valeur de base", "create.gui.gauge.info_header": "Informations sur la jauge:", "create.gui.speedometer.title": "Vitesse de rotation", - "create.gui.stressometer.title": "Stress du réseau", - "create.gui.stressometer.capacity": "Capacité restante", - "create.gui.stressometer.overstressed": "Surmenée", + "create.gui.stressometer.title": "Stress du réseau", + "create.gui.stressometer.capacity": "Capacité restante", + "create.gui.stressometer.overstressed": "Surmenée", "create.gui.stressometer.no_rotation": "Pas de rotation", - "create.gui.contraptions.not_fast_enough": "Il semblerais que ce.t.te %1$s ne tourne _pas_ à la _vitesse_ _suffisante_.", + "create.gui.contraptions.not_fast_enough": "Il semblerais que ce.t.te %1$s ne tourne _pas_ à la _vitesse_ _suffisante_.", "create.gui.contraptions.network_overstressed": "UNLOCALIZED: It appears that this contraption is _overstressed_. Add more sources or _slow_ _down_ the components with a high _stress_ _impact_.", - "create.gui.adjustable_crate.title": "Caisse réglable", + "create.gui.adjustable_crate.title": "Caisse réglable", "create.gui.adjustable_crate.storageSpace": "Espace de stockage", "create.gui.stockpile_switch.title": "Commutateur de stockage", -<<<<<<< HEAD - "create.gui.stockpile_switch.lowerLimit": "Seuil inférieur", - "create.gui.stockpile_switch.upperLimit": "Seuil supérieur", - "create.gui.stockpile_switch.startAt": "Signal de départ à", - "create.gui.stockpile_switch.startAbove": "Signal de démarrage au-dessus", - "create.gui.stockpile_switch.stopAt": "Signal d'arrêt à", - "create.gui.stockpile_switch.stopBelow": "Signal d'arrêt en-dessous", - "create.gui.sequenced_gearshift.title": "Décaleur de rotation séquencé", -======= "create.gui.stockpile_switch.invert_signal": "UNLOCALIZED: Invert Signal", "create.gui.stockpile_switch.move_to_lower_at": "UNLOCALIZED: Move to lower lane at %1$s%%", "create.gui.stockpile_switch.move_to_upper_at": "UNLOCALIZED: Move to upper lane at %1$s%%", "create.gui.sequenced_gearshift.title": "Décaleur de rotation séquencé", ->>>>>>> mc1.15/dev "create.gui.sequenced_gearshift.instruction": "Instructions", "create.gui.sequenced_gearshift.instruction.turn_angle": "Tourner", "create.gui.sequenced_gearshift.instruction.turn_angle.angle": "Angle", "create.gui.sequenced_gearshift.instruction.turn_distance": "Piston", "create.gui.sequenced_gearshift.instruction.turn_distance.distance": "Distance", "create.gui.sequenced_gearshift.instruction.wait": "Attente", - "create.gui.sequenced_gearshift.instruction.wait.duration": "Durée", + "create.gui.sequenced_gearshift.instruction.wait.duration": "Durée", "create.gui.sequenced_gearshift.instruction.end": "Fin", "create.gui.sequenced_gearshift.speed": "Vitesse, direction", - "create.gui.sequenced_gearshift.speed.forward": "Vitesse d'entrée, normal", + "create.gui.sequenced_gearshift.speed.forward": "Vitesse d'entrée, normal", "create.gui.sequenced_gearshift.speed.forward_fast": "Vitesse double, normal", -<<<<<<< HEAD - "create.gui.sequenced_gearshift.speed.back": "Vitesse d'entrée, inversé", - "create.gui.sequenced_gearshift.speed.back_fast": "Vitesse double, inversée", - - "create.schematicAndQuill.dimensions": "Taille du schéma: %1$sx%2$sx%3$s", - "create.schematicAndQuill.firstPos": "Première position définie.", - "create.schematicAndQuill.secondPos": "Seconde position définie.", - "create.schematicAndQuill.noTarget": "Enfoncez [Ctrl] pour sélectionner les blocs d'air.", - "create.schematicAndQuill.abort": "Sélection supprimée.", - "create.schematicAndQuill.prompt": "Entrez un nom pour le schéma:", - "create.schematicAndQuill.fallbackName": "Mon schéma", - "create.schematicAndQuill.saved": "Sauvegardé en tant que %1$s", - - "create.schematic.invalid": "[!] objet invalide - Utilisez plutôt la table à schéma", -======= "create.gui.sequenced_gearshift.speed.back": "Vitesse d'entrée, inversé", "create.gui.sequenced_gearshift.speed.back_fast": "Vitesse double, inversée", @@ -753,7 +708,6 @@ "create.schematicAndQuill.saved": "Sauvegardé en tant que %1$s", "create.schematic.invalid": "[!] objet invalide - Utilisez plutôt la table à schéma", ->>>>>>> mc1.15/dev "create.schematic.position": "Position", "create.schematic.rotation": "Rotation", "create.schematic.rotation.none": "Aucune", @@ -762,58 +716,40 @@ "create.schematic.rotation.cw270": "Sens horaire 270", "create.schematic.mirror": "Mirroir", "create.schematic.mirror.none": "Aucun", - "create.schematic.mirror.frontBack": "Avant-Arrière", + "create.schematic.mirror.frontBack": "Avant-Arrière", "create.schematic.mirror.leftRight": "Gauche-Droite", - "create.schematic.tool.deploy": "Déployer", - "create.schematic.tool.move": "Déplacer XZ", - "create.schematic.tool.movey": "Déplacer Y", + "create.schematic.tool.deploy": "Déployer", + "create.schematic.tool.move": "Déplacer XZ", + "create.schematic.tool.movey": "Déplacer Y", "create.schematic.tool.rotate": "Tourner", "create.schematic.tool.print": "Imprimer", "create.schematic.tool.flip": "Retourner", - "create.schematic.tool.deploy.description.0": "Déplace la structure vers un emplacement.", + "create.schematic.tool.deploy.description.0": "Déplace la structure vers un emplacement.", "create.schematic.tool.deploy.description.1": "Clic droit sur le sol pour placer.", - "create.schematic.tool.deploy.description.2": "Maintenez [Ctrl] pour sélectionner à une distance fixe.", - "create.schematic.tool.deploy.description.3": "[Ctrl]-Défiler pour changer la distance.", - "create.schematic.tool.move.description.0": "Décale le schéma horizontalement.", - "create.schematic.tool.move.description.1": "Pointez sur le schéma et [CTRL]-Défiler pour le pousser.", + "create.schematic.tool.deploy.description.2": "Maintenez [Ctrl] pour sélectionner à une distance fixe.", + "create.schematic.tool.deploy.description.3": "[Ctrl]-Défiler pour changer la distance.", + "create.schematic.tool.move.description.0": "Décale le schéma horizontalement.", + "create.schematic.tool.move.description.1": "Pointez sur le schéma et [CTRL]-Défiler pour le pousser.", "create.schematic.tool.move.description.2": "", "create.schematic.tool.move.description.3": "", - "create.schematic.tool.movey.description.0": "Décale le schéma verticalement.", - "create.schematic.tool.movey.description.1": "[CTRL]-Défiler pour le déplacer vers le haut / bas.", + "create.schematic.tool.movey.description.0": "Décale le schéma verticalement.", + "create.schematic.tool.movey.description.1": "[CTRL]-Défiler pour le déplacer vers le haut / bas.", "create.schematic.tool.movey.description.2": "", "create.schematic.tool.movey.description.3": "", - "create.schematic.tool.rotate.description.0": "Fait pivoter le schéma autour de son centre.", - "create.schematic.tool.rotate.description.1": "[CTRL]-Défiler pour faire une rotation de 90 degrés.", + "create.schematic.tool.rotate.description.0": "Fait pivoter le schéma autour de son centre.", + "create.schematic.tool.rotate.description.1": "[CTRL]-Défiler pour faire une rotation de 90 degrés.", "create.schematic.tool.rotate.description.2": "", "create.schematic.tool.rotate.description.3": "", - "create.schematic.tool.print.description.0": "Place instantanément la structure dans le monde.", - "create.schematic.tool.print.description.1": "[Clic droit] pour confirmer le placement à l'emplacement actuel.", - "create.schematic.tool.print.description.2": "Cet outil est uniquement pour le mode créatif.", + "create.schematic.tool.print.description.0": "Place instantanément la structure dans le monde.", + "create.schematic.tool.print.description.1": "[Clic droit] pour confirmer le placement à l'emplacement actuel.", + "create.schematic.tool.print.description.2": "Cet outil est uniquement pour le mode créatif.", "create.schematic.tool.print.description.3": "", - "create.schematic.tool.flip.description.0": "Retourne le schéma le long de la face que vous sélectionnez.", - "create.schematic.tool.flip.description.1": "Pointez sur le schéma et [CTRL]-Défiler pour le retourner.", + "create.schematic.tool.flip.description.0": "Retourne le schéma le long de la face que vous sélectionnez.", + "create.schematic.tool.flip.description.1": "Pointez sur le schéma et [CTRL]-Défiler pour le retourner.", "create.schematic.tool.flip.description.2": "", "create.schematic.tool.flip.description.3": "", "create.schematics.synchronizing": "Synchronisation...", -<<<<<<< HEAD - "create.schematics.uploadTooLarge": "Votre schéma est trop grand.", - "create.schematics.maxAllowedSize": "La taille de fichier schématique maximale autorisée est:", - - "create.gui.schematicTable.title": "Table à schéma", - "create.gui.schematicTable.availableSchematics": "Schémas disponibles", - "create.gui.schematicTable.noSchematics": "Aucun schéma enregistré", - "create.gui.schematicTable.uploading": "Téléchargement...", - "create.gui.schematicTable.finished": "Téléchargement terminé!", - "create.gui.schematicannon.title": "Schémacanon", - "create.gui.schematicannon.settingsTitle": "Options de placement", - "create.gui.schematicannon.listPrinter": "Imprimante de liste de matériaux", - "create.gui.schematicannon.gunpowderLevel": "Poudre à canon à %1$s%%", - "create.gui.schematicannon.shotsRemaining": "Tirs restants: %1$s", - "create.gui.schematicannon.shotsRemainingWithBackup": "Avec sauvegarde: %1$s", - "create.gui.schematicannon.optionEnabled": "Actuellement activé", - "create.gui.schematicannon.optionDisabled": "Actuellement désactivé", -======= "create.schematics.uploadTooLarge": "Votre schéma est trop grand.", "create.schematics.maxAllowedSize": "La taille de fichier schématique maximale autorisée est:", @@ -832,62 +768,53 @@ "create.gui.schematicannon.optionEnabled": "Actuellement activé", "create.gui.schematicannon.optionDisabled": "Actuellement désactivé", "create.gui.schematicannon.showOptions": "UNLOCALIZED: Show Printer Settings", ->>>>>>> mc1.15/dev "create.gui.schematicannon.option.dontReplaceSolid": "Ne remplacez pas les blocs solides", "create.gui.schematicannon.option.replaceWithSolid": "Remplacer solide par solide", "create.gui.schematicannon.option.replaceWithAny": "Remplacer le solide par n'importe quoi", "create.gui.schematicannon.option.replaceWithEmpty": "Remplacer le solide par rien", "create.gui.schematicannon.option.skipMissing": "Ignorer les blocs manquants", -<<<<<<< HEAD - "create.gui.schematicannon.option.skipTileEntities": "Protéger les Tile Entities", -======= "create.gui.schematicannon.option.skipTileEntities": "Protéger les Tile Entities", "create.gui.schematicannon.slot.gunpowder": "UNLOCALIZED: Add gunpowder to fuel the cannon", "create.gui.schematicannon.slot.listPrinter": "UNLOCALIZED: Place books here to print a Checklist for your Schematic", "create.gui.schematicannon.slot.schematic": "UNLOCALIZED: Add your Schematic here. Make sure it is deployed at a specific location.", ->>>>>>> mc1.15/dev "create.gui.schematicannon.option.skipMissing.description": "Si le canon ne peut pas trouver un bloc requis pour le placement, il continuera au prochain emplacement.", - "create.gui.schematicannon.option.skipTileEntities.description": "Le canon évitera de remplacer les blocs de stockage de données tels que les coffres.", + "create.gui.schematicannon.option.skipTileEntities.description": "Le canon évitera de remplacer les blocs de stockage de données tels que les coffres.", "create.gui.schematicannon.option.dontReplaceSolid.description": "Le canon ne remplacera jamais les blocs solides dans sa zone de travail, seulement non solides et air.", - "create.gui.schematicannon.option.replaceWithSolid.description": "Le canon ne remplacera les blocs solides dans sa zone de travail que si le schéma contient un bloc solide à l'emplacement.", - "create.gui.schematicannon.option.replaceWithAny.description": "Le canon remplacera les blocs solides dans sa zone de travail si le schéma contient un bloc à l'emplacement.", - "create.gui.schematicannon.option.replaceWithEmpty.description": "Le canon effacera tous les blocs dans sa zone de travail, y compris ceux remplacés par de l'air.", + "create.gui.schematicannon.option.replaceWithSolid.description": "Le canon ne remplacera les blocs solides dans sa zone de travail que si le schéma contient un bloc solide à l'emplacement.", + "create.gui.schematicannon.option.replaceWithAny.description": "Le canon remplacera les blocs solides dans sa zone de travail si le schéma contient un bloc à l'emplacement.", + "create.gui.schematicannon.option.replaceWithEmpty.description": "Le canon effacera tous les blocs dans sa zone de travail, y compris ceux remplacés par de l'air.", "create.schematicannon.status.idle": "Repos", - "create.schematicannon.status.ready": "Prêt", + "create.schematicannon.status.ready": "Prêt", "create.schematicannon.status.running": "En cours", - "create.schematicannon.status.finished": "Terminé", - "create.schematicannon.status.paused": "Pausé", - "create.schematicannon.status.stopped": "Arrêté", - "create.schematicannon.status.noGunpowder": "Plus de poudre à canon", - "create.schematicannon.status.targetNotLoaded": "Le bloc n'est pas chargé", + "create.schematicannon.status.finished": "Terminé", + "create.schematicannon.status.paused": "Pausé", + "create.schematicannon.status.stopped": "Arrêté", + "create.schematicannon.status.noGunpowder": "Plus de poudre à canon", + "create.schematicannon.status.targetNotLoaded": "Le bloc n'est pas chargé", "create.schematicannon.status.targetOutsideRange": "Cible trop lointaine", "create.schematicannon.status.searching": "Recherche", "create.schematicannon.status.skipping": "Saut", "create.schematicannon.status.missingBlock": "Blocs manquants:", "create.schematicannon.status.placing": "Placement", "create.schematicannon.status.clearing": "Suppression des blocs", - "create.schematicannon.status.schematicInvalid": "Schéma non valide", - "create.schematicannon.status.schematicNotPlaced": "Schéma non déployé", - "create.schematicannon.status.schematicExpired": "Fichier de schéma arrivé à expiration", + "create.schematicannon.status.schematicInvalid": "Schéma non valide", + "create.schematicannon.status.schematicNotPlaced": "Schéma non déployé", + "create.schematicannon.status.schematicExpired": "Fichier de schéma arrivé à expiration", "create.gui.filter.blacklist": "Liste noire", - "create.gui.filter.blacklist.description": "Les articles réussissent s'ils ne correspondent à AUCUN des éléments ci-dessus. Une liste noire vide accepte tout.", + "create.gui.filter.blacklist.description": "Les articles réussissent s'ils ne correspondent à AUCUN des éléments ci-dessus. Une liste noire vide accepte tout.", "create.gui.filter.whitelist": "Liste blanche", - "create.gui.filter.whitelist.description": "Les éléments réussissent s'ils correspondent à l'un des éléments ci-dessus. Une liste blanche vide rejette tout.", - "create.gui.filter.respect_data": "Respect des données", - "create.gui.filter.respect_data.description": "Les objets ne correspondent que si leur durabilité, leurs enchantements et autres attributs correspondent également.", - "create.gui.filter.ignore_data": "Ignorer les données", - "create.gui.filter.ignore_data.description": "Les éléments correspondent indépendamment de leurs attributs.", + "create.gui.filter.whitelist.description": "Les éléments réussissent s'ils correspondent à l'un des éléments ci-dessus. Une liste blanche vide rejette tout.", + "create.gui.filter.respect_data": "Respect des données", + "create.gui.filter.respect_data.description": "Les objets ne correspondent que si leur durabilité, leurs enchantements et autres attributs correspondent également.", + "create.gui.filter.ignore_data": "Ignorer les données", + "create.gui.filter.ignore_data.description": "Les éléments correspondent indépendamment de leurs attributs.", "create.item_attributes.placeable": "est placeable", -<<<<<<< HEAD - "create.item_attributes.consumable": "peut être mangé", -======= "create.item_attributes.placeable.inverted": "UNLOCALIZED: is not placeable", "create.item_attributes.consumable": "peut être mangé", "create.item_attributes.consumable.inverted": "UNLOCALIZED: cannot be eaten", ->>>>>>> mc1.15/dev "create.item_attributes.smeltable": "UNLOCALIZED: can be Smelted", "create.item_attributes.smeltable.inverted": "UNLOCALIZED: cannot be Smelted", "create.item_attributes.washable": "UNLOCALIZED: can be Washed", @@ -897,29 +824,14 @@ "create.item_attributes.crushable": "UNLOCALIZED: can be Crushed", "create.item_attributes.crushable.inverted": "UNLOCALIZED: cannot be Crushed", "create.item_attributes.blastable": "UNLOCALIZED: is smeltable in Blast Furnace", -<<<<<<< HEAD - "create.item_attributes.enchanted": "est enchanté", - "create.item_attributes.damaged": "est endommagé", -======= "create.item_attributes.blastable.inverted": "UNLOCALIZED: is not smeltable in Blast Furnace", "create.item_attributes.enchanted": "est enchanté", "create.item_attributes.enchanted.inverted": "UNLOCALIZED: is unenchanted", "create.item_attributes.damaged": "est endommagé", "create.item_attributes.damaged.inverted": "UNLOCALIZED: is not damaged", ->>>>>>> mc1.15/dev "create.item_attributes.badly_damaged": "est fortement damaged", "create.item_attributes.badly_damaged.inverted": "UNLOCALIZED: is not heavily damaged", "create.item_attributes.not_stackable": "ne peut pas s'empiler", -<<<<<<< HEAD - "create.item_attributes.equipable": "peut être équipé", - "create.item_attributes.furnace_fuel": "est du combustible", - "create.item_attributes.in_tag": "est étiqueté %1$s", - "create.item_attributes.in_item_group": "appartient à %1$s", - "create.item_attributes.added_by": "a été ajouté par %1$s", - - "create.gui.attribute_filter.no_selected_attributes": "Aucun attribut sélectionné", - "create.gui.attribute_filter.selected_attributes": "Attributs sélectionnés:", -======= "create.item_attributes.not_stackable.inverted": "UNLOCALIZED: can be stacked", "create.item_attributes.equipable": "peut être équipé", "create.item_attributes.equipable.inverted": "UNLOCALIZED: cannot be equipped", @@ -936,14 +848,13 @@ "create.gui.attribute_filter.selected_attributes": "Attributs sélectionnés:", "create.gui.attribute_filter.add_attribute": "UNLOCALIZED: Add attribute to List", "create.gui.attribute_filter.add_inverted_attribute": "UNLOCALIZED: Add opposite attribute to List", ->>>>>>> mc1.15/dev "create.gui.attribute_filter.whitelist_disjunctive": "Liste blanche (n'importe)", - "create.gui.attribute_filter.whitelist_disjunctive.description": "Les objets réussissent s'ils possèdent l'un des attributs sélectionnés.", + "create.gui.attribute_filter.whitelist_disjunctive.description": "Les objets réussissent s'ils possèdent l'un des attributs sélectionnés.", "create.gui.attribute_filter.whitelist_conjunctive": "Liste blanche (tout)", - "create.gui.attribute_filter.whitelist_conjunctive.description": "Les objets ne passent que s'ils ont TOUS les attributs sélectionnés.", + "create.gui.attribute_filter.whitelist_conjunctive.description": "Les objets ne passent que s'ils ont TOUS les attributs sélectionnés.", "create.gui.attribute_filter.blacklist": "Liste noire", - "create.gui.attribute_filter.blacklist.description": "Les éléments réussissent s'ils n'ont AUCUN des attributs sélectionnés.", - "create.gui.attribute_filter.add_reference_item": "Ajouter un objet de référence", + "create.gui.attribute_filter.blacklist.description": "Les éléments réussissent s'ils n'ont AUCUN des attributs sélectionnés.", + "create.gui.attribute_filter.add_reference_item": "Ajouter un objet de référence", "create.tooltip.holdKey": "Enfoncez [%1$s]", "create.tooltip.holdKeyOrKey": "Enfoncez [%1$s] ou [%2$s]", @@ -951,19 +862,19 @@ "create.tooltip.keyCtrl": "Ctrl", "create.tooltip.speedRequirement": "Vitesse requise: %1$s", "create.tooltip.speedRequirement.none": "Aucune", - "create.tooltip.speedRequirement.medium": "Modérée", + "create.tooltip.speedRequirement.medium": "Modérée", "create.tooltip.speedRequirement.high": "Rapide", "create.tooltip.stressImpact": "Impact du stress: %1$s", "create.tooltip.stressImpact.low": "Faible", - "create.tooltip.stressImpact.medium": "Modéré", - "create.tooltip.stressImpact.high": "Elevé", - "create.tooltip.stressImpact.overstressed": "Surmené", - "create.tooltip.capacityProvided": "Capacité de stress: %1$s", + "create.tooltip.stressImpact.medium": "Modéré", + "create.tooltip.stressImpact.high": "Elevé", + "create.tooltip.stressImpact.overstressed": "Surmené", + "create.tooltip.capacityProvided": "Capacité de stress: %1$s", "create.tooltip.capacityProvided.low": "Petite", "create.tooltip.capacityProvided.medium": "Moyenne", "create.tooltip.capacityProvided.high": "Grande", - "create.tooltip.capacityProvided.asGenerator": "(En tant que générateur)", - "create.tooltip.generationSpeed": "Génère à %1$s %2$s", + "create.tooltip.capacityProvided.asGenerator": "(En tant que générateur)", + "create.tooltip.generationSpeed": "Génère à %1$s %2$s", "create.tooltip.analogStrength": "Force analogique: %1$s/15", "create.mechanical_arm.extract_from": "UNLOCALIZED: Take items from %1$s", @@ -1001,14 +912,14 @@ "create.command.killTPSCommand.status.usage.1": "[Create]: use /killtps start to artificially slow down the server tick", "create.command.killTPSCommand.argument.tickTime": "tickTime", - "create.subtitle.schematicannon_launch_block": "Tire de schémacanon", - "create.subtitle.schematicannon_finish": "Fin de schémacanon", + "create.subtitle.schematicannon_launch_block": "Tire de schémacanon", + "create.subtitle.schematicannon_finish": "Fin de schémacanon", "create.subtitle.slime_added": "Bruit de slime", "create.subtitle.mechanical_press_activation": "Activation de la presse mechanique", - "create.subtitle.mechanical_press_item_break": "Cliquetis de métal", + "create.subtitle.mechanical_press_item_break": "Cliquetis de métal", "create.subtitle.blockzapper_place": "Blocs se zappant en place", "create.subtitle.blockzapper_confirm": "Ding d'affirmation", - "create.subtitle.blockzapper_deny": "Boop de déclin", + "create.subtitle.blockzapper_deny": "Boop de déclin", "create.subtitle.block_funnel_eat": "Croc d'entonoir", "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily", @@ -1016,49 +927,49 @@ "_": "->------------------------] Item Descriptions [------------------------<-", "item.create.example_item.tooltip": "OBJET EXEMPLE (juste une indication que cette info-bulle existe)", - "item.create.example_item.tooltip.summary": "Une brève description de l'objet. Les _underscores_ surligne les mots.", + "item.create.example_item.tooltip.summary": "Une brève description de l'objet. Les _underscores_ surligne les mots.", "item.create.example_item.tooltip.condition1": "Quand ceci", - "item.create.example_item.tooltip.behaviour1": "Donc cet objet fait ceci. (les comportements sont affichés avec shift)", + "item.create.example_item.tooltip.behaviour1": "Donc cet objet fait ceci. (les comportements sont affichés avec shift)", "item.create.example_item.tooltip.condition2": "Et quand cela", "item.create.example_item.tooltip.behaviour2": "Vous pouvez ajouter autant de comportements que vous le souhaitez", - "item.create.example_item.tooltip.control1": "Lorsque Ctrl enfoncé", - "item.create.example_item.tooltip.action1": "Ces commandes sont affichées.", + "item.create.example_item.tooltip.control1": "Lorsque Ctrl enfoncé", + "item.create.example_item.tooltip.action1": "Ces commandes sont affichées.", - "item.create.wand_of_symmetry.tooltip": "BÂTON DE SYMÉTRIE", - "item.create.wand_of_symmetry.tooltip.summary": "Reflète parfaitement le placement des blocs sur les plans configurés.", - "item.create.wand_of_symmetry.tooltip.condition1": "Lorsque positionné dans la barre active", + "item.create.wand_of_symmetry.tooltip": "BÂTON DE SYMÉTRIE", + "item.create.wand_of_symmetry.tooltip.summary": "Reflète parfaitement le placement des blocs sur les plans configurés.", + "item.create.wand_of_symmetry.tooltip.condition1": "Lorsque positionné dans la barre active", "item.create.wand_of_symmetry.tooltip.behaviour1": "Reste actif", "item.create.wand_of_symmetry.tooltip.control1": "Clic droit au sol", - "item.create.wand_of_symmetry.tooltip.action1": "_Créé_ ou _déplace_ le mirroir", + "item.create.wand_of_symmetry.tooltip.action1": "_Créé_ ou _déplace_ le mirroir", "item.create.wand_of_symmetry.tooltip.control2": "Clic droit dans les airs", "item.create.wand_of_symmetry.tooltip.action2": "_Retire_ le mirroir actif", - "item.create.wand_of_symmetry.tooltip.control3": "Clic droit en étant accroupi", + "item.create.wand_of_symmetry.tooltip.control3": "Clic droit en étant accroupi", "item.create.wand_of_symmetry.tooltip.action3": "Ouvre l'_interface_ _de_ _configuration_", "item.create.handheld_blockzapper.tooltip": "BLOCKZAPPEUR", - "item.create.handheld_blockzapper.tooltip.summary": "Nouveau gadget pour placer ou échanger des blocs à distance.", + "item.create.handheld_blockzapper.tooltip.summary": "Nouveau gadget pour placer ou échanger des blocs à distance.", "item.create.handheld_blockzapper.tooltip.control1": "Clic gauche sur un bloc", - "item.create.handheld_blockzapper.tooltip.action1": "Définit les blocs placés par l'outil sur le bloc ciblé.", + "item.create.handheld_blockzapper.tooltip.action1": "Définit les blocs placés par l'outil sur le bloc ciblé.", "item.create.handheld_blockzapper.tooltip.control2": "Clic droit sur un bloc", - "item.create.handheld_blockzapper.tooltip.action2": "_Place_ ou _remplace_ le bloc ciblé.", - "item.create.handheld_blockzapper.tooltip.control3": "Clic droit en étant accroupi", + "item.create.handheld_blockzapper.tooltip.action2": "_Place_ ou _remplace_ le bloc ciblé.", + "item.create.handheld_blockzapper.tooltip.control3": "Clic droit en étant accroupi", "item.create.handheld_blockzapper.tooltip.action3": "Ouvre l'_interface_ _de_ _configuration_.", "item.create.handheld_worldshaper.tooltip": "TERRAFORMEUR", - "item.create.handheld_worldshaper.tooltip.summary": "Outil pratique pour créer des _paysage_ et _caractéristiques_ _de_ _terrain_.", + "item.create.handheld_worldshaper.tooltip.summary": "Outil pratique pour créer des _paysage_ et _caractéristiques_ _de_ _terrain_.", "item.create.handheld_worldshaper.tooltip.control1": "Clic gauche sur un bloc", - "item.create.handheld_worldshaper.tooltip.action1": "Définit les blocs placés par l'outil sur le bloc ciblé.", + "item.create.handheld_worldshaper.tooltip.action1": "Définit les blocs placés par l'outil sur le bloc ciblé.", "item.create.handheld_worldshaper.tooltip.control2": "Clic droit sur un bloc", - "item.create.handheld_worldshaper.tooltip.action2": "Applique le _pinceau_ et l'_outil_ actuellement sélectionnés à l'emplacement ciblé.", - "item.create.handheld_worldshaper.tooltip.control3": "Clic droit en étant accroupi", + "item.create.handheld_worldshaper.tooltip.action2": "Applique le _pinceau_ et l'_outil_ actuellement sélectionnés à l'emplacement ciblé.", + "item.create.handheld_worldshaper.tooltip.control3": "Clic droit en étant accroupi", "item.create.handheld_worldshaper.tooltip.action3": "Ouvre l'_interface_ _de_ _configuration_", "item.create.tree_fertilizer.tooltip": "ENGRAIS POUR ARBRE", - "item.create.tree_fertilizer.tooltip.summary": "Une puissante combinaison de minéraux adaptée pour accélérer la croissance des types d'arbres communs.", - "item.create.tree_fertilizer.tooltip.condition1": "Lorsqu'utilisé sur une pousse d'arbre", - "item.create.tree_fertilizer.tooltip.behaviour1": "Fait pousser des arbres _indépendamment_ de leurs _conditions_ _d'emplacement_", + "item.create.tree_fertilizer.tooltip.summary": "Une puissante combinaison de minéraux adaptée pour accélérer la croissance des types d'arbres communs.", + "item.create.tree_fertilizer.tooltip.condition1": "Lorsqu'utilisé sur une pousse d'arbre", + "item.create.tree_fertilizer.tooltip.behaviour1": "Fait pousser des arbres _indépendamment_ de leurs _conditions_ _d'emplacement_", - "item.create.deforester.tooltip": "DÉFORESTEUR", + "item.create.deforester.tooltip": "DÉFORESTEUR", "item.create.deforester.tooltip.summary": "Une _hache_ _rayonnante_ capable d'abattre des arbres en une fraction de seconde.", "item.create.extendo_grip.tooltip": "UNLOCALIZED: EXTENDO GRIP", @@ -1067,141 +978,141 @@ "item.create.extendo_grip.tooltip.behaviour1": "UNLOCALIZED: Increases _reach_ _distance_ of items used in the _Main-Hand_.", "item.create.filter.tooltip": "FILTRE", - "item.create.filter.tooltip.summary": "_Contrôle_ les _sorties_ et _entrées_ de dispositifs logistiques avec plus de _précision_, en les comparant à un _ensemble_ _d'objets_ ou à plusieurs _filtres_ _imbriqués_.", + "item.create.filter.tooltip.summary": "_Contrôle_ les _sorties_ et _entrées_ de dispositifs logistiques avec plus de _précision_, en les comparant à un _ensemble_ _d'objets_ ou à plusieurs _filtres_ _imbriqués_.", "item.create.filter.tooltip.condition1": "Lorsque dans l'emplacement de filtre", - "item.create.filter.tooltip.behaviour1": "_Contrôle_ le flux d'object selon sa _configuration_.", + "item.create.filter.tooltip.behaviour1": "_Contrôle_ le flux d'object selon sa _configuration_.", "item.create.filter.tooltip.condition2": "Clic droit", "item.create.filter.tooltip.behaviour2": "Ouvre l'_interface_ _de_ _configuration_.", "item.create.attribute_filter.tooltip": "FILTRE D'ATTRIBUTS", - "item.create.attribute_filter.tooltip.summary": "_Contrôle_ les _sorties_ et les _entrées_ de dispositifs logistiques avec plus de _précision_, en les comparant à un _ensemble_ _d'objets_ ou à plusieurs _filtres_ _imbriqués_.", + "item.create.attribute_filter.tooltip.summary": "_Contrôle_ les _sorties_ et les _entrées_ de dispositifs logistiques avec plus de _précision_, en les comparant à un _ensemble_ _d'objets_ ou à plusieurs _filtres_ _imbriqués_.", "item.create.attribute_filter.tooltip.condition1": "Lorsque dans l'emplacement de filtre", - "item.create.attribute_filter.tooltip.behaviour1": "_Contrôle_ le flux d'object selon sa _configuration_.", + "item.create.attribute_filter.tooltip.behaviour1": "_Contrôle_ le flux d'object selon sa _configuration_.", "item.create.attribute_filter.tooltip.condition2": "Clic droit", "item.create.attribute_filter.tooltip.behaviour2": "Ouvre l'_interface_ _de_ _configuration_.", - "item.create.empty_schematic.tooltip": "SCHÉMA VIDE", - "item.create.empty_schematic.tooltip.summary": "Utilisé comme ingrédient de recette et pour écrire à la _table_ _à_ _schéma_.", + "item.create.empty_schematic.tooltip": "SCHÉMA VIDE", + "item.create.empty_schematic.tooltip.summary": "Utilisé comme ingrédient de recette et pour écrire à la _table_ _à_ _schéma_.", - "item.create.schematic.tooltip": "SCHÉMA", - "item.create.schematic.tooltip.summary": "Contient une structure à positionner et à placer dans le monde. Positionnez l'hologramme comme vous le souhaitez et utilisez un _schémacanon_ pour le construire.", + "item.create.schematic.tooltip": "SCHÉMA", + "item.create.schematic.tooltip.summary": "Contient une structure à positionner et à placer dans le monde. Positionnez l'hologramme comme vous le souhaitez et utilisez un _schémacanon_ pour le construire.", "item.create.schematic.tooltip.condition1": "Lorsque tenu en main", - "item.create.schematic.tooltip.behaviour1": "Peut être positionné à l'aide des outils à l'écran.", - "item.create.schematic.tooltip.control1": "Clic droit en étant accroupi", - "item.create.schematic.tooltip.action1": "Ouvre une _interface_ pour rentrer les _coordonées_ correctes.", + "item.create.schematic.tooltip.behaviour1": "Peut être positionné à l'aide des outils à l'écran.", + "item.create.schematic.tooltip.control1": "Clic droit en étant accroupi", + "item.create.schematic.tooltip.action1": "Ouvre une _interface_ pour rentrer les _coordonées_ correctes.", - "item.create.schematic_and_quill.tooltip": "SCHÉMA ET PLUME", - "item.create.schematic_and_quill.tooltip.summary": "Utilisé pour enregistrer une structure de votre monde dans un fichier .nbt.", - "item.create.schematic_and_quill.tooltip.condition1": "Étape 1", - "item.create.schematic_and_quill.tooltip.behaviour1": "Sélectionnez deux points d'angle à l'aide du clic droit.", - "item.create.schematic_and_quill.tooltip.condition2": "Étape 2", - "item.create.schematic_and_quill.tooltip.behaviour2": "_Ctrl-Défilement_ sur les faces pour ajuster la taille. Cliquez à nouveau pour enregistrer.", + "item.create.schematic_and_quill.tooltip": "SCHÉMA ET PLUME", + "item.create.schematic_and_quill.tooltip.summary": "Utilisé pour enregistrer une structure de votre monde dans un fichier .nbt.", + "item.create.schematic_and_quill.tooltip.condition1": "Étape 1", + "item.create.schematic_and_quill.tooltip.behaviour1": "Sélectionnez deux points d'angle à l'aide du clic droit.", + "item.create.schematic_and_quill.tooltip.condition2": "Étape 2", + "item.create.schematic_and_quill.tooltip.behaviour2": "_Ctrl-Défilement_ sur les faces pour ajuster la taille. Cliquez à nouveau pour enregistrer.", "item.create.schematic_and_quill.tooltip.control1": "Clic droit", - "item.create.schematic_and_quill.tooltip.action1": "Sélectionnez un point d'angle / confirmez la sauvegarde.", + "item.create.schematic_and_quill.tooltip.action1": "Sélectionnez un point d'angle / confirmez la sauvegarde.", "item.create.schematic_and_quill.tooltip.control2": "Ctrl maintenu", - "item.create.schematic_and_quill.tooltip.action2": "Sélectionnez des points _dans_ _les_ _airs_. Faites défiler pour régler la distance.", - "item.create.schematic_and_quill.tooltip.control3": "Clic droit en étant accroupi", - "item.create.schematic_and_quill.tooltip.action3": "_Réinitialise_ et supprime la sélection.", + "item.create.schematic_and_quill.tooltip.action2": "Sélectionnez des points _dans_ _les_ _airs_. Faites défiler pour régler la distance.", + "item.create.schematic_and_quill.tooltip.control3": "Clic droit en étant accroupi", + "item.create.schematic_and_quill.tooltip.action3": "_Réinitialise_ et supprime la sélection.", - "block.create.schematicannon.tooltip": "SCHÉMACANON", - "block.create.schematicannon.tooltip.summary": "Tire des blocs pour recréer un _schéma_ déployé dans le monde. Utilise des objets des inventaires adjacents et de la _poudre_ _à_ _canon_ comme carburant.", + "block.create.schematicannon.tooltip": "SCHÉMACANON", + "block.create.schematicannon.tooltip.summary": "Tire des blocs pour recréer un _schéma_ déployé dans le monde. Utilise des objets des inventaires adjacents et de la _poudre_ _à_ _canon_ comme carburant.", "block.create.schematicannon.tooltip.control1": "Clic droit", "block.create.schematicannon.tooltip.action1": "Ouvre l'_Interface_", - "block.create.schematic_table.tooltip": "TABLE À SCHÉMA", - "block.create.schematic_table.tooltip.summary": "Écrit les schémas enregistrés dans un _schéma_ _vide_.", - "block.create.schematic_table.tooltip.condition1": "Lorsque donné un schéma vide", - "block.create.schematic_table.tooltip.behaviour1": "Télécharge un fichier choisi à partir de votre dossier de schémas.", + "block.create.schematic_table.tooltip": "TABLE À SCHÉMA", + "block.create.schematic_table.tooltip.summary": "Écrit les schémas enregistrés dans un _schéma_ _vide_.", + "block.create.schematic_table.tooltip.condition1": "Lorsque donné un schéma vide", + "block.create.schematic_table.tooltip.behaviour1": "Télécharge un fichier choisi à partir de votre dossier de schémas.", - "block.create.shaft.tooltip": "ARBRE MÉCANIQUE", + "block.create.shaft.tooltip": "ARBRE MÉCANIQUE", "block.create.shaft.tooltip.summary": "_Relais_ la _rotation_ en ligne droite.", - "block.create.cogwheel.tooltip": "ROUE DENTÉE", - "block.create.cogwheel.tooltip.summary": "_Relais_ la _rotation_ en ligne droite, et aux _roues_ _dentées_ adjacentes.", + "block.create.cogwheel.tooltip": "ROUE DENTÉE", + "block.create.cogwheel.tooltip.summary": "_Relais_ la _rotation_ en ligne droite, et aux _roues_ _dentées_ adjacentes.", - "block.create.large_cogwheel.tooltip": "GRANDE ROUE DENTÉE", - "block.create.large_cogwheel.tooltip.summary": "Une version plus grande de la _roue_ _dentée_, permettant des _changements_ dans la _vitesse_ _de_ _rotation_ lorsqu'il est connecté à son homologue plus petit.", + "block.create.large_cogwheel.tooltip": "GRANDE ROUE DENTÉE", + "block.create.large_cogwheel.tooltip.summary": "Une version plus grande de la _roue_ _dentée_, permettant des _changements_ dans la _vitesse_ _de_ _rotation_ lorsqu'il est connecté à son homologue plus petit.", - "block.create.encased_shaft.tooltip": "ARBRE MÉCANIQUE ENBOÃŽTÉ", - "block.create.encased_shaft.tooltip.summary": "_Relais_ la _rotation_ en ligne droite. Convient pour propager la rotation à travers les murs.", + "block.create.encased_shaft.tooltip": "ARBRE MÉCANIQUE ENBOÎTÉ", + "block.create.encased_shaft.tooltip.summary": "_Relais_ la _rotation_ en ligne droite. Convient pour propager la rotation à travers les murs.", - "block.create.gearbox.tooltip": "BOÃŽTE DE VITESSES", + "block.create.gearbox.tooltip": "BOÎTE DE VITESSES", "block.create.gearbox.tooltip.summary": "_Relais_ la _rotation_ dans _quatre_ _directions_. Inverse les connexions directes.", "item.create.vertical_gearbox.tooltip": "UNLOCALIZED: VERTICAL GEARBOX", "item.create.vertical_gearbox.tooltip.summary": "UNLOCALIZED: _Relays_ _Rotation_ in _four_ _directions_ Reverses straight connections.", - "block.create.gearshift.tooltip": "DÉCALEUR DE ROTATION", - "block.create.gearshift.tooltip.summary": "Une commande pour basculer le sens de rotation des arbres connectés.", - "block.create.gearshift.tooltip.condition1": "Lorsqu'alimenté", + "block.create.gearshift.tooltip": "DÉCALEUR DE ROTATION", + "block.create.gearshift.tooltip.summary": "Une commande pour basculer le sens de rotation des arbres connectés.", + "block.create.gearshift.tooltip.condition1": "Lorsqu'alimenté", "block.create.gearshift.tooltip.behaviour1": "_Inverse_ la rotation sortante.", "block.create.clutch.tooltip": "EMBRAYAGE", - "block.create.clutch.tooltip.summary": "Une commande pour engager / désengager la rotation des arbres connectés.", - "block.create.clutch.tooltip.condition1": "Lorsqu'alimenté", - "block.create.clutch.tooltip.behaviour1": "_Arrête_ de transmettre la rotation de l'autre côté.", + "block.create.clutch.tooltip.summary": "Une commande pour engager / désengager la rotation des arbres connectés.", + "block.create.clutch.tooltip.condition1": "Lorsqu'alimenté", + "block.create.clutch.tooltip.behaviour1": "_Arrête_ de transmettre la rotation de l'autre côté.", - "block.create.encased_belt.tooltip": "TAPIS ROULANT ENFERMÉ", - "block.create.encased_belt.tooltip.summary": "_Relais_ la _rotation_ à travers son bloc et aux _tapis_ _roulants_ _enfermés_ attachés.", - "block.create.encased_belt.tooltip.condition1": "Lorsque connecté", - "block.create.encased_belt.tooltip.behaviour1": "Les blocs attachés auront la _même_ _vitesse_ _de_ _rotation_ et direction. Ils n'ont pas besoin de regarder dans la même direction.", + "block.create.encased_belt.tooltip": "TAPIS ROULANT ENFERMÉ", + "block.create.encased_belt.tooltip.summary": "_Relais_ la _rotation_ à travers son bloc et aux _tapis_ _roulants_ _enfermés_ attachés.", + "block.create.encased_belt.tooltip.condition1": "Lorsque connecté", + "block.create.encased_belt.tooltip.behaviour1": "Les blocs attachés auront la _même_ _vitesse_ _de_ _rotation_ et direction. Ils n'ont pas besoin de regarder dans la même direction.", "block.create.adjustable_pulley.tooltip": "POULIE DE TAPIS ROULANT ANALOGIQUE", - "block.create.adjustable_pulley.tooltip.summary": "_Relais_ la _rotation_ à travers son bloc et aux _tapis_ _roulants_ _enfermés_ attachés. Les _tapis_ _roulants_ _enfermés_ attachés _tourneront_ _plus_ _vite_ en fonction du _signal_ _de_ _redstone_ _analogique_ que ce bloc reçoit.", - "block.create.adjustable_pulley.tooltip.condition1": "Contrôle Redstone", - "block.create.adjustable_pulley.tooltip.behaviour1": "Sans signal, il ne va pas _accélérer_ les tapis roulants connectées. Avec un tapis roulant connectée au signal de pleine puissance, vitesse _doublées_.", + "block.create.adjustable_pulley.tooltip.summary": "_Relais_ la _rotation_ à travers son bloc et aux _tapis_ _roulants_ _enfermés_ attachés. Les _tapis_ _roulants_ _enfermés_ attachés _tourneront_ _plus_ _vite_ en fonction du _signal_ _de_ _redstone_ _analogique_ que ce bloc reçoit.", + "block.create.adjustable_pulley.tooltip.condition1": "Contrôle Redstone", + "block.create.adjustable_pulley.tooltip.behaviour1": "Sans signal, il ne va pas _accélérer_ les tapis roulants connectées. Avec un tapis roulant connectée au signal de pleine puissance, vitesse _doublées_.", "item.create.belt_connector.tooltip": "CONNECTEUR DE TAPIS ROULANTS", - "item.create.belt_connector.tooltip.summary": "Connecte deux _arbres_ ou plus à un _tapis_ _roulant_ _mécanique_. Les arbres connectés auront exactement la même vitesse et le même sens de rotation. La ceinture peut agir comme un _convoyeur_ pour _objets_ et _entités_.", + "item.create.belt_connector.tooltip.summary": "Connecte deux _arbres_ ou plus à un _tapis_ _roulant_ _mécanique_. Les arbres connectés auront exactement la même vitesse et le même sens de rotation. La ceinture peut agir comme un _convoyeur_ pour _objets_ et _entités_.", "item.create.belt_connector.tooltip.control1": "Clic droit sur arbre", - "item.create.belt_connector.tooltip.action1": "Sélectionne l'arbre comme une poulie de la courroie. Les deux arbres sélectionnés doivent être _alignés_ soit _verticalement_, _horizontalement_, ou _diagonalement_ en direction de la courroie.", - "item.create.belt_connector.tooltip.control2": "Clic droit en étant accroupi", - "item.create.belt_connector.tooltip.action2": "_Réinitialise_ la première position sélectionnée pour le tapis roulant.", + "item.create.belt_connector.tooltip.action1": "Sélectionne l'arbre comme une poulie de la courroie. Les deux arbres sélectionnés doivent être _alignés_ soit _verticalement_, _horizontalement_, ou _diagonalement_ en direction de la courroie.", + "item.create.belt_connector.tooltip.control2": "Clic droit en étant accroupi", + "item.create.belt_connector.tooltip.action2": "_Réinitialise_ la première position sélectionnée pour le tapis roulant.", "item.create.goggles.tooltip": "LUNETTES", - "item.create.goggles.tooltip.summary": "Une paire de lunettes pour augmenter votre vision avec des _informations_ _kinétiques_ utiles.", - "item.create.goggles.tooltip.condition1": "Lorsque portées", - "item.create.goggles.tooltip.behaviour1": "Affiche des _indicateurs_ _colorés_ correspondants au _niveau_ _de_ _vitesse_ d'un composant cinétique placé ainsi que _l'impact_ du _stress_ et la _capacité_ des composants individuels.", - "item.create.goggles.tooltip.condition2": "Lorsque vision portée sur une jauge", - "item.create.goggles.tooltip.behaviour2": "Affiche des informations détaillées sur la _vitesse_ ou le _stress_ du réseau auquel la jauge est connectée.", + "item.create.goggles.tooltip.summary": "Une paire de lunettes pour augmenter votre vision avec des _informations_ _kinétiques_ utiles.", + "item.create.goggles.tooltip.condition1": "Lorsque portées", + "item.create.goggles.tooltip.behaviour1": "Affiche des _indicateurs_ _colorés_ correspondants au _niveau_ _de_ _vitesse_ d'un composant cinétique placé ainsi que _l'impact_ du _stress_ et la _capacité_ des composants individuels.", + "item.create.goggles.tooltip.condition2": "Lorsque vision portée sur une jauge", + "item.create.goggles.tooltip.behaviour2": "Affiche des informations détaillées sur la _vitesse_ ou le _stress_ du réseau auquel la jauge est connectée.", - "item.create.wrench.tooltip": "CLÉ", - "item.create.wrench.tooltip.summary": "Un outil utile pour travailler sur les engins cinétiques. Peut être utilisé pour _tourner_, _démonter_ et _configurer_ les composants.", + "item.create.wrench.tooltip": "CLÉ", + "item.create.wrench.tooltip.summary": "Un outil utile pour travailler sur les engins cinétiques. Peut être utilisé pour _tourner_, _démonter_ et _configurer_ les composants.", "item.create.wrench.tooltip.control1": "Clic droit a kinetic block", "item.create.wrench.tooltip.action1": "_Tourne_ les _composents_ proche ou loin de la face avec lequel vous avez interagi.", - "item.create.wrench.tooltip.control2": "Clic droit en étant accroupi", - "item.create.wrench.tooltip.action2": "_Démonte_ les _composants_ _cinétiques_ et les replace dans _votre_ _inventaire_.", + "item.create.wrench.tooltip.control2": "Clic droit en étant accroupi", + "item.create.wrench.tooltip.action2": "_Démonte_ les _composants_ _cinétiques_ et les replace dans _votre_ _inventaire_.", - "block.create.creative_motor.tooltip": "MOTEUR CRÉATIF", + "block.create.creative_motor.tooltip": "MOTEUR CRÉATIF", "block.create.creative_motor.tooltip.summary": "Une source configurable de _force_ _de_ _rotation_.", - "block.create.water_wheel.tooltip": "ROUE À EAU", + "block.create.water_wheel.tooltip": "ROUE À EAU", "block.create.water_wheel.tooltip.summary": "Fournit une _force_ _de_ _rotation_ provenant de _courants_ _d'eau_ adjacents.", - "block.create.encased_fan.tooltip": "VENTILATEUR ENFERMÉ", - "block.create.encased_fan.tooltip.summary": "Convertit _force_ _de_ _rotation_ en _courants_ _d'air_ et inversement. A une variété d'utilisations.", - "block.create.encased_fan.tooltip.condition1": "Lorsqu'alimenté par de la redstone", - "block.create.encased_fan.tooltip.behaviour1": "Fournit _force_ _de_ _rotation_ à partir de toute _source_ _de_ _chaleur_ immédiatement en dessous de lui. Le ventilateur doit être tourné vers le bas.", - "block.create.encased_fan.tooltip.condition2": "Lorsque tourné", - "block.create.encased_fan.tooltip.behaviour2": "_Pousse_ ou _tire_ les entités, selon la vitesse de rotation entrante.", - "block.create.encased_fan.tooltip.condition3": "Lorsque souffle à travers des blocs spéciaux", - "block.create.encased_fan.tooltip.behaviour3": "Des particules de _liquides_ et de _feu_ sont émises dans le flux d'air. Cela peut être utilisé pour _traiter_ des _objets_.", + "block.create.encased_fan.tooltip": "VENTILATEUR ENFERMÉ", + "block.create.encased_fan.tooltip.summary": "Convertit _force_ _de_ _rotation_ en _courants_ _d'air_ et inversement. A une variété d'utilisations.", + "block.create.encased_fan.tooltip.condition1": "Lorsqu'alimenté par de la redstone", + "block.create.encased_fan.tooltip.behaviour1": "Fournit _force_ _de_ _rotation_ à partir de toute _source_ _de_ _chaleur_ immédiatement en dessous de lui. Le ventilateur doit être tourné vers le bas.", + "block.create.encased_fan.tooltip.condition2": "Lorsque tourné", + "block.create.encased_fan.tooltip.behaviour2": "_Pousse_ ou _tire_ les entités, selon la vitesse de rotation entrante.", + "block.create.encased_fan.tooltip.condition3": "Lorsque souffle à travers des blocs spéciaux", + "block.create.encased_fan.tooltip.behaviour3": "Des particules de _liquides_ et de _feu_ sont émises dans le flux d'air. Cela peut être utilisé pour _traiter_ des _objets_.", "block.create.nozzle.tooltip": "BUSE", - "block.create.nozzle.tooltip.summary": "Attachez-le à l'avant d'un _ventilateur_ _enfermé_ pour répartir son effet sur les entités dans _toutes_ les _directions_.", + "block.create.nozzle.tooltip.summary": "Attachez-le à l'avant d'un _ventilateur_ _enfermé_ pour répartir son effet sur les entités dans _toutes_ les _directions_.", "block.create.hand_crank.tooltip": "MANIVELLE", - "block.create.hand_crank.tooltip.summary": "Une simple _source_ de _force_ _de_ _rotation_ qui nécessite l'interaction des joueurs.", - "block.create.hand_crank.tooltip.condition1": "Lorsqu'utilisé", - "block.create.hand_crank.tooltip.behaviour1": "Fournit des _force_ _de_ _rotation_ à un objet attaché. _S'accroupir_ _pour_ _inverser_ la rotation.", + "block.create.hand_crank.tooltip.summary": "Une simple _source_ de _force_ _de_ _rotation_ qui nécessite l'interaction des joueurs.", + "block.create.hand_crank.tooltip.condition1": "Lorsqu'utilisé", + "block.create.hand_crank.tooltip.behaviour1": "Fournit des _force_ _de_ _rotation_ à un objet attaché. _S'accroupir_ _pour_ _inverser_ la rotation.", "block.create.cuckoo_clock.tooltip": "COUCOU", - "block.create.cuckoo_clock.tooltip.summary": "Un bel artisanat pour _décorer_ un espace et _garder_ la _notion_ _du_ _temps_.", - "block.create.cuckoo_clock.tooltip.condition1": "Lorsque tourné", - "block.create.cuckoo_clock.tooltip.behaviour1": "Affiche le _temps_ _présent_ et joue une mélodie deux fois par jour. _S'active_ une fois le _midi_ et une fois au crépuscule, dès que les _joueurs_ _peuvent_ _dormir_.", + "block.create.cuckoo_clock.tooltip.summary": "Un bel artisanat pour _décorer_ un espace et _garder_ la _notion_ _du_ _temps_.", + "block.create.cuckoo_clock.tooltip.condition1": "Lorsque tourné", + "block.create.cuckoo_clock.tooltip.behaviour1": "Affiche le _temps_ _présent_ et joue une mélodie deux fois par jour. _S'active_ une fois le _midi_ et une fois au crépuscule, dès que les _joueurs_ _peuvent_ _dormir_.", "block.create.turntable.tooltip": "PLAQUE TOURNANTE", - "block.create.turntable.tooltip.summary": "Transforme la _force_ _de_ _rotation_ en une nausée.", + "block.create.turntable.tooltip.summary": "Transforme la _force_ _de_ _rotation_ en une nausée.", "block.create.millstone.tooltip": "UNLOCALIZED: MILLSTONE", "block.create.millstone.tooltip.summary": "UNLOCALIZED: A kinetic component suitable for _grinding_ inserted _materials_. Can be powered by an adjacent cogwheel or by connecting to the shaft at the bottom. Results have to be extracted from the component.", @@ -1212,20 +1123,20 @@ "block.create.crushing_wheel.tooltip": "ROUE DE CONCASSAGE", "block.create.crushing_wheel.tooltip.summary": "Grandes roues rotatives qui _cassent_ n'importe quoi.", - "block.create.crushing_wheel.tooltip.condition1": "Lorsque fixé à une autre roue de concassage", - "block.create.crushing_wheel.tooltip.behaviour1": "Forme une machine de concassage pour traiter une variété de choses. Les dents des roues doivent se connecter et se déplacer avec la _même_ _vitesse_ dans des _directions_ _opposées_.", + "block.create.crushing_wheel.tooltip.condition1": "Lorsque fixé à une autre roue de concassage", + "block.create.crushing_wheel.tooltip.behaviour1": "Forme une machine de concassage pour traiter une variété de choses. Les dents des roues doivent se connecter et se déplacer avec la _même_ _vitesse_ dans des _directions_ _opposées_.", - "block.create.mechanical_press.tooltip": "PRESSE MÉCANIQUE", - "block.create.mechanical_press.tooltip.summary": "Un piston puissant pour comprimer les objets en dessous. Nécessite une _force_ _de_ _rotation_ constante.", - "block.create.mechanical_press.tooltip.condition1": "Lorsqu'alimenté par de la redstone", - "block.create.mechanical_press.tooltip.behaviour1": "_Démarre_ pour compresser les éléments déposés en dessous.", - "block.create.mechanical_press.tooltip.condition2": "Lorsqu'au-dessus d'un tapis roulant mécanique", - "block.create.mechanical_press.tooltip.behaviour2": "Compresse _Automatiquement_ les éléments passant sur le tapis roulant.", + "block.create.mechanical_press.tooltip": "PRESSE MÉCANIQUE", + "block.create.mechanical_press.tooltip.summary": "Un piston puissant pour comprimer les objets en dessous. Nécessite une _force_ _de_ _rotation_ constante.", + "block.create.mechanical_press.tooltip.condition1": "Lorsqu'alimenté par de la redstone", + "block.create.mechanical_press.tooltip.behaviour1": "_Démarre_ pour compresser les éléments déposés en dessous.", + "block.create.mechanical_press.tooltip.condition2": "Lorsqu'au-dessus d'un tapis roulant mécanique", + "block.create.mechanical_press.tooltip.behaviour2": "Compresse _Automatiquement_ les éléments passant sur le tapis roulant.", "block.create.mechanical_press.tooltip.condition3": "UNLOCALIZED: When above Basin", "block.create.mechanical_press.tooltip.behaviour3": "UNLOCALIZED: Starts to _compact_ _items_ in the basin whenever all necessary ingredients are present.", "block.create.basin.tooltip": "BASSIN", - "block.create.basin.tooltip.summary": "Un _objet_ _conteneur_ pratique utilisé dans le traitement avec le _mixeur_ _mécanique_ et la _presse_ _mecanique_. Prend en charge les _comparateur_ _de_ _redstone_.", + "block.create.basin.tooltip.summary": "Un _objet_ _conteneur_ pratique utilisé dans le traitement avec le _mixeur_ _mécanique_ et la _presse_ _mecanique_. Prend en charge les _comparateur_ _de_ _redstone_.", "block.create.blaze_heater.tooltip": "UNLOCALIZED: BLAZE HEATER", "block.create.blaze_heater.tooltip.summary": "UNLOCALIZED: A block to heat a basin when housing a tamed blaze.", @@ -1239,82 +1150,82 @@ "block.create.reinforced_rail.tooltip": "UNLOCALIZED: REINFORCED RAIL", "block.create.reinforced_rail.tooltip.summary": "UNLOCALIZED: A timber stabilized rail, _does_ _not_ _need_ _supports_.", - "block.create.mechanical_mixer.tooltip": "MIXEUR MÉCANIQUE", - "block.create.mechanical_mixer.tooltip.summary": "Un fouet cinétique pour appliquer toutes les recettes d'artisanat informes aux objets en dessous. Nécessite une _force_ _de_ _rotation_ constant et un _bassin_ placé en dessous (avec un espace entre les deux).", + "block.create.mechanical_mixer.tooltip": "MIXEUR MÉCANIQUE", + "block.create.mechanical_mixer.tooltip.summary": "Un fouet cinétique pour appliquer toutes les recettes d'artisanat informes aux objets en dessous. Nécessite une _force_ _de_ _rotation_ constant et un _bassin_ placé en dessous (avec un espace entre les deux).", "block.create.mechanical_mixer.tooltip.condition1": "Lorsqu'au-dessus d'un bassin", - "block.create.mechanical_mixer.tooltip.behaviour1": "Commence à mélanger les objets dans le bassin lorsque tous les ingrédients nécessaires sont présents.", - "block.create.mechanical_mixer.tooltip.condition2": "Lorsqu'utilisé avec une clé", - "block.create.mechanical_mixer.tooltip.behaviour2": "_Configure_ la quantité minimale du _total_ _d'ingredients_ pour les recettes appliquées. Utilisez cette option pour _exclure_ les _recettes_ _indésirables_ avec des ingrédients similaires mais moins.", + "block.create.mechanical_mixer.tooltip.behaviour1": "Commence à mélanger les objets dans le bassin lorsque tous les ingrédients nécessaires sont présents.", + "block.create.mechanical_mixer.tooltip.condition2": "Lorsqu'utilisé avec une clé", + "block.create.mechanical_mixer.tooltip.behaviour2": "_Configure_ la quantité minimale du _total_ _d'ingredients_ pour les recettes appliquées. Utilisez cette option pour _exclure_ les _recettes_ _indésirables_ avec des ingrédients similaires mais moins.", - "block.create.mechanical_crafter.tooltip": "ÉTABLI MÉCANIQUE", - "block.create.mechanical_crafter.tooltip.summary": "Un assembleur cinétique pour _automatiser_ n'importe quelle recette _en_ _forme_. Placez-en _plusieurs_ _dans_ _une_ _grille_ correspondant à votre recette, et _arrangez_ _leurs_ _tapis_ _roulant_ pour créer un _flux_ qui sort de la grille sur l'un des établis.", - "block.create.mechanical_crafter.tooltip.condition1": "Lorsque tourné", - "block.create.mechanical_crafter.tooltip.behaviour1": "_Démarre_ _le_ _processus_ _d'artisanat_ dès que _tous_ les _établis_ dans la grille ont _reçu_ _un_ _objet_.", + "block.create.mechanical_crafter.tooltip": "ÉTABLI MÉCANIQUE", + "block.create.mechanical_crafter.tooltip.summary": "Un assembleur cinétique pour _automatiser_ n'importe quelle recette _en_ _forme_. Placez-en _plusieurs_ _dans_ _une_ _grille_ correspondant à votre recette, et _arrangez_ _leurs_ _tapis_ _roulant_ pour créer un _flux_ qui sort de la grille sur l'un des établis.", + "block.create.mechanical_crafter.tooltip.condition1": "Lorsque tourné", + "block.create.mechanical_crafter.tooltip.behaviour1": "_Démarre_ _le_ _processus_ _d'artisanat_ dès que _tous_ les _établis_ dans la grille ont _reçu_ _un_ _objet_.", "block.create.mechanical_crafter.tooltip.condition2": "UNLOCALIZED: On Redstone Pulse", "block.create.mechanical_crafter.tooltip.behaviour2": "UNLOCALIZED: _Forces_ the start of the _crafting_ _process_ with all currently given _items_ in the grid.", - "block.create.mechanical_crafter.tooltip.control1": "Lorsqu'utilisation de la clé à l'avant", - "block.create.mechanical_crafter.tooltip.action1": "_Fait_ _défiler_ _la_ _direction_ dans laquelle un établi individuel _déplace_ _ses_ _objets_. Pour former une grille de travail, disposer les _tapis_ _roulants_ _dans_ _un_ _flux_ qui déplace tous les articles vers un établi final. Le dernier artisan doit _pointer_ _autrepart_ de la grille.", - "block.create.mechanical_crafter.tooltip.control2": "Lorsqu'utilisation de la clé à l'arrière", - "block.create.mechanical_crafter.tooltip.action2": "_Connecte_ _l'inventaire_ _d'entrée_ des établis adjacents. Utilisez ceci pour _combiner_ les _emplacements_ dans la grille de fabrication et pour _économiser_ _sur_ _le_ _travail_ _d'entrée_.", + "block.create.mechanical_crafter.tooltip.control1": "Lorsqu'utilisation de la clé à l'avant", + "block.create.mechanical_crafter.tooltip.action1": "_Fait_ _défiler_ _la_ _direction_ dans laquelle un établi individuel _déplace_ _ses_ _objets_. Pour former une grille de travail, disposer les _tapis_ _roulants_ _dans_ _un_ _flux_ qui déplace tous les articles vers un établi final. Le dernier artisan doit _pointer_ _autrepart_ de la grille.", + "block.create.mechanical_crafter.tooltip.control2": "Lorsqu'utilisation de la clé à l'arrière", + "block.create.mechanical_crafter.tooltip.action2": "_Connecte_ _l'inventaire_ _d'entrée_ des établis adjacents. Utilisez ceci pour _combiner_ les _emplacements_ dans la grille de fabrication et pour _économiser_ _sur_ _le_ _travail_ _d'entrée_.", "block.create.furnace_engine.tooltip": "MOTEUR DE FOUR", - "block.create.furnace_engine.tooltip.summary": "Une source puissante de _puissance_ _de_ _rotation_ qui nécessite un _four_ _allumé_ pour fonctionner.", - "block.create.furnace_engine.tooltip.condition1": "Lorsqu'attaché à un four allumé", - "block.create.furnace_engine.tooltip.behaviour1": "_Commence_ _à_ _alimenter_ un _volant_ _d'inertie_ placé devant (à 1m de distance). Utilisez un haut fourneau pour des vitesses plus élevées.", + "block.create.furnace_engine.tooltip.summary": "Une source puissante de _puissance_ _de_ _rotation_ qui nécessite un _four_ _allumé_ pour fonctionner.", + "block.create.furnace_engine.tooltip.condition1": "Lorsqu'attaché à un four allumé", + "block.create.furnace_engine.tooltip.behaviour1": "_Commence_ _à_ _alimenter_ un _volant_ _d'inertie_ placé devant (à 1m de distance). Utilisez un haut fourneau pour des vitesses plus élevées.", "block.create.flywheel.tooltip": "VOLANT D'INERTIE", - "block.create.flywheel.tooltip.summary": "Une grande roue métallique pour _exploiter_ _et_ _stabiliser_ la force générée par un _moteur_ _attaché_. Les volants d'inertie se connectent aux moteurs s'ils sont séparés _d'un_ _mètre_ et tournés à un _angle_ de _90°_ les uns des autres.", - "block.create.flywheel.tooltip.condition1": "Lorsqu'attaché à un moteur en marche", - "block.create.flywheel.tooltip.behaviour1": "Fournit une _force_ _de_ rotation_ à un engin connecté basé sur la force et la vitesse du générateur.", + "block.create.flywheel.tooltip.summary": "Une grande roue métallique pour _exploiter_ _et_ _stabiliser_ la force générée par un _moteur_ _attaché_. Les volants d'inertie se connectent aux moteurs s'ils sont séparés _d'un_ _mètre_ et tournés à un _angle_ de _90°_ les uns des autres.", + "block.create.flywheel.tooltip.condition1": "Lorsqu'attaché à un moteur en marche", + "block.create.flywheel.tooltip.behaviour1": "Fournit une _force_ _de_ rotation_ à un engin connecté basé sur la force et la vitesse du générateur.", "block.create.portable_storage_interface.tooltip": "INTERFACE DE STOCKAGE PORTABLE", - "block.create.portable_storage_interface.tooltip.summary": "Un point d'échange portable pour _déplacer_ des _objets_ vers et depuis une _structure_ déplacée par un piston, un roulement, un chariot ou une poulie.", + "block.create.portable_storage_interface.tooltip.summary": "Un point d'échange portable pour _déplacer_ des _objets_ vers et depuis une _structure_ déplacée par un piston, un roulement, un chariot ou une poulie.", "block.create.portable_storage_interface.tooltip.condition1": "Lorsqu'en mouvement", - "block.create.portable_storage_interface.tooltip.behaviour1": "Interagit avec les _transposeurs_ stationnaires de sorte que les transposeurs faisant _face_ _autrepart_ de l'interface tirent les objets, et les transposeurs ciblant l'interface y _insereront_ les _objets_ de l'inventaire joint. L'engin se bloquera brièvement lorsque les objets seront échangés.", + "block.create.portable_storage_interface.tooltip.behaviour1": "Interagit avec les _transposeurs_ stationnaires de sorte que les transposeurs faisant _face_ _autrepart_ de l'interface tirent les objets, et les transposeurs ciblant l'interface y _insereront_ les _objets_ de l'inventaire joint. L'engin se bloquera brièvement lorsque les objets seront échangés.", - "block.create.rotation_speed_controller.tooltip": "CONTRÔLEUR DE VITESSE DE ROTATION", - "block.create.rotation_speed_controller.tooltip.summary": "Un _relai_ _configurable_ capable d'accélérer ou de ralentir le composant cible à la vitesse souhaitée.", - "block.create.rotation_speed_controller.tooltip.condition1": "Lorsqu'attaché à une grande roue dentée", - "block.create.rotation_speed_controller.tooltip.behaviour1": "Relaie la force de rotation entrante vers la roue, essayant de faire _correspondre_ la _vitesse_ à laquelle elle est configurée. La _roue_ _dentée_ doit être _attachée_ _au_ _dessus_ du contrôleur.", + "block.create.rotation_speed_controller.tooltip": "CONTRÔLEUR DE VITESSE DE ROTATION", + "block.create.rotation_speed_controller.tooltip.summary": "Un _relai_ _configurable_ capable d'accélérer ou de ralentir le composant cible à la vitesse souhaitée.", + "block.create.rotation_speed_controller.tooltip.condition1": "Lorsqu'attaché à une grande roue dentée", + "block.create.rotation_speed_controller.tooltip.behaviour1": "Relaie la force de rotation entrante vers la roue, essayant de faire _correspondre_ la _vitesse_ à laquelle elle est configurée. La _roue_ _dentée_ doit être _attachée_ _au_ _dessus_ du contrôleur.", - "block.create.mechanical_piston.tooltip": "PISTON MÉCANIQUE", - "block.create.mechanical_piston.tooltip.summary": "Une version plus avancée du _piston_. Il utilise une _force_ _de_ rotation_ pour déplacer précisément les structures attachées. Les _pôles_ _d'extension_ _de_ _piston_ à l'arrière définissent la _portée_ de cet appareil. Sans extensions, le piston ne bougera pas. Utilisez un _châssis_ ou un _bloc_ _de_ slime_ pour déplacer plus d'une seule ligne de blocs.", - "block.create.mechanical_piston.tooltip.condition1": "Lorsque tourné", - "block.create.mechanical_piston.tooltip.behaviour1": "Commence à déplacer la structure attachée. La vitesse et la direction sont corrélées à la vitesse de rotation entrante.", + "block.create.mechanical_piston.tooltip": "PISTON MÉCANIQUE", + "block.create.mechanical_piston.tooltip.summary": "Une version plus avancée du _piston_. Il utilise une _force_ _de_ rotation_ pour déplacer précisément les structures attachées. Les _pôles_ _d'extension_ _de_ _piston_ à l'arrière définissent la _portée_ de cet appareil. Sans extensions, le piston ne bougera pas. Utilisez un _châssis_ ou un _bloc_ _de_ slime_ pour déplacer plus d'une seule ligne de blocs.", + "block.create.mechanical_piston.tooltip.condition1": "Lorsque tourné", + "block.create.mechanical_piston.tooltip.behaviour1": "Commence à déplacer la structure attachée. La vitesse et la direction sont corrélées à la vitesse de rotation entrante.", - "block.create.sticky_mechanical_piston.tooltip": "PISTON MÉCANIQUE COLLANT", - "block.create.sticky_mechanical_piston.tooltip.summary": "Une version plus avancée du _piston_ _collant_. Il utilise une _force_ _de_ rotation_ pour déplacer précisément les structures attachées. Les _pôles_ _d'extension_ _de_ _piston_ à l'arrière définissent la _portée_ de cet appareil. Sans extensions, le piston ne bougera pas. Utilisez un _châssis_ ou un _bloc_ _de_ slime_ pour déplacer plus d'une seule ligne de blocs.", - "block.create.sticky_mechanical_piston.tooltip.condition1": "Lorsque tourné", - "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Commence à déplacer la structure attachée. La vitesse et la direction sont corrélées à la vitesse de rotation entrante.", + "block.create.sticky_mechanical_piston.tooltip": "PISTON MÉCANIQUE COLLANT", + "block.create.sticky_mechanical_piston.tooltip.summary": "Une version plus avancée du _piston_ _collant_. Il utilise une _force_ _de_ rotation_ pour déplacer précisément les structures attachées. Les _pôles_ _d'extension_ _de_ _piston_ à l'arrière définissent la _portée_ de cet appareil. Sans extensions, le piston ne bougera pas. Utilisez un _châssis_ ou un _bloc_ _de_ slime_ pour déplacer plus d'une seule ligne de blocs.", + "block.create.sticky_mechanical_piston.tooltip.condition1": "Lorsque tourné", + "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Commence à déplacer la structure attachée. La vitesse et la direction sont corrélées à la vitesse de rotation entrante.", - "block.create.piston_extension_pole.tooltip": "PÔLE DE PISTON", - "block.create.piston_extension_pole.tooltip.summary": "Étend la portée des _pistons_ _mécaniques.", - "block.create.piston_extension_pole.tooltip.condition1": "Lorsqu'attaché à un piston mécanique", - "block.create.piston_extension_pole.tooltip.behaviour1": "Étend la portée du _piston_ d'un bloc", + "block.create.piston_extension_pole.tooltip": "PÔLE DE PISTON", + "block.create.piston_extension_pole.tooltip.summary": "Étend la portée des _pistons_ _mécaniques.", + "block.create.piston_extension_pole.tooltip.condition1": "Lorsqu'attaché à un piston mécanique", + "block.create.piston_extension_pole.tooltip.behaviour1": "Étend la portée du _piston_ d'un bloc", - "block.create.mechanical_bearing.tooltip": "ROULEMENT MÉCANIQUE", - "block.create.mechanical_bearing.tooltip.summary": "Utilisé pour faire tourner de _plus_ _grande_ _structures_ ou pour exploiter une _force_ _de_ rotation_ contre le vent.", - "block.create.mechanical_bearing.tooltip.condition1": "Lorsque tourné", - "block.create.mechanical_bearing.tooltip.behaviour1": "Démarre les blocs attachés en rotation. Utilisez un _châssis_ ou _bloc_ _de_ _slime_ pour déplacer plus d'un seul bloc.", - "block.create.mechanical_bearing.tooltip.condition2": "Lorsqu'alimenté par de la redstone", - "block.create.mechanical_bearing.tooltip.behaviour2": "Commence à fournir une _force_ _de_ rotation_ générée à partir de la rotation de la structure attachée. La structure doit inclure des _blocs_ _de_ _voiles_ appropriés (actuellement n'importe quel bloc de laine).", + "block.create.mechanical_bearing.tooltip": "ROULEMENT MÉCANIQUE", + "block.create.mechanical_bearing.tooltip.summary": "Utilisé pour faire tourner de _plus_ _grande_ _structures_ ou pour exploiter une _force_ _de_ rotation_ contre le vent.", + "block.create.mechanical_bearing.tooltip.condition1": "Lorsque tourné", + "block.create.mechanical_bearing.tooltip.behaviour1": "Démarre les blocs attachés en rotation. Utilisez un _châssis_ ou _bloc_ _de_ _slime_ pour déplacer plus d'un seul bloc.", + "block.create.mechanical_bearing.tooltip.condition2": "Lorsqu'alimenté par de la redstone", + "block.create.mechanical_bearing.tooltip.behaviour2": "Commence à fournir une _force_ _de_ rotation_ générée à partir de la rotation de la structure attachée. La structure doit inclure des _blocs_ _de_ _voiles_ appropriés (actuellement n'importe quel bloc de laine).", - "block.create.clockwork_bearing.tooltip": "ROULEMENT MÉCANIQUE HORLOGER", - "block.create.clockwork_bearing.tooltip.summary": "Une version avancée du _roulement_ _mécanique_ pour faire tourner jusqu'à deux _aiguilles_ _d'horloge_ en fonction du _temps_ _en-jeu_ actuel.", - "block.create.clockwork_bearing.tooltip.condition1": "Lorsque tourné", - "block.create.clockwork_bearing.tooltip.behaviour1": "Commence la rotation de la structure attachée vers l'_heure_ _actuelle_. Si une seconde structure est présente, elle servira _d'aiguille_ _des_ _minutes_.", + "block.create.clockwork_bearing.tooltip": "ROULEMENT MÉCANIQUE HORLOGER", + "block.create.clockwork_bearing.tooltip.summary": "Une version avancée du _roulement_ _mécanique_ pour faire tourner jusqu'à deux _aiguilles_ _d'horloge_ en fonction du _temps_ _en-jeu_ actuel.", + "block.create.clockwork_bearing.tooltip.condition1": "Lorsque tourné", + "block.create.clockwork_bearing.tooltip.behaviour1": "Commence la rotation de la structure attachée vers l'_heure_ _actuelle_. Si une seconde structure est présente, elle servira _d'aiguille_ _des_ _minutes_.", - "block.create.sequenced_gearshift.tooltip": "DÉCALEUR DE ROTATION SÉQUENCÉ", - "block.create.sequenced_gearshift.tooltip.summary": "Un _composant_ _utilitaire_ _programmable_, qui peut changer son _débit_ _de_ _rotation_ suivant jusqu'à _5_ _instructions_ _consécutives_. Utilisez-le pour alimenter des roulements mécaniques, des pistons ou des poulies avec plus de contrôle sur le timing et la vitesse. Peut devenir moins précis à des vitesses plus élevées.", - "block.create.sequenced_gearshift.tooltip.condition1": "Lorsqu'alimenté par de la redstone", - "block.create.sequenced_gearshift.tooltip.behaviour1": "_Commence_ _à_ _exécuter_ les instructions programmées en fonction de la vitesse d'entrée.", + "block.create.sequenced_gearshift.tooltip": "DÉCALEUR DE ROTATION SÉQUENCÉ", + "block.create.sequenced_gearshift.tooltip.summary": "Un _composant_ _utilitaire_ _programmable_, qui peut changer son _débit_ _de_ _rotation_ suivant jusqu'à _5_ _instructions_ _consécutives_. Utilisez-le pour alimenter des roulements mécaniques, des pistons ou des poulies avec plus de contrôle sur le timing et la vitesse. Peut devenir moins précis à des vitesses plus élevées.", + "block.create.sequenced_gearshift.tooltip.condition1": "Lorsqu'alimenté par de la redstone", + "block.create.sequenced_gearshift.tooltip.behaviour1": "_Commence_ _à_ _exécuter_ les instructions programmées en fonction de la vitesse d'entrée.", "block.create.sequenced_gearshift.tooltip.condition2": "Clic droit", "block.create.sequenced_gearshift.tooltip.behaviour2": "Ouvre _l'interface_ _de_ _configuration_", "block.create.cart_assembler.tooltip": "ASSEMBLEUR DE CHARIOT", - "block.create.cart_assembler.tooltip.summary": "Monte une structure connectée sur un _chariot_ _passant_.", - "block.create.cart_assembler.tooltip.condition1": "Lorsqu'alimenté par de la redstone", - "block.create.cart_assembler.tooltip.behaviour1": "_Démonte_ les structures montées un _chariot_ _passant_ et les remet dans le monde.", + "block.create.cart_assembler.tooltip.summary": "Monte une structure connectée sur un _chariot_ _passant_.", + "block.create.cart_assembler.tooltip.condition1": "Lorsqu'alimenté par de la redstone", + "block.create.cart_assembler.tooltip.behaviour1": "_Démonte_ les structures montées un _chariot_ _passant_ et les remet dans le monde.", "block.create.cart_assembler.tooltip.condition2": "UNLOCALIZED: When placed above Powered Rail", "block.create.cart_assembler.tooltip.behaviour2": "UNLOCALIZED: _Assembles_ and _accelerates_ _carts_ _when_ _powered_, _disassembles_ and _holds_ them _otherwise_.", "block.create.cart_assembler.tooltip.condition3": "UNLOCALIZED: When placed above Detector Rail", @@ -1323,70 +1234,70 @@ "block.create.cart_assembler.tooltip.behaviour4": "UNLOCALIZED: _Disassembles_ _carts_ when _powered_.", "block.create.rope_pulley.tooltip": "POULIE DE CORDE", - "block.create.rope_pulley.tooltip.summary": "Déplace les _blocs_ et _structures_ attachés _verticalement_. Utilisez un _châssis_ ou _bloc_ _de_ _slime_ pour déplacer plus d'un seul bloc.", - "block.create.rope_pulley.tooltip.condition1": "Lorsque tourné", - "block.create.rope_pulley.tooltip.behaviour1": "Commence à déplacer la structure attachée. La vitesse et la direction sont corrélées à la vitesse de rotation entrante.", + "block.create.rope_pulley.tooltip.summary": "Déplace les _blocs_ et _structures_ attachés _verticalement_. Utilisez un _châssis_ ou _bloc_ _de_ _slime_ pour déplacer plus d'un seul bloc.", + "block.create.rope_pulley.tooltip.condition1": "Lorsque tourné", + "block.create.rope_pulley.tooltip.behaviour1": "Commence à déplacer la structure attachée. La vitesse et la direction sont corrélées à la vitesse de rotation entrante.", - "block.create.linear_chassis.tooltip": "CHÂSSIS DE TRADUCTION", + "block.create.linear_chassis.tooltip": "CHÂSSIS DE TRADUCTION", "block.create.linear_chassis.tooltip.summary": "Un bloc de base configurable reliant les structures pour le mouvement.", - "block.create.linear_chassis.tooltip.condition1": "Lorsque déplacé", - "block.create.linear_chassis.tooltip.behaviour1": "_Déplace_ tous les _châssis_ _attachés_ avec la même orientation, et une colonne de blocs dans sa portée. Les blocs ne seront tirés que si la face du châssis est _collante_ (Voir [Ctrl]).", - "block.create.linear_chassis.tooltip.condition2": "Lorsqu'utilisé avec une clé", - "block.create.linear_chassis.tooltip.behaviour2": "Configurez la _portée_ pour ce bloc de châssis. Maintenez CTRL pour modifier également la plage de tous les blocs de châssis connectés.", + "block.create.linear_chassis.tooltip.condition1": "Lorsque déplacé", + "block.create.linear_chassis.tooltip.behaviour1": "_Déplace_ tous les _châssis_ _attachés_ avec la même orientation, et une colonne de blocs dans sa portée. Les blocs ne seront tirés que si la face du châssis est _collante_ (Voir [Ctrl]).", + "block.create.linear_chassis.tooltip.condition2": "Lorsqu'utilisé avec une clé", + "block.create.linear_chassis.tooltip.behaviour2": "Configurez la _portée_ pour ce bloc de châssis. Maintenez CTRL pour modifier également la plage de tous les blocs de châssis connectés.", "block.create.linear_chassis.tooltip.control1": "Clic droit avec une boule de slime", - "block.create.linear_chassis.tooltip.action1": "Rends la face _collante_. Lorsque déplace, le châssis va _tirer_ les blocs attachés, quelle que soit la direction du mouvement.", + "block.create.linear_chassis.tooltip.action1": "Rends la face _collante_. Lorsque déplace, le châssis va _tirer_ les blocs attachés, quelle que soit la direction du mouvement.", - "block.create.radial_chassis.tooltip": "CHÂSSIS DE ROTATION", + "block.create.radial_chassis.tooltip": "CHÂSSIS DE ROTATION", "block.create.radial_chassis.tooltip.summary": "Un bloc de base configurable reliant les structures pour le mouvement.", - "block.create.radial_chassis.tooltip.condition1": "Lorsque déplacé", - "block.create.radial_chassis.tooltip.behaviour1": "_Déplace_ tous les _châssis_ _attachés_ en colonne, et un cylindre de blocs autour de lui. Les blocs qui l'entourent ne sont déplacés que lorsqu'ils sont à portée et attachés à un côté collant (voir [Ctrl]).", - "block.create.radial_chassis.tooltip.condition2": "Lorsqu'utilisé avec une clé", - "block.create.radial_chassis.tooltip.behaviour2": "Configure la _portée_ pour ce bloc de châssis. Maintenez CTRL pour modifier également la portée de tous les blocs de châssis connectés.", + "block.create.radial_chassis.tooltip.condition1": "Lorsque déplacé", + "block.create.radial_chassis.tooltip.behaviour1": "_Déplace_ tous les _châssis_ _attachés_ en colonne, et un cylindre de blocs autour de lui. Les blocs qui l'entourent ne sont déplacés que lorsqu'ils sont à portée et attachés à un côté collant (voir [Ctrl]).", + "block.create.radial_chassis.tooltip.condition2": "Lorsqu'utilisé avec une clé", + "block.create.radial_chassis.tooltip.behaviour2": "Configure la _portée_ pour ce bloc de châssis. Maintenez CTRL pour modifier également la portée de tous les blocs de châssis connectés.", "block.create.radial_chassis.tooltip.control1": "Clic droit avec une boule de slime", - "block.create.radial_chassis.tooltip.action1": "Rend la face _collante_. Lorsque le châssis se déplace, tous les blocs désignés attachés au côté collant sont déplacés avec lui.", + "block.create.radial_chassis.tooltip.action1": "Rend la face _collante_. Lorsque le châssis se déplace, tous les blocs désignés attachés au côté collant sont déplacés avec lui.", - "block.create.mechanical_drill.tooltip": "PERCEUSE MÉCANIQUE", - "block.create.mechanical_drill.tooltip.summary": "Un dispositif mécanique adapté pour _casser_ les _blocs_. Il est déplaceable avec _pistons_ _mécaniques_ ou _roulements_.", - "block.create.mechanical_drill.tooltip.condition1": "Lorsque tourné", - "block.create.mechanical_drill.tooltip.behaviour1": "Agit comme un casseur de bloc _stationnaire_. Inflige aussi des _dégats_ aux _entités_ se situant dans sa zone effective.", + "block.create.mechanical_drill.tooltip": "PERCEUSE MÉCANIQUE", + "block.create.mechanical_drill.tooltip.summary": "Un dispositif mécanique adapté pour _casser_ les _blocs_. Il est déplaceable avec _pistons_ _mécaniques_ ou _roulements_.", + "block.create.mechanical_drill.tooltip.condition1": "Lorsque tourné", + "block.create.mechanical_drill.tooltip.behaviour1": "Agit comme un casseur de bloc _stationnaire_. Inflige aussi des _dégats_ aux _entités_ se situant dans sa zone effective.", "block.create.mechanical_drill.tooltip.condition2": "Lorsqu'en mouvement", "block.create.mechanical_drill.tooltip.behaviour2": "Casse les blocs avec lesquels la perceuse entre en collision.", - "block.create.mechanical_harvester.tooltip": "RÉCOLTEUSE MÉCANIQUE", - "block.create.mechanical_harvester.tooltip.summary": "Un coupe-plantes mécanique adapté à l'automatisation des cultures à moyenne échelle. Il est déplaceable avec _pistons_ _mécaniques_ ou _roulements_.", + "block.create.mechanical_harvester.tooltip": "RÉCOLTEUSE MÉCANIQUE", + "block.create.mechanical_harvester.tooltip.summary": "Un coupe-plantes mécanique adapté à l'automatisation des cultures à moyenne échelle. Il est déplaceable avec _pistons_ _mécaniques_ ou _roulements_.", "block.create.mechanical_harvester.tooltip.condition1": "Lorsqu'en mouvement", - "block.create.mechanical_harvester.tooltip.behaviour1": "_Récolte_ toutes les _cultures_ _matures_ que la lame entre en touche et les remet à leur état de croissance initial.", + "block.create.mechanical_harvester.tooltip.behaviour1": "_Récolte_ toutes les _cultures_ _matures_ que la lame entre en touche et les remet à leur état de croissance initial.", "block.create.mechanical_plough.tooltip": "UNLOCALIZED: MECHANICAL PLOUGH", "block.create.mechanical_plough.tooltip.summary": "UNLOCALIZED: A mechanical plough has a variety of uses. It is movable with _Mechanical_ _Pistons_, _Bearings_ or other controllers.", "block.create.mechanical_plough.tooltip.condition1": "UNLOCALIZED: While Moving", "block.create.mechanical_plough.tooltip.behaviour1": "UNLOCALIZED: _Breaks_ _blocks_ which _cannot_ _be_ _collided_ with, such as torches, tracks or snow layers. _Applies_ its _motion_ to _entities_ without hurting them. _Tills_ _soil_ _blocks_ as though a Hoe would be used on them.", - "block.create.mechanical_saw.tooltip": "SCIE MÉCANIQUE", - "block.create.mechanical_saw.tooltip.summary": "Convient pour _couper_ des _arbres_ efficacement et pour _tailler_ des _blocs_ dans leurs homologues menuisés. Il est déplaceable à l'aide de _pistons_ _mécaniques_ ou _roulements_.", - "block.create.mechanical_saw.tooltip.condition1": "Lorsque tourné vers le haut", - "block.create.mechanical_saw.tooltip.behaviour1": "Applique les _recettes_ de _sciage_ et de _taillerie_ aux éléments jetés ou insérés dedans. Lorsque plusieurs sorties sont possibles, il les parcourt à moins qu'un _filtre_ ne soit affecté.", - "block.create.mechanical_saw.tooltip.condition2": "Lorsqu'à l'horizontal", + "block.create.mechanical_saw.tooltip": "SCIE MÉCANIQUE", + "block.create.mechanical_saw.tooltip.summary": "Convient pour _couper_ des _arbres_ efficacement et pour _tailler_ des _blocs_ dans leurs homologues menuisés. Il est déplaceable à l'aide de _pistons_ _mécaniques_ ou _roulements_.", + "block.create.mechanical_saw.tooltip.condition1": "Lorsque tourné vers le haut", + "block.create.mechanical_saw.tooltip.behaviour1": "Applique les _recettes_ de _sciage_ et de _taillerie_ aux éléments jetés ou insérés dedans. Lorsque plusieurs sorties sont possibles, il les parcourt à moins qu'un _filtre_ ne soit affecté.", + "block.create.mechanical_saw.tooltip.condition2": "Lorsqu'à l'horizontal", "block.create.mechanical_saw.tooltip.behaviour2": "_Casse_ les _troncs_ devant elle. Si le tronc a supportait un arbre, _l'arbre_ _tombera_ loin de la scie.", "block.create.mechanical_saw.tooltip.condition3": "Lorsqu'en mouvement", "block.create.mechanical_saw.tooltip.behaviour3": "_Coupe_ tous les _arbres_ avec lesquels la scie entre en collision.", - "block.create.stockpile_switch.tooltip": "DÉTÉCTEUR DE STOCKAGE", - "block.create.stockpile_switch.tooltip.summary": "Bascule un signal Redstone basé sur _l'espace_ _de_ _stockage_ dans le conteneur attaché.", + "block.create.stockpile_switch.tooltip": "DÉTÉCTEUR DE STOCKAGE", + "block.create.stockpile_switch.tooltip.summary": "Bascule un signal Redstone basé sur _l'espace_ _de_ _stockage_ dans le conteneur attaché.", "block.create.stockpile_switch.tooltip.condition1": "Lorsqu'en dessous de la limite de stockage minimum", - "block.create.stockpile_switch.tooltip.behaviour1": "Arrête de fournir de _l'énergie_", + "block.create.stockpile_switch.tooltip.behaviour1": "Arrête de fournir de _l'énergie_", "block.create.stockpile_switch.tooltip.condition2": "Lorsqu'au dessus de la limite de stockage maximum", - "block.create.stockpile_switch.tooltip.behaviour2": "Commence à fournir de _l'énergie_ jusqu'à ce que la limite d'énergie soit réatteinte.", + "block.create.stockpile_switch.tooltip.behaviour2": "Commence à fournir de _l'énergie_ jusqu'à ce que la limite d'énergie soit réatteinte.", "block.create.stockpile_switch.tooltip.control1": "Clic droit", "block.create.stockpile_switch.tooltip.action1": "Ouvre l'_interface_ _de_ _configuration_.", "block.create.redstone_link.tooltip": "LIAISON REDSTONE", - "block.create.redstone_link.tooltip.summary": "Points de terminaison pour les connexions de _redstone_ _sans-fil_. Peut être attribué des _fréquences_ en utilisant n'importe quel objet. La portée du signal est limitée, quoique raisonnablement loin.", - "block.create.redstone_link.tooltip.condition1": "Lorsqu'alimenté", - "block.create.redstone_link.tooltip.behaviour1": "La réception de liens de la même _fréquence_ produira un signal redstone.", + "block.create.redstone_link.tooltip.summary": "Points de terminaison pour les connexions de _redstone_ _sans-fil_. Peut être attribué des _fréquences_ en utilisant n'importe quel objet. La portée du signal est limitée, quoique raisonnablement loin.", + "block.create.redstone_link.tooltip.condition1": "Lorsqu'alimenté", + "block.create.redstone_link.tooltip.behaviour1": "La réception de liens de la même _fréquence_ produira un signal redstone.", "block.create.redstone_link.tooltip.control1": "Clic droit avec un objet", - "block.create.redstone_link.tooltip.action1": "Définit la _fréquence_ sur cet élément. Un total de _deux_ _différents_ _objets_ peuvent être utilisés en combinaison pour définir une fréquence.", - "block.create.redstone_link.tooltip.control2": "Clic droit en étant accroupi", + "block.create.redstone_link.tooltip.action1": "Définit la _fréquence_ sur cet élément. Un total de _deux_ _différents_ _objets_ peuvent être utilisés en combinaison pour définir une fréquence.", + "block.create.redstone_link.tooltip.control2": "Clic droit en étant accroupi", "block.create.redstone_link.tooltip.action2": "TBascule entre le mode _receveur_ et _transmetteur_.", "block.create.nixie_tube.tooltip": "UNLOCALIZED: NIXIE TUBE", @@ -1395,84 +1306,84 @@ "block.create.nixie_tube.tooltip.behaviour1": "UNLOCALIZED: Shows the current redstone _Signal_ _Strength_ as its displayed value.", "block.create.redstone_contact.tooltip": "redstone_contact REDSTONE", - "block.create.redstone_contact.tooltip.summary": "N'émet de l'énergie que par paires. Il est mobile avec _pistons_ _mécaniques_ ou _roulements_.", - "block.create.redstone_contact.tooltip.condition1": "Lorsque tourné vers un autre redstone_contact", + "block.create.redstone_contact.tooltip.summary": "N'émet de l'énergie que par paires. Il est mobile avec _pistons_ _mécaniques_ ou _roulements_.", + "block.create.redstone_contact.tooltip.condition1": "Lorsque tourné vers un autre redstone_contact", "block.create.redstone_contact.tooltip.behaviour1": "Fournit un _signal_ _redstone_.", "block.create.redstone_contact.tooltip.condition2": "Lorsqu'en mouvement", - "block.create.redstone_contact.tooltip.behaviour2": "Déclenche tous les redstone_contacts fixes qu'il passe.", + "block.create.redstone_contact.tooltip.behaviour2": "Déclenche tous les redstone_contacts fixes qu'il passe.", "block.create.adjustable_crate.tooltip": "CAISSE AJUSTABLE", - "block.create.adjustable_crate.tooltip.summary": "Ce _conteneur_ _de_ _stockage_ permet un contrôle manuel de sa capacité. Il peut contenir jusqu'à _16_ _piles_ de n'importe quel objet. Prend en charge les _comparateurs_ _de_ _redstone_.", + "block.create.adjustable_crate.tooltip.summary": "Ce _conteneur_ _de_ _stockage_ permet un contrôle manuel de sa capacité. Il peut contenir jusqu'à _16_ _piles_ de n'importe quel objet. Prend en charge les _comparateurs_ _de_ _redstone_.", "block.create.adjustable_crate.tooltip.control1": "Clic droit", "block.create.adjustable_crate.tooltip.action1": "Ouvre _l'interface_.", - "block.create.creative_crate.tooltip": "CAISSE CRÉATIVE", - "block.create.creative_crate.tooltip.summary": "Fournit une réserve infinie de blocs aux _Schémacanons_ adjacents.", + "block.create.creative_crate.tooltip": "CAISSE CRÉATIVE", + "block.create.creative_crate.tooltip.summary": "Fournit une réserve infinie de blocs aux _Schémacanons_ adjacents.", "block.create.creative_crate.tooltip.condition1": "UNLOCALIZED: When Item in Filter Slot", "block.create.creative_crate.tooltip.behaviour1": "UNLOCALIZED: Anything _extracting_ from this container will provide an _endless_ _supply_ of the item specified. Items _inserted_ into this crate will be _voided._", - "block.create.deployer.tooltip": "DÉPLOYEUR", - "block.create.deployer.tooltip.summary": "_Frappe_, _utilise_ et _active_. Cette machine essaiera _d'imiter_ un _joueur_ autant que possible. Peut _prendre_ et _déposer_ des _objets_ dans _l'inventaire_ adjacent. Peut être affecté à une pile d'éléments en tant que _filtre_.", - "block.create.deployer.tooltip.condition1": "Lorsque tourné", - "block.create.deployer.tooltip.behaviour1": "Étend son bras et _active_ dans l'espace de bloc _2m_ _devant_ de lui-même.", - "block.create.deployer.tooltip.condition2": "Clic droit avec une clé", - "block.create.deployer.tooltip.behaviour2": "Bascule le mode frappe. Dans le _mode_ _frappe_, le déployeur tentera d'utiliser son élément pour _casser_ les _blocs_ ou infliger des _dégats_ aux _entités_.", + "block.create.deployer.tooltip": "DÉPLOYEUR", + "block.create.deployer.tooltip.summary": "_Frappe_, _utilise_ et _active_. Cette machine essaiera _d'imiter_ un _joueur_ autant que possible. Peut _prendre_ et _déposer_ des _objets_ dans _l'inventaire_ adjacent. Peut être affecté à une pile d'éléments en tant que _filtre_.", + "block.create.deployer.tooltip.condition1": "Lorsque tourné", + "block.create.deployer.tooltip.behaviour1": "Étend son bras et _active_ dans l'espace de bloc _2m_ _devant_ de lui-même.", + "block.create.deployer.tooltip.condition2": "Clic droit avec une clé", + "block.create.deployer.tooltip.behaviour2": "Bascule le mode frappe. Dans le _mode_ _frappe_, le déployeur tentera d'utiliser son élément pour _casser_ les _blocs_ ou infliger des _dégats_ aux _entités_.", - "block.create.funnel.tooltip": "ENTONNOIR AMÉLIORÉ", - "block.create.funnel.tooltip.summary": "_Collecte_ les _objets_ en _approche_ et les insère dans _l'inventaire_ attaché si possible. Peut collecter des objets dans le _monde_ et des objets sur un _tapis_ _roulant_.", + "block.create.funnel.tooltip": "ENTONNOIR AMÉLIORÉ", + "block.create.funnel.tooltip.summary": "_Collecte_ les _objets_ en _approche_ et les insère dans _l'inventaire_ attaché si possible. Peut collecter des objets dans le _monde_ et des objets sur un _tapis_ _roulant_.", "block.create.funnel.tooltip.condition1": "Passage de tapis roulant passif", - "block.create.funnel.tooltip.behaviour1": "Les entonnoirs améliorés peuvent extraire des éléments _des_ _tapis_ _roulant_ lorsqu'ils sont placés au-dessus d'eux, latéralement ou à l'extrémité. Lorsqu'un entonnoir amélioré latéral est sauvegardé, les éléments sur le _tapis_ roulant_ _ne_ _vont_ _pas_ _caler_.", + "block.create.funnel.tooltip.behaviour1": "Les entonnoirs améliorés peuvent extraire des éléments _des_ _tapis_ _roulant_ lorsqu'ils sont placés au-dessus d'eux, latéralement ou à l'extrémité. Lorsqu'un entonnoir amélioré latéral est sauvegardé, les éléments sur le _tapis_ roulant_ _ne_ _vont_ _pas_ _caler_.", "block.create.belt_tunnel.tooltip": "TUNNEL DE TAPIS ROULANT", - "block.create.belt_tunnel.tooltip.summary": "Une option esthétique pour faire passer vos _tapis_ _roulants_ _mécaniques_ à travers les murs. Les tapis roulants doivent être renforcées avec des _boîtiers_ _en_ _laiton_. Les tunnels peuvent se _synchroniser_ avec _leurs_voisins_, ne laissant passer les éléments que si tous les tunnels du groupe ont un en attente. [Ctrl]", - "block.create.belt_tunnel.tooltip.control1": "Clic droit avec une clé devant", - "block.create.belt_tunnel.tooltip.action1": "Active le _comportement_ _synchronisé_. Les tunnels synchronisés contiennent des objets jusqu'à ce que leurs voisins en aient également.", - "block.create.belt_tunnel.tooltip.control2": "Clic droit avec une clé sur les côtés", - "block.create.belt_tunnel.tooltip.action2": "_Ajuste_ _les_ _volets_ _des_ _fenêtres_ si le tunnel a une fenêtre sur cette face.", + "block.create.belt_tunnel.tooltip.summary": "Une option esthétique pour faire passer vos _tapis_ _roulants_ _mécaniques_ à travers les murs. Les tapis roulants doivent être renforcées avec des _boîtiers_ _en_ _laiton_. Les tunnels peuvent se _synchroniser_ avec _leurs_voisins_, ne laissant passer les éléments que si tous les tunnels du groupe ont un en attente. [Ctrl]", + "block.create.belt_tunnel.tooltip.control1": "Clic droit avec une clé devant", + "block.create.belt_tunnel.tooltip.action1": "Active le _comportement_ _synchronisé_. Les tunnels synchronisés contiennent des objets jusqu'à ce que leurs voisins en aient également.", + "block.create.belt_tunnel.tooltip.control2": "Clic droit avec une clé sur les côtés", + "block.create.belt_tunnel.tooltip.action2": "_Ajuste_ _les_ _volets_ _des_ _fenêtres_ si le tunnel a une fenêtre sur cette face.", - "block.create.brass_casing.tooltip": "BOÃŽTIER EN LAITON", - "block.create.brass_casing.tooltip.summary": "Boîtier de machine robuste avec une variété d'utilisations. Sans danger pour la décoration.", - "block.create.brass_casing.tooltip.condition1": "Lorsqu'utilisé sur un tapis roulant mécanique", - "block.create.brass_casing.tooltip.behaviour1": "_Renforce_ les _tapis_ _roulants_ avec une fondation en laiton. Les tapis roulants renforcées peuvent prendre en charge les _tunnels_, _extracteurs_, _entonnoir améliorés_ et _transposeurs_ interagissant avec le tapis roulant sur les côtés et en dessous.", + "block.create.brass_casing.tooltip": "BOÎTIER EN LAITON", + "block.create.brass_casing.tooltip.summary": "Boîtier de machine robuste avec une variété d'utilisations. Sans danger pour la décoration.", + "block.create.brass_casing.tooltip.condition1": "Lorsqu'utilisé sur un tapis roulant mécanique", + "block.create.brass_casing.tooltip.behaviour1": "_Renforce_ les _tapis_ _roulants_ avec une fondation en laiton. Les tapis roulants renforcées peuvent prendre en charge les _tunnels_, _extracteurs_, _entonnoir améliorés_ et _transposeurs_ interagissant avec le tapis roulant sur les côtés et en dessous.", "block.create.belt_observer.tooltip": "OBSERVATEUR DE TAPIS ROULANT", - "block.create.belt_observer.tooltip.summary": "Détecte les éléments et les entités passant sur un _tapis_ _roulant_ _mécanique_ devant lui. Utilisez une _clé_ pour faire défiler son comportement. Les non-éléments seront toujours traités en mode détection quel que soit le paramètre.", - "block.create.belt_observer.tooltip.condition1": "Mode détection", - "block.create.belt_observer.tooltip.behaviour1": "Fournit un redstone _pendant_ qu'un _objet_ _correspondant_ _soit_ sur le segment de tapis roulant observé.", + "block.create.belt_observer.tooltip.summary": "Détecte les éléments et les entités passant sur un _tapis_ _roulant_ _mécanique_ devant lui. Utilisez une _clé_ pour faire défiler son comportement. Les non-éléments seront toujours traités en mode détection quel que soit le paramètre.", + "block.create.belt_observer.tooltip.condition1": "Mode détection", + "block.create.belt_observer.tooltip.behaviour1": "Fournit un redstone _pendant_ qu'un _objet_ _correspondant_ _soit_ sur le segment de tapis roulant observé.", "block.create.belt_observer.tooltip.condition2": "Mode impulsion", - "block.create.belt_observer.tooltip.behaviour2": "Émet une _impulsion_ lorsqu'un _objet_ _correspondant_ _passe_ au centre du segment de tapis roulant observé.", - "block.create.belt_observer.tooltip.condition3": "Mode éjection", - "block.create.belt_observer.tooltip.behaviour3": "_Éject_ les _objets_ _correspondants_ sur le côté. Si le tapis roulant ou l'espace cible est _occupé_, l'objet sera _tenu_ _en_ _place_.", + "block.create.belt_observer.tooltip.behaviour2": "Émet une _impulsion_ lorsqu'un _objet_ _correspondant_ _passe_ au centre du segment de tapis roulant observé.", + "block.create.belt_observer.tooltip.condition3": "Mode éjection", + "block.create.belt_observer.tooltip.behaviour3": "_Éject_ les _objets_ _correspondants_ sur le côté. Si le tapis roulant ou l'espace cible est _occupé_, l'objet sera _tenu_ _en_ _place_.", "block.create.belt_observer.tooltip.condition4": "Mode partage", - "block.create.belt_observer.tooltip.behaviour4": "_Partage_ une _pile_ _d'objets_ _correspondants_ et _éjecte_ _la_ _moitié_ de celui-ci sur le côté.", + "block.create.belt_observer.tooltip.behaviour4": "_Partage_ une _pile_ _d'objets_ _correspondants_ et _éjecte_ _la_ _moitié_ de celui-ci sur le côté.", - "block.create.pulse_repeater.tooltip": "RÉPÉTEUR D'IMPULSIONS", - "block.create.pulse_repeater.tooltip.summary": "Un circuit simple pour couper les signaux de redstone passant à une longueur de _1_ _tick_.", + "block.create.pulse_repeater.tooltip": "RÉPÉTEUR D'IMPULSIONS", + "block.create.pulse_repeater.tooltip.summary": "Un circuit simple pour couper les signaux de redstone passant à une longueur de _1_ _tick_.", - "block.create.adjustable_repeater.tooltip": "RÉPÉTEUR RÉGLABLE", - "block.create.adjustable_repeater.tooltip.summary": "Un _répéteur_ _de_ _redstone_ avancé avec un _délai_ _configurable_ jusqu'à 30 minutes.", + "block.create.adjustable_repeater.tooltip": "RÉPÉTEUR RÉGLABLE", + "block.create.adjustable_repeater.tooltip.summary": "Un _répéteur_ _de_ _redstone_ avancé avec un _délai_ _configurable_ jusqu'à 30 minutes.", - "block.create.adjustable_pulse_repeater.tooltip": "RÉPÉTEUR D'IMPULSIONS RÉGLABLE", - "block.create.adjustable_pulse_repeater.tooltip.summary": "Un _répéteur_ _d'impulsions_ avancé avec un _délai_ _configurable_ jusqu'à 30 minutes.", + "block.create.adjustable_pulse_repeater.tooltip": "RÉPÉTEUR D'IMPULSIONS RÉGLABLE", + "block.create.adjustable_pulse_repeater.tooltip.summary": "Un _répéteur_ _d'impulsions_ avancé avec un _délai_ _configurable_ jusqu'à 30 minutes.", "block.create.analog_lever.tooltip": "LEVIER ANALOGIQUE", - "block.create.analog_lever.tooltip.summary": "Un levier avec un _contrôle_ plus _précis_ sur sa _puissance_ _de_ _signal_ émise.", + "block.create.analog_lever.tooltip.summary": "Un levier avec un _contrôle_ plus _précis_ sur sa _puissance_ _de_ _signal_ émise.", - "block.create.powered_toggle_latch.tooltip": "LOQUET À BASCULE ALIMENTÉ", - "block.create.powered_toggle_latch.tooltip.summary": "Un levier qui peut être basculé par une _pulsation_ _de_ _redstone_.", + "block.create.powered_toggle_latch.tooltip": "LOQUET À BASCULE ALIMENTÉ", + "block.create.powered_toggle_latch.tooltip.summary": "Un levier qui peut être basculé par une _pulsation_ _de_ _redstone_.", - "block.create.powered_latch.tooltip": "VERROU ALIMENTÉ", - "block.create.powered_latch.tooltip.summary": "Un levier qui peut être contrôlé par un _signal_ _de_ _redstone_. Un signal sur _l'arrière_ _l'active_, un signal sur le _côté_ _va_ _le_ _réinitialiser_.", + "block.create.powered_latch.tooltip": "VERROU ALIMENTÉ", + "block.create.powered_latch.tooltip.summary": "Un levier qui peut être contrôlé par un _signal_ _de_ _redstone_. Un signal sur _l'arrière_ _l'active_, un signal sur le _côté_ _va_ _le_ _réinitialiser_.", "block.create.speedometer.tooltip": "COMPTEUR DE VITESSE", - "block.create.speedometer.tooltip.summary": "Mesure et affiche la _ vitesse de rotation _ des composants cinétiques attachés. Prend en charge les _comparateurs_ _de_ _redstone_.", - "block.create.speedometer.tooltip.condition1": "Lorsque tourné", - "block.create.speedometer.tooltip.behaviour1": "Indique une couleur correspondant au niveau de vitesse. _Vert_ indique une rotation lente, _Bleu_ modérée et _violet_ rapide. Certains composants mécaniques nécessitent une vitesse suffisante pour fonctionner correctement.", + "block.create.speedometer.tooltip.summary": "Mesure et affiche la _ vitesse de rotation _ des composants cinétiques attachés. Prend en charge les _comparateurs_ _de_ _redstone_.", + "block.create.speedometer.tooltip.condition1": "Lorsque tourné", + "block.create.speedometer.tooltip.behaviour1": "Indique une couleur correspondant au niveau de vitesse. _Vert_ indique une rotation lente, _Bleu_ modérée et _violet_ rapide. Certains composants mécaniques nécessitent une vitesse suffisante pour fonctionner correctement.", - "block.create.stressometer.tooltip": "STRESSOMÈTRE", - "block.create.stressometer.tooltip.summary": "Mesure et affiche la _stress__ globale du réseau cinétique attaché. Prend en charge les _comparateurs_ _de_ _redstone_.", - "block.create.stressometer.tooltip.condition1": "Lorsque tourné", - "block.create.stressometer.tooltip.behaviour1": "Indique une couleur correspondant au niveau de contrainte. Les _réseaux_ _surchargés_ cesseront de bouger. Le stress peut être soulagé en ajoutant plus de _sources_ _rotationnelles_ au réseau.", + "block.create.stressometer.tooltip": "STRESSOMÈTRE", + "block.create.stressometer.tooltip.summary": "Mesure et affiche la _stress__ globale du réseau cinétique attaché. Prend en charge les _comparateurs_ _de_ _redstone_.", + "block.create.stressometer.tooltip.condition1": "Lorsque tourné", + "block.create.stressometer.tooltip.behaviour1": "Indique une couleur correspondant au niveau de contrainte. Les _réseaux_ _surchargés_ cesseront de bouger. Le stress peut être soulagé en ajoutant plus de _sources_ _rotationnelles_ au réseau.", "tool.create.sand_paper.tooltip": "UNLOCALIZED: SAND PAPER", "tool.create.sand_paper.tooltip.summary": "UNLOCALIZED: A rough paper that can be used to _polish_ _materials_. Can be automatically applied using the Deployer.", @@ -1486,26 +1397,26 @@ "item.create.super_glue.tooltip.condition2": "UNLOCALIZED: When Held in Offhand", "item.create.super_glue.tooltip.behaviour2": "UNLOCALIZED: _Automatically_ _attaches_ blocks placed from the main hand to the _side_ they were _placed_ _against._", - "item.create.refined_radiance.tooltip": "ÉCLAT RAFFINÉ", - "item.create.refined_radiance.tooltip.summary": "Un matériau chromatique forgé à partir de _lumière_ _absorbée_.", + "item.create.refined_radiance.tooltip": "ÉCLAT RAFFINÉ", + "item.create.refined_radiance.tooltip.summary": "Un matériau chromatique forgé à partir de _lumière_ _absorbée_.", "item.create.shadow_steel.tooltip": "ACIER SOMBRE", - "item.create.shadow_steel.tooltip.summary": "Un matériau chromatique forgé _dans_ _le_ _néant_.", + "item.create.shadow_steel.tooltip.summary": "Un matériau chromatique forgé _dans_ _le_ _néant_.", "item.create.crafter_slot_cover.tooltip": "COUVERCLE D'EMPLACEMENT", - "item.create.crafter_slot_cover.tooltip.summary": "Utilisé pour marquer un _établi_ _mécanique_ comme un emplacement vide dans une recette. Les établis ne doivent pas nécessairement former une grille carrée complète. C'est utile quand il y a des recettes où les _ingredients_ _sont_ _en_ _diagonale_ les uns aux autres.", + "item.create.crafter_slot_cover.tooltip.summary": "Utilisé pour marquer un _établi_ _mécanique_ comme un emplacement vide dans une recette. Les établis ne doivent pas nécessairement former une grille carrée complète. C'est utile quand il y a des recettes où les _ingredients_ _sont_ _en_ _diagonale_ les uns aux autres.", "create.tooltip.wip": "En cours", "create.tooltip.workInProgress": "En cours!", - "create.tooltip.randomWipDescription0": "Veuillez garder cet objet hors de portée des enfants.", - "create.tooltip.randomWipDescription1": "Un bébé panda meurt chaque fois que vous utilisez cet objet. Chaque. Fois.", - "create.tooltip.randomWipDescription2": "À utiliser à vos risques et périls.", + "create.tooltip.randomWipDescription0": "Veuillez garder cet objet hors de portée des enfants.", + "create.tooltip.randomWipDescription1": "Un bébé panda meurt chaque fois que vous utilisez cet objet. Chaque. Fois.", + "create.tooltip.randomWipDescription2": "À utiliser à vos risques et périls.", "create.tooltip.randomWipDescription3": "Ce n'est pas l'objet que vous recherchez, *agites les doigts* veuillez vous disperser.", - "create.tooltip.randomWipDescription4": "Cet objet s'autodétruit en 10 secondes. 10, 9, 8...", + "create.tooltip.randomWipDescription4": "Cet objet s'autodétruit en 10 secondes. 10, 9, 8...", "create.tooltip.randomWipDescription5": "Croyez-moi, c'est inutile.", - "create.tooltip.randomWipDescription6": "En utilisant cet article, vous êtes responsables et acceptez ses conditions.", - "create.tooltip.randomWipDescription7": "Celui-ci n'est peut-être pas pour vous. Que dire de celui-là?", - "create.tooltip.randomWipDescription8": "Utilisez-le et regrettez immédiatement votre décision.", + "create.tooltip.randomWipDescription6": "En utilisant cet article, vous êtes responsables et acceptez ses conditions.", + "create.tooltip.randomWipDescription7": "Celui-ci n'est peut-être pas pour vous. Que dire de celui-là?", + "create.tooltip.randomWipDescription8": "Utilisez-le et regrettez immédiatement votre décision.", "_": "Thank you for translating Create!" diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index 3c29bc4ab..8bd21d4f1 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -61,7 +61,7 @@ "block.create.creative_motor": "Motore", "block.create.crushing_wheel": "Ruota di Frantumazione", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", - "block.create.cuckoo_clock": "Orologio a Cucù", + "block.create.cuckoo_clock": "Orologio a Cucù", "block.create.cyan_seat": "UNLOCALIZED: Cyan Seat", "block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle", "block.create.dark_oak_window": "UNLOCALIZED: Dark Oak Window", @@ -326,7 +326,7 @@ "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "Corda", "block.create.rope_pulley": "Puleggia della Corda", - "block.create.rotation_speed_controller": "Regolatore di Velocità di Rotazione", + "block.create.rotation_speed_controller": "Regolatore di Velocità di Rotazione", "block.create.schematic_table": "Banco Schematico", "block.create.schematicannon": "Cannoneschematico", "block.create.scoria": "Scoria", @@ -527,12 +527,12 @@ "itemGroup.create.base": "UNLOCALIZED: Create", "itemGroup.create.palettes": "UNLOCALIZED: Create Palettes", - "death.attack.create.crush": "%1$s è stato elaborato dala Ruota di Frantumazione", - "death.attack.create.fan_fire": "%1$s è stato bruciato a morte da aria calda", - "death.attack.create.fan_lava": "%1$s è stato bruciato a morte dal ventilatore di lava", - "death.attack.create.mechanical_drill": "%1$s è stato impalato dal Trapano Meccanico", - "death.attack.create.mechanical_saw": "%1$s è stato tagliato a metà dalla Sega Meccanica", - "death.attack.create.cuckoo_clock_explosion": "%1$s è saltato in aria dall'orologio a cucù manomesso", + "death.attack.create.crush": "%1$s è stato elaborato dala Ruota di Frantumazione", + "death.attack.create.fan_fire": "%1$s è stato bruciato a morte da aria calda", + "death.attack.create.fan_lava": "%1$s è stato bruciato a morte dal ventilatore di lava", + "death.attack.create.mechanical_drill": "%1$s è stato impalato dal Trapano Meccanico", + "death.attack.create.mechanical_saw": "%1$s è stato tagliato a metà dalla Sega Meccanica", + "death.attack.create.cuckoo_clock_explosion": "%1$s è saltato in aria dall'orologio a cucù manomesso", "create.block.deployer.damage_source_name": "un Disadattato", "create.block.cart_assembler.invalid": "UNLOCALIZED: Place your Cart Assembler on a rail block", @@ -555,22 +555,22 @@ "create.recipe.sandpaper_polishing": "Carta Vetrata Levigata", "create.recipe.mystery_conversion": "Metamorfosi Cromatica", "create.recipe.processing.catalyst": "Catalizzatore", - "create.recipe.processing.chance": "%1$s%% Possibilità", - "create.recipe.processing.chanceToReturn": "%1$s%% Possibilità di Ritorno", + "create.recipe.processing.chance": "%1$s%% Possibilità", + "create.recipe.processing.chanceToReturn": "%1$s%% Possibilità di Ritorno", "create.generic.range": "Gamma", "create.generic.radius": "Raggio", "create.generic.width": "Larghezza", "create.generic.height": "Altezza", "create.generic.length": "Lunghezza", - "create.generic.speed": "Velocità", + "create.generic.speed": "Velocità", "create.generic.delay": "Ritardo", "create.generic.unit.ticks": "Tick", "create.generic.unit.seconds": "Secondi", "create.generic.unit.minutes": "Minuti", "create.generic.unit.rpm": "RPM", "create.generic.unit.stress": "su", - "create.generic.unit.degrees": "°", + "create.generic.unit.degrees": "°", "create.action.scroll": "Scorri", "create.action.confirm": "Conferma", @@ -580,13 +580,13 @@ "create.keyinfo.toolmenu": "Focalizza sul Menu Strumento", "create.keyinfo.scrollup": "Simula Rotellina del Mouse Verso Su (nel mondo)", - "create.keyinfo.scrolldown": "Simula Rotellina del Mouse Verso Giù (nel mondo)", + "create.keyinfo.scrolldown": "Simula Rotellina del Mouse Verso Giù (nel mondo)", "create.gui.scrollInput.defaultTitle": "Scegli un Opzione:", "create.gui.scrollInput.scrollToModify": "Scorri per Modificare", "create.gui.scrollInput.scrollToAdjustAmount": "Scorri Fino a Regolare l'Importo", "create.gui.scrollInput.scrollToSelect": "Scorri per Selezionare", - "create.gui.scrollInput.shiftScrollsFaster": "Premi Shift per Scorrere più Velocemente", + "create.gui.scrollInput.shiftScrollsFaster": "Premi Shift per Scorrere più Velocemente", "create.gui.toolmenu.focusKey": "Premi [%1$s] per Aprire il Menu", "create.gui.toolmenu.cycle": "[SCORRI] per navigare", "create.gui.symmetryWand.mirrorType": "Specchio", @@ -603,7 +603,7 @@ "create.orientation.alongX": "Lungo X", "create.gui.blockzapper.title": "Posizionatore di Blocchi", - "create.gui.blockzapper.replaceMode": "Modalità Sostituire", + "create.gui.blockzapper.replaceMode": "Modalità Sostituire", "create.gui.blockzapper.searchDiagonal": "Segui Diagonali", "create.gui.blockzapper.searchFuzzy": "Ignora i Bordi dei Materiali", "create.gui.blockzapper.range": "Gamma Diffusione", @@ -647,11 +647,11 @@ "create.blockzapper.leftClickToSet": "Clic-Sinistro su un blocco per impostare il materiale", "create.blockzapper.empty": "Fuori dai Blocchi!", - "create.contraptions.movement_mode": "Modalità Movimento", - "create.contraptions.movement_mode.move_place": "Posizionare Sempre quando è Fermo", + "create.contraptions.movement_mode": "Modalità Movimento", + "create.contraptions.movement_mode.move_place": "Posizionare Sempre quando è Fermo", "create.contraptions.movement_mode.move_place_returned": "Posiziona solo nella Posizione Iniziale", "create.contraptions.movement_mode.move_never_place": "Posiziona solo quando Ancora Distrutto", - "create.contraptions.movement_mode.rotate_place": "Posiziona Sempre quando è Fermo", + "create.contraptions.movement_mode.rotate_place": "Posiziona Sempre quando è Fermo", "create.contraptions.movement_mode.rotate_place_returned": "Posiziona solo vicino all'Angolo Iniziale", "create.contraptions.movement_mode.rotate_never_place": "Posiziona Solo quando l'Ancora viene Distrutta", "create.contraptions.cart_movement_mode": "UNLOCALIZED: Cart Movement Mode", @@ -666,16 +666,16 @@ "create.gui.goggles.generator_stats": "Statistiche del Generatore:", "create.gui.goggles.kinetic_stats": "Statistiche Cinetiche:", - "create.gui.goggles.at_current_speed": "Alla velocità Attuale", + "create.gui.goggles.at_current_speed": "Alla velocità Attuale", "create.gui.goggles.base_value": "Valore Base", "create.gui.gauge.info_header": "Informazioni sul Calibro:", - "create.gui.speedometer.title": "Velocità di Rotazione", + "create.gui.speedometer.title": "Velocità di Rotazione", "create.gui.stressometer.title": "Stress della Rete", - "create.gui.stressometer.capacity": "Capacità Rimanente", + "create.gui.stressometer.capacity": "Capacità Rimanente", "create.gui.stressometer.overstressed": "Sovrastressato", "create.gui.stressometer.no_rotation": "Nessuna Rotazione", - "create.gui.contraptions.not_fast_enough": "Sembra che questo %1$s _non_ stia girando con una _velocità_ _sufficiente_.", - "create.gui.contraptions.network_overstressed": "Sembra che questo marchingegno sia _sovraccarico_. Aggiungi più fonti o _rallenta_ i componenti con un forte _impatto_ _di_ _stress_.", + "create.gui.contraptions.not_fast_enough": "Sembra che questo %1$s _non_ stia girando con una _velocità_ _sufficiente_.", + "create.gui.contraptions.network_overstressed": "Sembra che questo marchingegno sia _sovraccarico_. Aggiungi più fonti o _rallenta_ i componenti con un forte _impatto_ _di_ _stress_.", "create.gui.adjustable_crate.title": "Baule Regolabile", "create.gui.adjustable_crate.storageSpace": "Spazio di Immagazzinamento", "create.gui.stockpile_switch.title": "Interruttore Accumulatore", @@ -691,11 +691,11 @@ "create.gui.sequenced_gearshift.instruction.wait": "Aspetta", "create.gui.sequenced_gearshift.instruction.wait.duration": "Durata", "create.gui.sequenced_gearshift.instruction.end": "Fine", - "create.gui.sequenced_gearshift.speed": "Velocità, Direzione", - "create.gui.sequenced_gearshift.speed.forward": "Velocità di ingresso, Avanti", - "create.gui.sequenced_gearshift.speed.forward_fast": "Doppia velocità, Avanti", - "create.gui.sequenced_gearshift.speed.back": "Velocità di ingresso, Invertita", - "create.gui.sequenced_gearshift.speed.back_fast": "Doppia velocità, Invertita", + "create.gui.sequenced_gearshift.speed": "Velocità, Direzione", + "create.gui.sequenced_gearshift.speed.forward": "Velocità di ingresso, Avanti", + "create.gui.sequenced_gearshift.speed.forward_fast": "Doppia velocità, Avanti", + "create.gui.sequenced_gearshift.speed.back": "Velocità di ingresso, Invertita", + "create.gui.sequenced_gearshift.speed.back_fast": "Doppia velocità, Invertita", "create.schematicAndQuill.dimensions": "Dimensione Schematica: %1$sx%2$sx%3$s", "create.schematicAndQuill.firstPos": "Prima posizione impostata.", @@ -733,7 +733,7 @@ "create.schematic.tool.move.description.2": "", "create.schematic.tool.move.description.3": "", "create.schematic.tool.movey.description.0": "Sposta la Schematica verticalmente.", - "create.schematic.tool.movey.description.1": "[CTRL]-Scorri per spostarla su/giù.", + "create.schematic.tool.movey.description.1": "[CTRL]-Scorri per spostarla su/giù.", "create.schematic.tool.movey.description.2": "", "create.schematic.tool.movey.description.3": "", "create.schematic.tool.rotate.description.0": "Ruota la Schematica attorno al suo centro.", @@ -742,7 +742,7 @@ "create.schematic.tool.rotate.description.3": "", "create.schematic.tool.print.description.0": "Posiziona istantaneamente la struttura nel mondo.", "create.schematic.tool.print.description.1": "[Clic-Destro] per confermare la posizione corrente.", - "create.schematic.tool.print.description.2": "Questo strumento è solo per la modalità creativa.", + "create.schematic.tool.print.description.2": "Questo strumento è solo per la modalità creativa.", "create.schematic.tool.print.description.3": "", "create.schematic.tool.flip.description.0": "Capovolge la schematica lungo la faccia selezionata.", "create.schematic.tool.flip.description.1": "Indica la schematica e [CTRL]-Scorri per capovolgerla.", @@ -750,8 +750,8 @@ "create.schematic.tool.flip.description.3": "", "create.schematics.synchronizing": "Sincronizzazione...", - "create.schematics.uploadTooLarge": "La schematica è troppo grande.", - "create.schematics.maxAllowedSize": "La dimensione massima consentita del file schematica è:", + "create.schematics.uploadTooLarge": "La schematica è troppo grande.", + "create.schematics.maxAllowedSize": "La dimensione massima consentita del file schematica è:", "create.gui.schematicTable.title": "Banco Schematico", "create.gui.schematicTable.refresh": "UNLOCALIZED: Refresh Files", @@ -773,15 +773,6 @@ "create.gui.schematicannon.option.replaceWithAny": "Sostituisci Solidi con Qualsiasi", "create.gui.schematicannon.option.replaceWithEmpty": "Sostituisci Solidi con il Vuoto", "create.gui.schematicannon.option.skipMissing": "Salta i Blocchi Mancanti", -<<<<<<< HEAD - "create.gui.schematicannon.option.skipTileEntities": "Proteggi i Blocchi Entità", - "create.gui.schematicannon.option.skipMissing.description": "Se il cannone non riesce a trovare un blocco richiesto per il posizionamento, continuerà nella posizione successiva.", - "create.gui.schematicannon.option.skipTileEntities.description": "Il cannone eviterà di sostituire i blocchi di dati come bauli.", - "create.gui.schematicannon.option.dontReplaceSolid.description": "Il cannone non sostituirà mai alcun blocco Solido nella sua area di lavoro, solo non solidi e aria.", - "create.gui.schematicannon.option.replaceWithSolid.description": "Il cannone sostituirà i blocchi solidi nella sua area di lavoro se lo schema contiene un blocco solido nella posizione.", - "create.gui.schematicannon.option.replaceWithAny.description": "Il cannone sostituirà i blocchi solidi nella sua area di lavoro se lo schema contiene qualche blocco nella posizione.", - "create.gui.schematicannon.option.replaceWithEmpty.description": "Il cannone eliminerà tutti i blocchi nell'area di lavoro, compresi quelli sostituiti dal aria.", -======= "create.gui.schematicannon.option.skipTileEntities": "Proteggi i Blocchi Entità", "create.gui.schematicannon.slot.gunpowder": "UNLOCALIZED: Add gunpowder to fuel the cannon", "create.gui.schematicannon.slot.listPrinter": "UNLOCALIZED: Place books here to print a Checklist for your Schematic", @@ -792,7 +783,6 @@ "create.gui.schematicannon.option.replaceWithSolid.description": "Il cannone sostituirà i blocchi solidi nella sua area di lavoro se lo schema contiene un blocco solido nella posizione.", "create.gui.schematicannon.option.replaceWithAny.description": "Il cannone sostituirà i blocchi solidi nella sua area di lavoro se lo schema contiene qualche blocco nella posizione.", "create.gui.schematicannon.option.replaceWithEmpty.description": "Il cannone eliminerà tutti i blocchi nell'area di lavoro, compresi quelli sostituiti dal aria.", ->>>>>>> mc1.15/dev "create.schematicannon.status.idle": "Inattivo", "create.schematicannon.status.ready": "Pronto", @@ -801,7 +791,7 @@ "create.schematicannon.status.paused": "In Pausa", "create.schematicannon.status.stopped": "Fermato", "create.schematicannon.status.noGunpowder": "Niente Polvere da sparo", - "create.schematicannon.status.targetNotLoaded": "Il Blocco non è Caricato", + "create.schematicannon.status.targetNotLoaded": "Il Blocco non è Caricato", "create.schematicannon.status.targetOutsideRange": "Obbiettivo Troppo Lontano", "create.schematicannon.status.searching": "Ricercando", "create.schematicannon.status.skipping": "Saltando", @@ -821,23 +811,6 @@ "create.gui.filter.ignore_data": "Ignora Dati", "create.gui.filter.ignore_data.description": "Gli oggetti corrispondono indipendentemente dai loro attributi.", -<<<<<<< HEAD - "create.item_attributes.placeable": "è posizionabile", - "create.item_attributes.consumable": "può essere mangiato", - "create.item_attributes.smeltable": "può essere Fuso", - "create.item_attributes.washable": "può essere Lavato", - "create.item_attributes.smokable": "può essere Affumicato", - "create.item_attributes.blastable": "è fondibile in un Forno fusorio", - "create.item_attributes.enchanted": "è incantato", - "create.item_attributes.damaged": "è danneggiato", - "create.item_attributes.badly_damaged": "è gravemente danneggiato", - "create.item_attributes.not_stackable": "non impilabile", - "create.item_attributes.equipable": "può essere equipaggiato", - "create.item_attributes.furnace_fuel": "è il combustibile della fornace", - "create.item_attributes.in_tag": "è etichettato %1$s", - "create.item_attributes.in_item_group": "appartiene a %1$s", - "create.item_attributes.added_by": "è stato aggiunto da %1$s", -======= "create.item_attributes.placeable": "è posizionabile", "create.item_attributes.placeable.inverted": "UNLOCALIZED: is not placeable", "create.item_attributes.consumable": "può essere mangiato", @@ -870,7 +843,6 @@ "create.item_attributes.in_item_group.inverted": "UNLOCALIZED: is not in group '%1$s'", "create.item_attributes.added_by": "è stato aggiunto da %1$s", "create.item_attributes.added_by.inverted": "UNLOCALIZED: was not added by %1$s", ->>>>>>> mc1.15/dev "create.gui.attribute_filter.no_selected_attributes": "Nessun attributo selezionato", "create.gui.attribute_filter.selected_attributes": "Attributi selezionati:", @@ -888,7 +860,7 @@ "create.tooltip.holdKeyOrKey": "Premi [%1$s] o [%2$s]", "create.tooltip.keyShift": "Shift", "create.tooltip.keyCtrl": "Ctrl", - "create.tooltip.speedRequirement": "Velocità Richiesta: %1$s", + "create.tooltip.speedRequirement": "Velocità Richiesta: %1$s", "create.tooltip.speedRequirement.none": "Nessuna", "create.tooltip.speedRequirement.medium": "Moderata", "create.tooltip.speedRequirement.high": "Veloce", @@ -897,7 +869,7 @@ "create.tooltip.stressImpact.medium": "Moderato", "create.tooltip.stressImpact.high": "Alto", "create.tooltip.stressImpact.overstressed": "Sovrastressato", - "create.tooltip.capacityProvided": "Capacità dello Stress: %1$s", + "create.tooltip.capacityProvided": "Capacità dello Stress: %1$s", "create.tooltip.capacityProvided.low": "Piccola", "create.tooltip.capacityProvided.medium": "Media", "create.tooltip.capacityProvided.high": "Grande", @@ -933,10 +905,10 @@ "create.gui.config.overlay8": "UNLOCALIZED: to reset to the default position", "create.command.killTPSCommand": "killtps", - "create.command.killTPSCommand.status.slowed_by.0": "[Create]: Il tick del server è attualmente rallentato di %s ms :o", - "create.command.killTPSCommand.status.slowed_by.1": "[Create]: Il tick del server è ora rallentato di %s ms >:)", - "create.command.killTPSCommand.status.slowed_by.2": "[Create]: Il tick del server è tornato alla velocità normale :D", - "create.command.killTPSCommand.status.usage.0": "[Create]: usa /killtps per riportare il tick del server alla velocità normale", + "create.command.killTPSCommand.status.slowed_by.0": "[Create]: Il tick del server è attualmente rallentato di %s ms :o", + "create.command.killTPSCommand.status.slowed_by.1": "[Create]: Il tick del server è ora rallentato di %s ms >:)", + "create.command.killTPSCommand.status.slowed_by.2": "[Create]: Il tick del server è tornato alla velocità normale :D", + "create.command.killTPSCommand.status.usage.0": "[Create]: usa /killtps per riportare il tick del server alla velocità normale", "create.command.killTPSCommand.status.usage.1": "[Create]: usa /killtps avvia per rallentare artificialmente il tick del server", "create.command.killTPSCommand.argument.tickTime": "tickTime", @@ -1025,7 +997,7 @@ "item.create.schematic.tooltip": "SCHEMATICA", "item.create.schematic.tooltip.summary": "Contiene una struttura da posizionare e collocare nel mondo. Posiziona l'ologramma come desiderato e usa un _Cannoneschematico_ per costruirla.", "item.create.schematic.tooltip.condition1": "Quando Tenuto", - "item.create.schematic.tooltip.behaviour1": "Può essere posizionato utilizzando gli Strumenti sullo Schermo.", + "item.create.schematic.tooltip.behaviour1": "Può essere posizionato utilizzando gli Strumenti sullo Schermo.", "item.create.schematic.tooltip.control1": "Clic-Destro da Accovacciato", "item.create.schematic.tooltip.action1": "Apre un'_Interfaccia_ per l'immissione di _Coordinate_ esatte.", @@ -1053,19 +1025,19 @@ "block.create.schematic_table.tooltip.behaviour1": "Carica un file selezionato dalla cartella Schematics.", "block.create.shaft.tooltip": "ALBERO", - "block.create.shaft.tooltip.summary": "_Rotazione_ _Relè_ in linea retta.", + "block.create.shaft.tooltip.summary": "_Rotazione_ _Relè_ in linea retta.", "block.create.cogwheel.tooltip": "RUOTA DENTATA", - "block.create.cogwheel.tooltip.summary": "_Rotazione_ _Relè_ in linea retta e su _Ruote_ _Dentate_ adiacenti.", + "block.create.cogwheel.tooltip.summary": "_Rotazione_ _Relè_ in linea retta e su _Ruote_ _Dentate_ adiacenti.", "block.create.large_cogwheel.tooltip": "RUOTA DENTATA GRANDE", - "block.create.large_cogwheel.tooltip.summary": "Una versione più grande della _Ruota_ _Dentata_, consente di _modificare_ la _Velocità_ _di_ _Rotazione_ quando è collegato alla sua controparte più piccola.", + "block.create.large_cogwheel.tooltip.summary": "Una versione più grande della _Ruota_ _Dentata_, consente di _modificare_ la _Velocità_ _di_ _Rotazione_ quando è collegato alla sua controparte più piccola.", "block.create.encased_shaft.tooltip": "ALBERO INCASSATO", - "block.create.encased_shaft.tooltip.summary": "_Rotazione_ _Relè_ in linea retta. Adatto per propagare la rotazione attraverso le pareti.", + "block.create.encased_shaft.tooltip.summary": "_Rotazione_ _Relè_ in linea retta. Adatto per propagare la rotazione attraverso le pareti.", "block.create.gearbox.tooltip": "RIDUTTORE", - "block.create.gearbox.tooltip.summary": "_Rotazione_ _Relè_ in _quatro_ _direzioni_ Inverte le connessioni diritte.", + "block.create.gearbox.tooltip.summary": "_Rotazione_ _Relè_ in _quatro_ _direzioni_ Inverte le connessioni diritte.", "item.create.vertical_gearbox.tooltip": "UNLOCALIZED: VERTICAL GEARBOX", "item.create.vertical_gearbox.tooltip.summary": "UNLOCALIZED: _Relays_ _Rotation_ in _four_ _directions_ Reverses straight connections.", @@ -1081,17 +1053,17 @@ "block.create.clutch.tooltip.behaviour1": "_Interrompe_ il trasferimento della rotazione dall'altro lato.", "block.create.encased_belt.tooltip": "NASTRO INCASSATO", - "block.create.encased_belt.tooltip.summary": "_Rotazione_ _Relè_ attraverso il suo blocco attaccato ai _Nastri_ _Incassati_", + "block.create.encased_belt.tooltip.summary": "_Rotazione_ _Relè_ attraverso il suo blocco attaccato ai _Nastri_ _Incassati_", "block.create.encased_belt.tooltip.condition1": "Quando Connesso", - "block.create.encased_belt.tooltip.behaviour1": "I blocchi collegati avranno la _stessa_ _velocità_ _di_ _rotazione_ e direzione esatte. Non devono affrontare allo stesso modo.", + "block.create.encased_belt.tooltip.behaviour1": "I blocchi collegati avranno la _stessa_ _velocità_ _di_ _rotazione_ e direzione esatte. Non devono affrontare allo stesso modo.", "block.create.adjustable_pulley.tooltip": "PULEGGIA ANALOGICA", - "block.create.adjustable_pulley.tooltip.summary": "_Rotazione_ _Relè_ attraverso il suo blocco attaccato ai _Nastri_ _Incassati_. I nastri incassati attaccati _ruoteranno_ _più_ _velocemente_ in base al _segnale_ _analogico_ _di_ _redstone_ ricevuto da questo blocco.", + "block.create.adjustable_pulley.tooltip.summary": "_Rotazione_ _Relè_ attraverso il suo blocco attaccato ai _Nastri_ _Incassati_. I nastri incassati attaccati _ruoteranno_ _più_ _velocemente_ in base al _segnale_ _analogico_ _di_ _redstone_ ricevuto da questo blocco.", "block.create.adjustable_pulley.tooltip.condition1": "Controllo Redstone", - "block.create.adjustable_pulley.tooltip.behaviour1": "Senza un segnale, _non_ _accelererà_ i nastri collegati. Con un segnale a piena forza collegato al nastro, la velocità _raddoppia_.", + "block.create.adjustable_pulley.tooltip.behaviour1": "Senza un segnale, _non_ _accelererà_ i nastri collegati. Con un segnale a piena forza collegato al nastro, la velocità _raddoppia_.", "item.create.belt_connector.tooltip": "NASTRO MECCANICO", - "item.create.belt_connector.tooltip.summary": "Collega due o più _Alberi_ con un _Nastro_ _Meccanico_. Gli alberi collegati avranno la stessa velocità e direzione di rotazione esatte. Il Nastro può fungere da _Trasportatore_ per _Oggetti_ ed _Entità_.", + "item.create.belt_connector.tooltip.summary": "Collega due o più _Alberi_ con un _Nastro_ _Meccanico_. Gli alberi collegati avranno la stessa velocità e direzione di rotazione esatte. Il Nastro può fungere da _Trasportatore_ per _Oggetti_ ed _Entità_.", "item.create.belt_connector.tooltip.control1": "Clic-Destro sui Alberi", "item.create.belt_connector.tooltip.action1": "Seleziona l'albero come una puleggia del Nastro. Entrambi gli Alberi selezionati devono _allinearsi_ _Verticalmente_, _Orizzontalmente_, o _Diagonalmente_ verso la direzione del Nastro.", "item.create.belt_connector.tooltip.control2": "Clic-Destro da Accovacciato", @@ -1100,12 +1072,12 @@ "item.create.goggles.tooltip": "OCCHIALI DA INGEGNERE", "item.create.goggles.tooltip.summary": "Un paio di occhiali per migliorare la tua visione con utili _informazioni_ _cinetiche_.", "item.create.goggles.tooltip.condition1": "Quando indossati", - "item.create.goggles.tooltip.behaviour1": "Mostra gli _indicatori_ _colorati_ corrispondenti al _Livello_ _di_ _Velocità_ di un componente cinetico posizionato, nonché all'_Impatto_ _dello_ _Stress_ e la capacità dei singoli componenti.", + "item.create.goggles.tooltip.behaviour1": "Mostra gli _indicatori_ _colorati_ corrispondenti al _Livello_ _di_ _Velocità_ di un componente cinetico posizionato, nonché all'_Impatto_ _dello_ _Stress_ e la capacità dei singoli componenti.", "item.create.goggles.tooltip.condition2": "Quando si guarda il calibro", - "item.create.goggles.tooltip.behaviour2": "Mostra informazioni dettagliate sulla _Velocità_ o lo _Stress_ della rete a cui è collegato il misuratore.", + "item.create.goggles.tooltip.behaviour2": "Mostra informazioni dettagliate sulla _Velocità_ o lo _Stress_ della rete a cui è collegato il misuratore.", "item.create.wrench.tooltip": "CHIAVE INGLESE", - "item.create.wrench.tooltip.summary": "Uno strumento utile per lavorare su congegni cinetici. Può essere usato per _Ruotare_, _Smontare_ e _Configurare_ i componenti.", + "item.create.wrench.tooltip.summary": "Uno strumento utile per lavorare su congegni cinetici. Può essere usato per _Ruotare_, _Smontare_ e _Configurare_ i componenti.", "item.create.wrench.tooltip.control1": "Clic-Destro su un blocco cinetico", "item.create.wrench.tooltip.action1": "_Ruota_ _i_ _componenti_ verso o lontano dalla faccia con cui hai interagito.", "item.create.wrench.tooltip.control2": "Clic-Destro da Accovacciato", @@ -1118,23 +1090,23 @@ "block.create.water_wheel.tooltip.summary": "Fornisce un _Forza_ _di_ _Rotazione_ prelevata da correnti d'_Acqua_ _Adiacenti_.", "block.create.encased_fan.tooltip": "VENTILATORE INCASSATO", - "block.create.encased_fan.tooltip.summary": "Converte la _Forza_ _di_ _Rotazione_ in _Correnti_ _d'Aria_ e ritorno. Ha una varietà di usi.", + "block.create.encased_fan.tooltip.summary": "Converte la _Forza_ _di_ _Rotazione_ in _Correnti_ _d'Aria_ e ritorno. Ha una varietà di usi.", "block.create.encased_fan.tooltip.condition1": "Quando Alimentato da Redstone", - "block.create.encased_fan.tooltip.behaviour1": "Fornisce _forza_ _di_ _rotazione_ da qualsiasi _fonte_ _di_ _calore_ immediatamente al di sotto di sé. Il ventilatore deve essere rivolto verso il basso.", + "block.create.encased_fan.tooltip.behaviour1": "Fornisce _forza_ _di_ _rotazione_ da qualsiasi _fonte_ _di_ _calore_ immediatamente al di sotto di sé. Il ventilatore deve essere rivolto verso il basso.", "block.create.encased_fan.tooltip.condition2": "Quando in Ruotazione", - "block.create.encased_fan.tooltip.behaviour2": "_Spinge_ o _Tira_ Entità, a seconda della velocità di Rotazione in entrata.", + "block.create.encased_fan.tooltip.behaviour2": "_Spinge_ o _Tira_ Entità, a seconda della velocità di Rotazione in entrata.", "block.create.encased_fan.tooltip.condition3": "Quando soffia attraverso blocchi speciali", - "block.create.encased_fan.tooltip.behaviour3": "_Liquidi_ e particelle di _Fuoco_ vengono emessi nel flusso d'aria. Questo può essere usato per _elaborare_ _oggetti_.", + "block.create.encased_fan.tooltip.behaviour3": "_Liquidi_ e particelle di _Fuoco_ vengono emessi nel flusso d'aria. Questo può essere usato per _elaborare_ _oggetti_.", "block.create.nozzle.tooltip": "UGELLO", - "block.create.nozzle.tooltip.summary": "Attacca la parte anteriore di un _Ventilatore_ _Incassato_ per distribuire il suo effetto sulle Entità in _tutte_ _le_ _direzioni_.", + "block.create.nozzle.tooltip.summary": "Attacca la parte anteriore di un _Ventilatore_ _Incassato_ per distribuire il suo effetto sulle Entità in _tutte_ _le_ _direzioni_.", "block.create.hand_crank.tooltip": "MANOVELLA", "block.create.hand_crank.tooltip.summary": "Una semplice _fonte_ di _Forza_ _di_ _Rotazione_ che richiede l'interazione dei giocatori.", "block.create.hand_crank.tooltip.condition1": "Quando usata", "block.create.hand_crank.tooltip.behaviour1": "Fornisce una _Forza_ _di_ _Rotazione_ a un aggeggio attaccato. _Accovacciati_ _per_ _invertire_ la rotazione.", - "block.create.cuckoo_clock.tooltip": "OROLOGIO A CUCÙ", + "block.create.cuckoo_clock.tooltip": "OROLOGIO A CUCÙ", "block.create.cuckoo_clock.tooltip.summary": "Artigianato raffinato per _decorare_ uno spazio e _tener_ _traccia_ _del_ _tempo_.", "block.create.cuckoo_clock.tooltip.condition1": "Quando Ruotato", "block.create.cuckoo_clock.tooltip.behaviour1": "Mostra l'_ora_ _corrente_ e suona una melodia due volte al giorno. Si _attiva_ una volta a mezzogiorno e al crepuscolo, non appena i _giocatori_ _possono_ _dormire_.", @@ -1143,7 +1115,7 @@ "block.create.turntable.tooltip.summary": "Trasforma la _Forza_ _di_ _Rotazione_ in una Raffinata Cinetosi.", "block.create.millstone.tooltip": "MACINA", - "block.create.millstone.tooltip.summary": "Un componente cinetico adatto per la _rettifica_ dei _materiali_ inseriti. Può essere alimentato da una ruota dentata adiacente o collegandosi all'albero nella parte inferiore. I risultati devono essere estratti dal componente.", + "block.create.millstone.tooltip.summary": "Un componente cinetico adatto per la _rettifica_ dei _materiali_ inseriti. Può essere alimentato da una ruota dentata adiacente o collegandosi all'albero nella parte inferiore. I risultati devono essere estratti dal componente.", "block.create.millstone.tooltip.condition1": "Quando Ruotato", "block.create.millstone.tooltip.behaviour1": "Inizia ad applicare le _ricette_ di _fresatura_ a tutti gli elementi inseriti dal lato o dalla parte superiore del blocco.", "block.create.millstone.tooltip.condition2": "Quando Toccato con Clic-Destro", @@ -1152,7 +1124,7 @@ "block.create.crushing_wheel.tooltip": "RUOTA DI FRANTUMAZIONE", "block.create.crushing_wheel.tooltip.summary": "Grandi ruote girevoli che _rompono_ qualsiasi cosa.", "block.create.crushing_wheel.tooltip.condition1": "Se collegata ad altre ruote di frantumazione", - "block.create.crushing_wheel.tooltip.behaviour1": "Forma una frantumatrice per la lavorazione di una varietà di cose. I denti delle ruote devono connettersi e muoversi con la _stessa_ _velocità_ in _direzioni_ _opposte_.", + "block.create.crushing_wheel.tooltip.behaviour1": "Forma una frantumatrice per la lavorazione di una varietà di cose. I denti delle ruote devono connettersi e muoversi con la _stessa_ _velocità_ in _direzioni_ _opposte_.", "block.create.mechanical_press.tooltip": "PRESSA MECCANICA", "block.create.mechanical_press.tooltip.summary": "Un pistone potente per comprimere gli oggetti sottostanti. Richiede una _Forza_ _di_ _Rotazione_ costante.", @@ -1183,12 +1155,12 @@ "block.create.mechanical_mixer.tooltip.condition1": "Quando sopra a una Bacinella", "block.create.mechanical_mixer.tooltip.behaviour1": "Inizia a mescolare gli oggetti nella bacinella ogni volta che sono presenti tutti gli ingredienti necessari.", "block.create.mechanical_mixer.tooltip.condition2": "Se utilizzato con la Chiave Inglese", - "block.create.mechanical_mixer.tooltip.behaviour2": "Configura la quantità minima di _ingredienti_ _totali_ per le ricette applicate. Utilizzare questa opzione per _escludere_ _ricette_ _indesiderate_ con ingredienti simili o meno.", + "block.create.mechanical_mixer.tooltip.behaviour2": "Configura la quantità minima di _ingredienti_ _totali_ per le ricette applicate. Utilizzare questa opzione per _escludere_ _ricette_ _indesiderate_ con ingredienti simili o meno.", "block.create.mechanical_crafter.tooltip": "COSTRUTTORE MECCANICO", "block.create.mechanical_crafter.tooltip.summary": "Un assemblatore cinetico per _automatizzare_ qualsiasi ricetta di _creazione_ _modellata_. Posiziona i _multipli_ _in_ _una_ _griglia_ corrispondente alla tua ricetta, e _disponi_ _i_ _loro_ _nastri_ per creare un _flusso_ che esce dalla griglia su uno degli costruttori.", "block.create.mechanical_crafter.tooltip.condition1": "Quando ruotato", - "block.create.mechanical_crafter.tooltip.behaviour1": "_Inizia_ _il_ _processo_ _di_ _creazione_ non appena a tutti i costruttori della griglia è stato assegnato un oggetto.", + "block.create.mechanical_crafter.tooltip.behaviour1": "_Inizia_ _il_ _processo_ _di_ _creazione_ non appena a tutti i costruttori della griglia è stato assegnato un oggetto.", "block.create.mechanical_crafter.tooltip.condition2": "UNLOCALIZED: On Redstone Pulse", "block.create.mechanical_crafter.tooltip.behaviour2": "UNLOCALIZED: _Forces_ the start of the _crafting_ _process_ with all currently given _items_ in the grid.", "block.create.mechanical_crafter.tooltip.control1": "Quando Strappato sul Davanti", @@ -1199,32 +1171,32 @@ "block.create.furnace_engine.tooltip": "MOTORE FORNACE", "block.create.furnace_engine.tooltip.summary": "Una potente fonte di _Potenza_ _Rotazionale_ che richiede un _forno_ _funzionante_ per funzionare.", "block.create.furnace_engine.tooltip.condition1": "Se Collegato alla Fornace Accesa", - "block.create.furnace_engine.tooltip.behaviour1": "_Inizia_ _a_ _alimentare_ un _Volano_ posto di fronte (a 1m di distanza). Utilizza un Forno Fusorio per velocità più elevate.", + "block.create.furnace_engine.tooltip.behaviour1": "_Inizia_ _a_ _alimentare_ un _Volano_ posto di fronte (a 1m di distanza). Utilizza un Forno Fusorio per velocità più elevate.", "block.create.flywheel.tooltip": "VOLANO", - "block.create.flywheel.tooltip.summary": "Una grande ruota di metallo per _imbrigliare_ _e_ _stabilizzare_ la forza generata da un _motore_ _collegato_. I volani si collegano ai motori se sono a _1m_ di distanza e ad un _angolo_ _di_ _90°_ l'uno dall'altro.", + "block.create.flywheel.tooltip.summary": "Una grande ruota di metallo per _imbrigliare_ _e_ _stabilizzare_ la forza generata da un _motore_ _collegato_. I volani si collegano ai motori se sono a _1m_ di distanza e ad un _angolo_ _di_ _90°_ l'uno dall'altro.", "block.create.flywheel.tooltip.condition1": "Se collegato a un Motore in Funzione", - "block.create.flywheel.tooltip.behaviour1": "Fornisce la _Forza_ _di_ _Rotazione_ a un aggeggio connesso in base alla forza e alla velocità del generatore.", + "block.create.flywheel.tooltip.behaviour1": "Fornisce la _Forza_ _di_ _Rotazione_ a un aggeggio connesso in base alla forza e alla velocità del generatore.", "block.create.portable_storage_interface.tooltip": "INTERFACCIA DI ARCHIVIAZIONE PORTATILE", "block.create.portable_storage_interface.tooltip.summary": "Un punto di interscambio portatile per _spostare_ _oggetti_ da e verso una _struttura_ mossa da un pistone, supporto, carrello da miniera o puleggia.", "block.create.portable_storage_interface.tooltip.condition1": "In Movimento", - "block.create.portable_storage_interface.tooltip.behaviour1": "Interagisce con i _traspositori_ fissi in modo tale che i traspositori _rivolti_ _lontano_ dall'interfaccia _estraggano_ _gli_ _oggetti_, e i traspositori che puntano l'interfaccia _inseriranno_ _gli_ _oggetti_ dall'inventario allegato. Il congegno si arresterà brevemente quando gli oggetti vengono scambiati.", + "block.create.portable_storage_interface.tooltip.behaviour1": "Interagisce con i _traspositori_ fissi in modo tale che i traspositori _rivolti_ _lontano_ dall'interfaccia _estraggano_ _gli_ _oggetti_, e i traspositori che puntano l'interfaccia _inseriranno_ _gli_ _oggetti_ dall'inventario allegato. Il congegno si arresterà brevemente quando gli oggetti vengono scambiati.", - "block.create.rotation_speed_controller.tooltip": "REGOLATORE DI VELOCITÀ DI ROTAZIONE", - "block.create.rotation_speed_controller.tooltip.summary": "Un _relè_ _configurabile_ in grado di accelerare o rallentare il componente selezionato a qualsiasi velocità desiderata.", + "block.create.rotation_speed_controller.tooltip": "REGOLATORE DI VELOCITÀ DI ROTAZIONE", + "block.create.rotation_speed_controller.tooltip.summary": "Un _relè_ _configurabile_ in grado di accelerare o rallentare il componente selezionato a qualsiasi velocità desiderata.", "block.create.rotation_speed_controller.tooltip.condition1": "Se collegato a una Ruota Dentata Grande", - "block.create.rotation_speed_controller.tooltip.behaviour1": "Inoltra la forza di rotazione in entrata alla ruota, cercando di far _corrispondere_ la _velocità_ con cui è configurata come obbiettivo. La ruota dentata deve essere fissata sulla parte superiore del controllo.", + "block.create.rotation_speed_controller.tooltip.behaviour1": "Inoltra la forza di rotazione in entrata alla ruota, cercando di far _corrispondere_ la _velocità_ con cui è configurata come obbiettivo. La ruota dentata deve essere fissata sulla parte superiore del controllo.", "block.create.mechanical_piston.tooltip": "PISTOME MECCANICO", - "block.create.mechanical_piston.tooltip.summary": "Una versione più avanzata del _Pistone_. Usa la _Forza_ _di_ _Rotazione_ per spostare con precisione le strutture attaccate. I _Pali_ _di_ _Estensione_ _del_ _Pistone_ nella parte posteriore definiscono la _Gamma_ di questo dispositivo. Senza estensioni, il pistone non si muoverà. Usa _Telai_ o _Blocchi_ _di_ _Slime_ per muovere più di una singola linea di blocchi.", + "block.create.mechanical_piston.tooltip.summary": "Una versione più avanzata del _Pistone_. Usa la _Forza_ _di_ _Rotazione_ per spostare con precisione le strutture attaccate. I _Pali_ _di_ _Estensione_ _del_ _Pistone_ nella parte posteriore definiscono la _Gamma_ di questo dispositivo. Senza estensioni, il pistone non si muoverà. Usa _Telai_ o _Blocchi_ _di_ _Slime_ per muovere più di una singola linea di blocchi.", "block.create.mechanical_piston.tooltip.condition1": "Quando Ruotato", - "block.create.mechanical_piston.tooltip.behaviour1": "Inizia a spostare la struttura collegata. La Velocità e la direzione sono correlate alla Velocità di Rotazione in entrata.", + "block.create.mechanical_piston.tooltip.behaviour1": "Inizia a spostare la struttura collegata. La Velocità e la direzione sono correlate alla Velocità di Rotazione in entrata.", "block.create.sticky_mechanical_piston.tooltip": "PISTOME MECCANICO APPICCICOSO", - "block.create.sticky_mechanical_piston.tooltip.summary": "Una versione più avanzata del _Pistone_ _Appiccicoso_. Usa la _Forza_ _di_ _Rotazione_ per spostare con precisione le strutture attaccate. I _Pali_ _di_ _Estensione_ _del_ _Pistone_ nella parte posteriore definiscono la _Gamma_ di questo dispositivo. Senza estensioni, il pistone non si muoverà. Usa _Telai_ o _Blocchi_ _di_ _Slime_ per muovere più di una singola linea di blocchi.", + "block.create.sticky_mechanical_piston.tooltip.summary": "Una versione più avanzata del _Pistone_ _Appiccicoso_. Usa la _Forza_ _di_ _Rotazione_ per spostare con precisione le strutture attaccate. I _Pali_ _di_ _Estensione_ _del_ _Pistone_ nella parte posteriore definiscono la _Gamma_ di questo dispositivo. Senza estensioni, il pistone non si muoverà. Usa _Telai_ o _Blocchi_ _di_ _Slime_ per muovere più di una singola linea di blocchi.", "block.create.sticky_mechanical_piston.tooltip.condition1": "Quando Ruotato", - "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Inizia a spostare la struttura collegata. La Velocità e la direzione sono correlate alla Velocità di Rotazione in entrata.", + "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Inizia a spostare la struttura collegata. La Velocità e la direzione sono correlate alla Velocità di Rotazione in entrata.", "block.create.piston_extension_pole.tooltip": "PALO PISTOME", "block.create.piston_extension_pole.tooltip.summary": "Estende la gamma dei _Pistoni_ _Meccanici_.", @@ -1234,19 +1206,19 @@ "block.create.mechanical_bearing.tooltip": "SUPPORTO MECCANICO", "block.create.mechanical_bearing.tooltip.summary": "Utilizzato per ruotare _strutture_ _grandi_ o sfruttare la _Forza_ _di_ _Rotazione_ dal vento.", "block.create.mechanical_bearing.tooltip.condition1": "Quando Ruotato", - "block.create.mechanical_bearing.tooltip.behaviour1": "Inizia a ruotare i blocchi collegati. Usa _Telai_ o _Blocchi_ _di_ _Slime_ per spostare più di un singolo blocco.", + "block.create.mechanical_bearing.tooltip.behaviour1": "Inizia a ruotare i blocchi collegati. Usa _Telai_ o _Blocchi_ _di_ _Slime_ per spostare più di un singolo blocco.", "block.create.mechanical_bearing.tooltip.condition2": "Quando Alimentato da Redstone", "block.create.mechanical_bearing.tooltip.behaviour2": "Inizia a fornire _Forza_ _di_ _Rotazione_ generata dalla rotazione della struttura collegata. La struttura deve includere _Blocchi_ _di_ _Vela_ adatti (attualmente qualsiasi blocco di lana).", "block.create.clockwork_bearing.tooltip": "SUPPORTO DEL OROLOGIO", "block.create.clockwork_bearing.tooltip.summary": "Una versione avanzata del _Supporto_ _Meccanico_ per ruotare fino a due _lancette_ in base al _tempo_ _di_ _gioco_ corrente.", "block.create.clockwork_bearing.tooltip.condition1": "Quando Ruotato", - "block.create.clockwork_bearing.tooltip.behaviour1": "Inizia a ruotare la Struttura collegata verso l'_ora_ _corrente_. Se è presente una seconda struttura, fungerà da _lancetta_ _dei_ _minuti_.", + "block.create.clockwork_bearing.tooltip.behaviour1": "Inizia a ruotare la Struttura collegata verso l'_ora_ _corrente_. Se è presente una seconda struttura, fungerà da _lancetta_ _dei_ _minuti_.", "block.create.sequenced_gearshift.tooltip": "CAMBIO SEQUENZIALE", - "block.create.sequenced_gearshift.tooltip.summary": "Un _componente_ _di_ _utilità_ _programmabile_, che può cambiare il suo _throughput_ _rotazionale_ secondo un massimo di _5_ _istruzioni_ _consecutive_. Utilizzalo per alimentare i Supporti Meccanici, Pistoni o Pulegge con un maggiore controllo sui tempi e sulla velocità. Può diventare meno preciso a velocità più elevate.", + "block.create.sequenced_gearshift.tooltip.summary": "Un _componente_ _di_ _utilità_ _programmabile_, che può cambiare il suo _throughput_ _rotazionale_ secondo un massimo di _5_ _istruzioni_ _consecutive_. Utilizzalo per alimentare i Supporti Meccanici, Pistoni o Pulegge con un maggiore controllo sui tempi e sulla velocità. Può diventare meno preciso a velocità più elevate.", "block.create.sequenced_gearshift.tooltip.condition1": "Quando alimentato da Redstone", - "block.create.sequenced_gearshift.tooltip.behaviour1": "_Inizia_ _l'esecuzione_ delle istruzioni programmate in base alla velocità in input.", + "block.create.sequenced_gearshift.tooltip.behaviour1": "_Inizia_ _l'esecuzione_ delle istruzioni programmate in base alla velocità in input.", "block.create.sequenced_gearshift.tooltip.condition2": "Quando Toccato con Clic-Destro", "block.create.sequenced_gearshift.tooltip.behaviour2": "Apre l'_Interfaccia_ _di_ _Configurazione_", @@ -1262,18 +1234,18 @@ "block.create.cart_assembler.tooltip.behaviour4": "UNLOCALIZED: _Disassembles_ _carts_ when _powered_.", "block.create.rope_pulley.tooltip": "PULEGGIA DELLA CORDA", - "block.create.rope_pulley.tooltip.summary": "Sposta i blocchi e le strutture collegati in verticale. Usa _Telai_ o _Blocchi_ _di_ _Slime_ per spostare più di un singolo blocco.", + "block.create.rope_pulley.tooltip.summary": "Sposta i blocchi e le strutture collegati in verticale. Usa _Telai_ o _Blocchi_ _di_ _Slime_ per spostare più di un singolo blocco.", "block.create.rope_pulley.tooltip.condition1": "Quando Ruotato", - "block.create.rope_pulley.tooltip.behaviour1": "Inizia a spostare la struttura collegata. La velocità e la direzione sono correlate alla Velocità di Rotazione in input.", + "block.create.rope_pulley.tooltip.behaviour1": "Inizia a spostare la struttura collegata. La velocità e la direzione sono correlate alla Velocità di Rotazione in input.", "block.create.linear_chassis.tooltip": "TELAIO LINEARE", "block.create.linear_chassis.tooltip.summary": "Un blocco base configurabile che collega le strutture per il movimento.", "block.create.linear_chassis.tooltip.condition1": "Quando Spostato", - "block.create.linear_chassis.tooltip.behaviour1": "_Sposta_ tutti i _Telai_ _attaccati_ con lo stesso orientamento e una colonna di Blocchi all'interno della sua gamma. I blocchi verranno tirati solo se la faccia del telaio è _Appiccicosa_ (Vedi con [Ctrl]).", + "block.create.linear_chassis.tooltip.behaviour1": "_Sposta_ tutti i _Telai_ _attaccati_ con lo stesso orientamento e una colonna di Blocchi all'interno della sua gamma. I blocchi verranno tirati solo se la faccia del telaio è _Appiccicosa_ (Vedi con [Ctrl]).", "block.create.linear_chassis.tooltip.condition2": "Con Chiave Inglese", "block.create.linear_chassis.tooltip.behaviour2": "Configura la _gamma_ per questo telaio. Premi CTRL per modificare anche la gamma di tutti i blocchi telaio collegati.", "block.create.linear_chassis.tooltip.control1": "Quando si fa Clic-Destro con la Palla di slime", - "block.create.linear_chassis.tooltip.action1": "Crea la faccia cliccata _Appiccicosa_. Quando viene spostato, il telaio tirerà i blocchi collegati, indipendentemente dalla direzione del movimento.", + "block.create.linear_chassis.tooltip.action1": "Crea la faccia cliccata _Appiccicosa_. Quando viene spostato, il telaio tirerà i blocchi collegati, indipendentemente dalla direzione del movimento.", "block.create.radial_chassis.tooltip": "TELAIO RADIALE", "block.create.radial_chassis.tooltip.summary": "Un blocco base configurabile che collega le strutture per il movimento.", @@ -1282,17 +1254,17 @@ "block.create.radial_chassis.tooltip.condition2": "Con Chiave Inglese", "block.create.radial_chassis.tooltip.behaviour2": "Configura la _gamma_ per questo telaio. Premi CTRL per modificare anche la gamma di tutti i blocchi telaio collegati.", "block.create.radial_chassis.tooltip.control1": "Quando si fa Clic-Destro con la Palla di slime", - "block.create.radial_chassis.tooltip.action1": "Crea la faccia cliccata _Appiccicosa_. Quando viene spostato, il telaio tirerà i blocchi collegati, indipendentemente dalla direzione del movimento.", + "block.create.radial_chassis.tooltip.action1": "Crea la faccia cliccata _Appiccicosa_. Quando viene spostato, il telaio tirerà i blocchi collegati, indipendentemente dalla direzione del movimento.", "block.create.mechanical_drill.tooltip": "TRAPANO MECCANICO", - "block.create.mechanical_drill.tooltip.summary": "Un dispositivo meccanico adatto per _rompere_ i _blocchi_. È mobile con _Pistoni_ o _Supporti_ _meccanici_.", + "block.create.mechanical_drill.tooltip.summary": "Un dispositivo meccanico adatto per _rompere_ i _blocchi_. È mobile con _Pistoni_ o _Supporti_ _meccanici_.", "block.create.mechanical_drill.tooltip.condition1": "Quando Ruotato", - "block.create.mechanical_drill.tooltip.behaviour1": "Funziona come un Rompi blocchi _stazionario_. Fa anche _male_ _alle_ _entità_ nella sua area effettiva", + "block.create.mechanical_drill.tooltip.behaviour1": "Funziona come un Rompi blocchi _stazionario_. Fa anche _male_ _alle_ _entità_ nella sua area effettiva", "block.create.mechanical_drill.tooltip.condition2": "In Movimento", "block.create.mechanical_drill.tooltip.behaviour2": "Rompe i blocchi con cui il trapano si scontra.", "block.create.mechanical_harvester.tooltip": "MIETITRICE MECCANICA", - "block.create.mechanical_harvester.tooltip.summary": "Una mietitrice meccanica adatta per l'automazione delle colture di medie dimensioni. È mobile con _Pistoni_ o _Supporti_ _Meccanici_.", + "block.create.mechanical_harvester.tooltip.summary": "Una mietitrice meccanica adatta per l'automazione delle colture di medie dimensioni. È mobile con _Pistoni_ o _Supporti_ _Meccanici_.", "block.create.mechanical_harvester.tooltip.condition1": "In Movimento", "block.create.mechanical_harvester.tooltip.behaviour1": "_Raccoglie_ tutte le _colture_ _mature_ con cui la lama si scontra e ripristina il loro stato iniziale di crescita.", @@ -1302,7 +1274,7 @@ "block.create.mechanical_plough.tooltip.behaviour1": "UNLOCALIZED: _Breaks_ _blocks_ which _cannot_ _be_ _collided_ with, such as torches, tracks or snow layers. _Applies_ its _motion_ to _entities_ without hurting them. _Tills_ _soil_ _blocks_ as though a Hoe would be used on them.", "block.create.mechanical_saw.tooltip": "SEGA MECCANICA", - "block.create.mechanical_saw.tooltip.summary": "Adatto per _tagliare_ _alberi_ in modo efficace e per _tagliare_ _blocchi_ nelle loro controparti carpentate. È mobile con _Pistoni_ o _Supporti_ _Meccanici_.", + "block.create.mechanical_saw.tooltip.summary": "Adatto per _tagliare_ _alberi_ in modo efficace e per _tagliare_ _blocchi_ nelle loro controparti carpentate. È mobile con _Pistoni_ o _Supporti_ _Meccanici_.", "block.create.mechanical_saw.tooltip.condition1": "Di fronte", "block.create.mechanical_saw.tooltip.behaviour1": "Applica le _Ricette_ di _Segatura_ e _Lavorazione_ _della_ _Pietra_ agli oggetti rilasciati o inseriti al suo interno. Quando sono possibili gli output, le scorre ciclicamente a meno che non sia assegnato un _filtro_.", "block.create.mechanical_saw.tooltip.condition2": "Di fronte in orizzontale", @@ -1320,13 +1292,13 @@ "block.create.stockpile_switch.tooltip.action1": "Apre l'_Interfaccia_ _di_ _Configurazione_.", "block.create.redstone_link.tooltip": "COLLEGAMENTO REDSTONE", - "block.create.redstone_link.tooltip.summary": "Endpoint per connessioni _Wireless_ _di_ _Redstone_. Le _Frequenze_ possono essere assegnate utilizzando qualsiasi oggetto. La gamma del segnale è limitata, sebbene ragionevolmente lontana.", + "block.create.redstone_link.tooltip.summary": "Endpoint per connessioni _Wireless_ _di_ _Redstone_. Le _Frequenze_ possono essere assegnate utilizzando qualsiasi oggetto. La gamma del segnale è limitata, sebbene ragionevolmente lontana.", "block.create.redstone_link.tooltip.condition1": "Quando Alimentato", - "block.create.redstone_link.tooltip.behaviour1": "La ricezione di collegamenti della stessa _Frequenza_ produrrà un segnale Redstone.", + "block.create.redstone_link.tooltip.behaviour1": "La ricezione di collegamenti della stessa _Frequenza_ produrrà un segnale Redstone.", "block.create.redstone_link.tooltip.control1": "Quando Clic-Destro su un oggetto", - "block.create.redstone_link.tooltip.action1": "Imposta la _Frequenza_ su quell'oggetto. È possibile utilizzare un totale di _due_ _oggetti_ _differenti_ in combinazione per definire una frequenza.", + "block.create.redstone_link.tooltip.action1": "Imposta la _Frequenza_ su quell'oggetto. È possibile utilizzare un totale di _due_ _oggetti_ _differenti_ in combinazione per definire una frequenza.", "block.create.redstone_link.tooltip.control2": "Clic-Destro da Accovacciato", - "block.create.redstone_link.tooltip.action2": "Alterna tra la modalità _Ricevitore_ e _Trasmettitore_.", + "block.create.redstone_link.tooltip.action2": "Alterna tra la modalità _Ricevitore_ e _Trasmettitore_.", "block.create.nixie_tube.tooltip": "UNLOCALIZED: NIXIE TUBE", "block.create.nixie_tube.tooltip.summary": "UNLOCALIZED: A fancy redstone-powered _Number_ _Display_ ranging from 0 to 15.", @@ -1334,14 +1306,14 @@ "block.create.nixie_tube.tooltip.behaviour1": "UNLOCALIZED: Shows the current redstone _Signal_ _Strength_ as its displayed value.", "block.create.redstone_contact.tooltip": "CONTATTO REDSTONE", - "block.create.redstone_contact.tooltip.summary": "Emette solo un segnale di pietrarossa in coppia. È mobile con _Pistoni_ o _Supporti_ _Meccanici_.", + "block.create.redstone_contact.tooltip.summary": "Emette solo un segnale di pietrarossa in coppia. È mobile con _Pistoni_ o _Supporti_ _Meccanici_.", "block.create.redstone_contact.tooltip.condition1": "Di fronte ad altri Contatti", "block.create.redstone_contact.tooltip.behaviour1": "Fornisce un _Segnale_ _Redstone_.", "block.create.redstone_contact.tooltip.condition2": "In Movimento", "block.create.redstone_contact.tooltip.behaviour2": "Attiva tutti i contatti fissi che passa.", "block.create.adjustable_crate.tooltip": "BAULE REGOLABILE", - "block.create.adjustable_crate.tooltip.summary": "Questo _Contenitore_ _di_ _Stoccaggio_ consente il controllo manuale sulla sua capacità. Può contenere fino a _16_ _Pile_ di qualsiasi oggetto. Supporta _Comparatori_ _Redstone_.", + "block.create.adjustable_crate.tooltip.summary": "Questo _Contenitore_ _di_ _Stoccaggio_ consente il controllo manuale sulla sua capacità. Può contenere fino a _16_ _Pile_ di qualsiasi oggetto. Supporta _Comparatori_ _Redstone_.", "block.create.adjustable_crate.tooltip.control1": "Quando Cliccato con Clic-Destro", "block.create.adjustable_crate.tooltip.action1": "Apre l'_Interfaccia_.", @@ -1351,14 +1323,14 @@ "block.create.creative_crate.tooltip.behaviour1": "UNLOCALIZED: Anything _extracting_ from this container will provide an _endless_ _supply_ of the item specified. Items _inserted_ into this crate will be _voided._", "block.create.deployer.tooltip": "INSTALLATORE", - "block.create.deployer.tooltip.summary": "_Punzoni_, _Usi_ e _Attivazioni_. Questa macchina proverà a _imitare_ un _giocatore_ il più possibile. Può _Prendere_ e _depositare_ _oggetti_ nell'_Inventario_ adiacente. Può essere assegnata una pila di oggetti come _filtro_.", + "block.create.deployer.tooltip.summary": "_Punzoni_, _Usi_ e _Attivazioni_. Questa macchina proverà a _imitare_ un _giocatore_ il più possibile. Può _Prendere_ e _depositare_ _oggetti_ nell'_Inventario_ adiacente. Può essere assegnata una pila di oggetti come _filtro_.", "block.create.deployer.tooltip.condition1": "Quando Ruotato", - "block.create.deployer.tooltip.behaviour1": "Allunga il braccio e si _attiva_ nello spazio di un blocco _2m_ _davanti_ a sé.", + "block.create.deployer.tooltip.behaviour1": "Allunga il braccio e si _attiva_ nello spazio di un blocco _2m_ _davanti_ a sé.", "block.create.deployer.tooltip.condition2": "Clic-Destro con la Chiave Inglese", - "block.create.deployer.tooltip.behaviour2": "Attiva / disattiva la modalità di perforazione. In _modalità_ _pugno_, l'Installatore tenterà di usare il suo oggetto per _rompere_ _blocchi_ o _ferire_ _entità_.", + "block.create.deployer.tooltip.behaviour2": "Attiva / disattiva la modalità di perforazione. In _modalità_ _pugno_, l'Installatore tenterà di usare il suo oggetto per _rompere_ _blocchi_ o _ferire_ _entità_.", "block.create.funnel.tooltip": "IMBUTO", - "block.create.funnel.tooltip.summary": "_Raccoglie_ _gli_ _oggetti_ _in_ _arrivo_ e li inserisce nell'_inventario_ allegato, se possibile. Può raccogliere oggetti nel _mondo_ e oggetti su un _nastro_.", + "block.create.funnel.tooltip.summary": "_Raccoglie_ _gli_ _oggetti_ _in_ _arrivo_ e li inserisce nell'_inventario_ allegato, se possibile. Può raccogliere oggetti nel _mondo_ e oggetti su un _nastro_.", "block.create.funnel.tooltip.condition1": "Tirare il Nastro passivamente", "block.create.funnel.tooltip.behaviour1": "Gli imbuti possono estrarre gli oggetti _dai_ _nastri_ quando vengono posizionati sopra di essi, lateralmente o alla fine. Quando viene eseguito il backup di un imbuto laterale, gli oggetti sul _nastro_ _non_ _si_ _arrestano_.", @@ -1370,20 +1342,20 @@ "block.create.belt_tunnel.tooltip.action2": "_Regola_ _le_ _finestre_ se il tunnel ha una finestra su quella faccia.", "block.create.brass_casing.tooltip": "INVOLUCRO DI OTTONE", - "block.create.brass_casing.tooltip.summary": "Involucro delle macchine robusto con una varietà di usi. Di sicuro per la decorazione.", + "block.create.brass_casing.tooltip.summary": "Involucro delle macchine robusto con una varietà di usi. Di sicuro per la decorazione.", "block.create.brass_casing.tooltip.condition1": "Se utilizzato su un Nastro Meccanico", "block.create.brass_casing.tooltip.behaviour1": "_Rinforza_ _i_ _nastri_ con una base in ottone. I nastri rinforzati possono supportare i _Tunnel_ _Trasportatori_, _Estrattori_, _Imbuti_ e _Traspositori_ interagendo con i nastri dai lati e sotto.", "block.create.belt_observer.tooltip": "OSSERVATORE A CINGHIA", - "block.create.belt_observer.tooltip.summary": "Rileva oggetti ed entità che passano su un _Nastro_ _Meccanico_ di fronte. Usa una _Chiave_ _Inglese_ per scorrere il suo comportamento. I non oggetti verranno sempre gestiti in modalità rilevamento indipendentemente dall'impostazione.", - "block.create.belt_observer.tooltip.condition1": "Modalità di Rilevamento", + "block.create.belt_observer.tooltip.summary": "Rileva oggetti ed entità che passano su un _Nastro_ _Meccanico_ di fronte. Usa una _Chiave_ _Inglese_ per scorrere il suo comportamento. I non oggetti verranno sempre gestiti in modalità rilevamento indipendentemente dall'impostazione.", + "block.create.belt_observer.tooltip.condition1": "Modalità di Rilevamento", "block.create.belt_observer.tooltip.behaviour1": "Fornisce un segnale redstone _mentre_ un _oggetto_ _corrispondente_ si _trova_ nel segmento del nastro osservato.", - "block.create.belt_observer.tooltip.condition2": "Modalità a Impulsi", + "block.create.belt_observer.tooltip.condition2": "Modalità a Impulsi", "block.create.belt_observer.tooltip.behaviour2": "Emette un _impulso_ quando un _oggetto_ _corrispondente_ _passa_ al centro del segmento del nastro osservato.", - "block.create.belt_observer.tooltip.condition3": "Modalità di Espulsione", - "block.create.belt_observer.tooltip.behaviour3": "_Espelle_ _gli_ _oggetti_ _corrispondenti_ dal lato. Se il nastro bersaglio o lo spazio è _occupato_, l'oggetto verrà _tenuto_ _in_ _posizione_.", - "block.create.belt_observer.tooltip.condition4": "Modalità Divisa", - "block.create.belt_observer.tooltip.behaviour4": "_Divide_ una _pila_ _di_ _oggetti_ _corrispondenti_ ed _espelle_ _metà_ di essa dal lato.", + "block.create.belt_observer.tooltip.condition3": "Modalità di Espulsione", + "block.create.belt_observer.tooltip.behaviour3": "_Espelle_ _gli_ _oggetti_ _corrispondenti_ dal lato. Se il nastro bersaglio o lo spazio è _occupato_, l'oggetto verrà _tenuto_ _in_ _posizione_.", + "block.create.belt_observer.tooltip.condition4": "Modalità Divisa", + "block.create.belt_observer.tooltip.behaviour4": "_Divide_ una _pila_ _di_ _oggetti_ _corrispondenti_ ed _espelle_ _metà_ di essa dal lato.", "block.create.pulse_repeater.tooltip": "RIPETITORE DI IMPULSI", "block.create.pulse_repeater.tooltip.summary": "Un semplice circuito per tagliare i segnali redstone di passaggio ad una lunghezza di _1_ _tick_.", @@ -1395,26 +1367,26 @@ "block.create.adjustable_pulse_repeater.tooltip.summary": "Un _Ripetitore_ _di_ _Impulsi_ con un _Ritardo_ _configurabile_ fino a 30 minuti.", "block.create.analog_lever.tooltip": "LEVA ANALOGICA", - "block.create.analog_lever.tooltip.summary": "Una leva con un _controllo_ _più_ _preciso_ sulla _potenza_ _del_ _segnale_ emesso.", + "block.create.analog_lever.tooltip.summary": "Una leva con un _controllo_ _più_ _preciso_ sulla _potenza_ _del_ _segnale_ emesso.", "block.create.powered_toggle_latch.tooltip": "LEVA ALIMENTATA ALTERATA", - "block.create.powered_toggle_latch.tooltip.summary": "Una leva che può essere attivata/disattivata da un _Impulso_ _Redstone_.", + "block.create.powered_toggle_latch.tooltip.summary": "Una leva che può essere attivata/disattivata da un _Impulso_ _Redstone_.", "block.create.powered_latch.tooltip": "LEVA ALIMENTATA", - "block.create.powered_latch.tooltip.summary": "Una leva che può essere controllata dai _Segnali_ _Redstone. Un segnale sul _retro_ _la_ _abilita_, un _segnale_ _laterale_ _la_ _resetterà_ .", + "block.create.powered_latch.tooltip.summary": "Una leva che può essere controllata dai _Segnali_ _Redstone. Un segnale sul _retro_ _la_ _abilita_, un _segnale_ _laterale_ _la_ _resetterà_ .", "block.create.speedometer.tooltip": "TACHIMETRO", - "block.create.speedometer.tooltip.summary": "Misura e visualizza la _velocità_ _di_ _rotazione_ dei componenti cinetici collegati. Supporta _Comparatori_ _Redstone_.", + "block.create.speedometer.tooltip.summary": "Misura e visualizza la _velocità_ _di_ _rotazione_ dei componenti cinetici collegati. Supporta _Comparatori_ _Redstone_.", "block.create.speedometer.tooltip.condition1": "Quando Ruotato", - "block.create.speedometer.tooltip.behaviour1": "Indica un colore corrispondente al livello di velocità. Il _Verde_ indica una rotazione Lenta, _Blu_ Moderata e _Viola_ Veloce. Alcuni componenti meccanici richiedono un livello di velocità sufficiente per funzionare correttamente.", + "block.create.speedometer.tooltip.behaviour1": "Indica un colore corrispondente al livello di velocità. Il _Verde_ indica una rotazione Lenta, _Blu_ Moderata e _Viola_ Veloce. Alcuni componenti meccanici richiedono un livello di velocità sufficiente per funzionare correttamente.", "block.create.stressometer.tooltip": "STRESSOMETRO", "block.create.stressometer.tooltip.summary": "Misura e visualizza lo _stress_ _complessivo_ della rete cinetica collegata. Supporta _Comparatori_ _Redstone_.", "block.create.stressometer.tooltip.condition1": "Quando Ruotato", - "block.create.stressometer.tooltip.behaviour1": "Indica un colore corrispondente al livello di stress. Le _reti_ _troppo_ _stressate_ cesseranno di muoversi. Lo stress può essere alleviato aggiungendo più _fonti_ _di_ _rotazione_ alla rete.", + "block.create.stressometer.tooltip.behaviour1": "Indica un colore corrispondente al livello di stress. Le _reti_ _troppo_ _stressate_ cesseranno di muoversi. Lo stress può essere alleviato aggiungendo più _fonti_ _di_ _rotazione_ alla rete.", "tool.create.sand_paper.tooltip": "CARTA VETRATA", - "tool.create.sand_paper.tooltip.summary": "Una carta ruvida che può essere utilizzata per _levigare_ _materiali_ o affilare i tuoi _strumenti_.", + "tool.create.sand_paper.tooltip.summary": "Una carta ruvida che può essere utilizzata per _levigare_ _materiali_ o affilare i tuoi _strumenti_.", "tool.create.sand_paper.tooltip.condition1": "Quando Usata", "tool.create.sand_paper.tooltip.behaviour1": "Applica la lucidatura agli oggetti _tenuti_ _in_ _mano_ o distesi a _terra_ quando _li_ _guardi_", @@ -1432,16 +1404,16 @@ "item.create.shadow_steel.tooltip.summary": "Un Materiale Cromatico forgiato _nel_ _vuoto_.", "item.create.crafter_slot_cover.tooltip": "RIVESTIMENTO SLOT CREAZIONE", - "item.create.crafter_slot_cover.tooltip.summary": "Utilizzato per coprire uno slot vuoto in un _Costruttore_ _Meccanico_ in una ricetta. I Costruttori non devono necessariamente formare una griglia quadrata completa. Questo è utile quando ci sono ricette in cui gli _ingredienti_ _sono_ _in_ _diagonale_ tra loro.", + "item.create.crafter_slot_cover.tooltip.summary": "Utilizzato per coprire uno slot vuoto in un _Costruttore_ _Meccanico_ in una ricetta. I Costruttori non devono necessariamente formare una griglia quadrata completa. Questo è utile quando ci sono ricette in cui gli _ingredienti_ _sono_ _in_ _diagonale_ tra loro.", "create.tooltip.wip": "WIP", "create.tooltip.workInProgress": "Work in progress!", "create.tooltip.randomWipDescription0": "Si prega di tenere questo oggetto lontano dai bambini.", "create.tooltip.randomWipDescription1": "Un cucciolo di panda muore ogni volta che usi questo oggetto. Ogni. Volta.", "create.tooltip.randomWipDescription2": "Da utilizzare a proprio rischio.", - "create.tooltip.randomWipDescription3": "Questo non è l'oggetto che stai cercando, *le dita si muovono* perfavore dispartene.", - "create.tooltip.randomWipDescription4": "Questo oggetto si autodistruggerà tra 10 secondi. 10, 9, 8...", - "create.tooltip.randomWipDescription5": "Credimi, è inutile.", + "create.tooltip.randomWipDescription3": "Questo non è l'oggetto che stai cercando, *le dita si muovono* perfavore dispartene.", + "create.tooltip.randomWipDescription4": "Questo oggetto si autodistruggerà tra 10 secondi. 10, 9, 8...", + "create.tooltip.randomWipDescription5": "Credimi, è inutile.", "create.tooltip.randomWipDescription6": "Utilizzando questo articolo, acconsenti al nostro disclaimer e accetti i suoi termini.", "create.tooltip.randomWipDescription7": "Questo forse non fa per te. Che ne dici di quello?", "create.tooltip.randomWipDescription8": "Usalo e rimpiangi immediatamente la tua decisione.", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index 9d2226306..2344475a9 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -5,17 +5,17 @@ "block.create.acacia_window": "UNLOCALIZED: Acacia Window", "block.create.acacia_window_pane": "UNLOCALIZED: Acacia Window Pane", - "block.create.adjustable_crate": "調整å�¯èƒ½ã�ªã‚¯ãƒ¬ãƒ¼ãƒˆ", - "block.create.adjustable_pulley": "アナログベルトプーリー", - "block.create.adjustable_pulse_repeater": "調整å�¯èƒ½ã�ªãƒ‘ルスリピーター", - "block.create.adjustable_repeater": "調整å�¯èƒ½ã�ªãƒªãƒ”ーター", - "block.create.analog_lever": "アナログレãƒ�ー", + "block.create.adjustable_crate": "調整可能なクレート", + "block.create.adjustable_pulley": "アナログベルトプーリー", + "block.create.adjustable_pulse_repeater": "調整可能なパルスリピーター", + "block.create.adjustable_repeater": "調整可能なリピーター", + "block.create.analog_lever": "アナログレバー", "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", - "block.create.andesite_bricks": "安山岩レンガ", + "block.create.andesite_bricks": "安山岩レンガ", "block.create.andesite_bricks_slab": "UNLOCALIZED: Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "UNLOCALIZED: Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "UNLOCALIZED: Andesite Bricks Wall", - "block.create.andesite_casing": "安山岩ケーシング", + "block.create.andesite_casing": "安山岩ケーシング", "block.create.andesite_cobblestone": "UNLOCALIZED: Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "UNLOCALIZED: Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "UNLOCALIZED: Andesite Cobblestone Stairs", @@ -23,14 +23,8 @@ "block.create.andesite_funnel": "UNLOCALIZED: Andesite Funnel", "block.create.andesite_pillar": "UNLOCALIZED: Andesite Pillar", "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", -<<<<<<< HEAD - "block.create.basin": "鉢", - "block.create.belt": "メカニカルベルト", - "block.create.belt_observer": "ベルトオブザーãƒ�ー", -======= "block.create.basin": "鉢", "block.create.belt": "メカニカルベルト", ->>>>>>> mc1.15/dev "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", "block.create.black_seat": "UNLOCALIZED: Black Seat", @@ -39,17 +33,13 @@ "block.create.blue_seat": "UNLOCALIZED: Blue Seat", "block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle", "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", - "block.create.brass_block": "真é�®ãƒ–ロック", - "block.create.brass_casing": "真é�®ã‚±ãƒ¼ã‚·ãƒ³ã‚°", + "block.create.brass_block": "真鍮ブロック", + "block.create.brass_casing": "真鍮ケーシング", "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.brown_seat": "UNLOCALIZED: Brown Seat", -<<<<<<< HEAD - "block.create.cart_assembler": "カートアセンブラ", -======= "block.create.brown_valve_handle": "UNLOCALIZED: Brown Valve Handle", "block.create.cart_assembler": "カートアセンブラ", ->>>>>>> mc1.15/dev "block.create.chiseled_dark_scoria": "UNLOCALIZED: Chiseled Dark Scoria", "block.create.chiseled_dolomite": "UNLOCALIZED: Chiseled Dolomite", "block.create.chiseled_gabbro": "UNLOCALIZED: Chiseled Gabbro", @@ -57,19 +47,6 @@ "block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria", "block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone", "block.create.chute": "UNLOCALIZED: Chute", -<<<<<<< HEAD - "block.create.clockwork_bearing": "時計仕掛ã�‘ã�®ãƒ™ã‚¢ãƒªãƒ³ã‚°", - "block.create.clutch": "クラッãƒ�", - "block.create.cogwheel": "歯車", - "block.create.copper_block": "銅ブロック", - "block.create.copper_casing": "銅ケーシング", - "block.create.copper_ore": "銅鉱石", - "block.create.copper_shingles": "銅ã�®ã�“ã�‘らæ�¿", - "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", - "block.create.creative_crate": "概略図砲クリエティフィアー", - "block.create.creative_motor": "モーター", - "block.create.crushing_wheel": "破砕ホイール", -======= "block.create.clockwork_bearing": "時計仕掛けのベアリング", "block.create.clutch": "クラッチ", "block.create.cogwheel": "歯車", @@ -83,26 +60,25 @@ "block.create.creative_crate": "概略図砲クリエティフィアー", "block.create.creative_motor": "モーター", "block.create.crushing_wheel": "破砕ホイール", ->>>>>>> mc1.15/dev "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", - "block.create.cuckoo_clock": "鳩時計", + "block.create.cuckoo_clock": "鳩時計", "block.create.cyan_seat": "UNLOCALIZED: Cyan Seat", "block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle", "block.create.dark_oak_window": "UNLOCALIZED: Dark Oak Window", "block.create.dark_oak_window_pane": "UNLOCALIZED: Dark Oak Window Pane", - "block.create.dark_scoria": "ダークスコリア", - "block.create.dark_scoria_bricks": "ダークスコリアレンガ", - "block.create.dark_scoria_bricks_slab": "ダークスコリアレンガã�®ãƒ�ーフブロック", - "block.create.dark_scoria_bricks_stairs": "ダークスコリアレンガã�®éšŽæ®µ", - "block.create.dark_scoria_bricks_wall": "ダークスコリアレンガã�®å¡€", + "block.create.dark_scoria": "ダークスコリア", + "block.create.dark_scoria_bricks": "ダークスコリアレンガ", + "block.create.dark_scoria_bricks_slab": "ダークスコリアレンガのハーフブロック", + "block.create.dark_scoria_bricks_stairs": "ダークスコリアレンガの階段", + "block.create.dark_scoria_bricks_wall": "ダークスコリアレンガの塀", "block.create.dark_scoria_cobblestone": "UNLOCALIZED: Dark Scoria Cobblestone", "block.create.dark_scoria_cobblestone_slab": "UNLOCALIZED: Dark Scoria Cobblestone Slab", "block.create.dark_scoria_cobblestone_stairs": "UNLOCALIZED: Dark Scoria Cobblestone Stairs", "block.create.dark_scoria_cobblestone_wall": "UNLOCALIZED: Dark Scoria Cobblestone Wall", "block.create.dark_scoria_pillar": "UNLOCALIZED: Dark Scoria Pillar", - "block.create.deployer": "デプロイヤー", + "block.create.deployer": "デプロイヤー", "block.create.depot": "UNLOCALIZED: Depot", - "block.create.diorite_bricks": "閃緑岩レンガ", + "block.create.diorite_bricks": "閃緑岩レンガ", "block.create.diorite_bricks_slab": "UNLOCALIZED: Diorite Bricks Slab", "block.create.diorite_bricks_stairs": "UNLOCALIZED: Diorite Bricks Stairs", "block.create.diorite_bricks_wall": "UNLOCALIZED: Diorite Bricks Wall", @@ -111,20 +87,20 @@ "block.create.diorite_cobblestone_stairs": "UNLOCALIZED: Diorite Cobblestone Stairs", "block.create.diorite_cobblestone_wall": "UNLOCALIZED: Diorite Cobblestone Wall", "block.create.diorite_pillar": "UNLOCALIZED: Diorite Pillar", - "block.create.dolomite": "苦ç�°çŸ³", - "block.create.dolomite_bricks": "苦ç�°çŸ³ãƒ¬ãƒ³ã‚¬", - "block.create.dolomite_bricks_slab": "苦ç�°çŸ³ãƒ¬ãƒ³ã‚¬ã�®ãƒ�ーフブロック", - "block.create.dolomite_bricks_stairs": "苦ç�°çŸ³ãƒ¬ãƒ³ã‚¬ã�®éšŽæ®µ", - "block.create.dolomite_bricks_wall": "苦ç�°çŸ³ãƒ¬ãƒ³ã‚¬ã�®å¡€", + "block.create.dolomite": "苦灰石", + "block.create.dolomite_bricks": "苦灰石レンガ", + "block.create.dolomite_bricks_slab": "苦灰石レンガのハーフブロック", + "block.create.dolomite_bricks_stairs": "苦灰石レンガの階段", + "block.create.dolomite_bricks_wall": "苦灰石レンガの塀", "block.create.dolomite_cobblestone": "UNLOCALIZED: Dolomite Cobblestone", "block.create.dolomite_cobblestone_slab": "UNLOCALIZED: Dolomite Cobblestone Slab", "block.create.dolomite_cobblestone_stairs": "UNLOCALIZED: Dolomite Cobblestone Stairs", "block.create.dolomite_cobblestone_wall": "UNLOCALIZED: Dolomite Cobblestone Wall", - "block.create.dolomite_pillar": "苦ç�°çŸ³ã�®æŸ±", - "block.create.encased_belt": "ケース入りベルト", - "block.create.encased_fan": "ケース入りファン", + "block.create.dolomite_pillar": "苦灰石の柱", + "block.create.encased_belt": "ケース入りベルト", + "block.create.encased_fan": "ケース入りファン", "block.create.encased_fluid_pipe": "UNLOCALIZED: Encased Fluid Pipe", - "block.create.encased_shaft": "ケース入りシャフト", + "block.create.encased_shaft": "ケース入りシャフト", "block.create.fancy_andesite_bricks": "UNLOCALIZED: Fancy Andesite Bricks", "block.create.fancy_andesite_bricks_slab": "UNLOCALIZED: Fancy Andesite Bricks Slab", "block.create.fancy_andesite_bricks_stairs": "UNLOCALIZED: Fancy Andesite Bricks Stairs", @@ -163,14 +139,6 @@ "block.create.fancy_weathered_limestone_bricks_wall": "UNLOCALIZED: Fancy Weathered Limestone Bricks Wall", "block.create.fluid_pipe": "UNLOCALIZED: Fluid Pipe", "block.create.fluid_tank": "UNLOCALIZED: Fluid Tank", -<<<<<<< HEAD - "block.create.flywheel": "勢車", - "block.create.framed_glass": "大ã��ã�ªã‚¬ãƒ©ã‚¹çª“", - "block.create.framed_glass_pane": "大ã��ã�ªã‚¬ãƒ©ã‚¹çª“æ�¿", - "block.create.furnace_engine": "ã�‹ã�¾ã�©ã‚¨ãƒ³ã‚¸ãƒ³", - "block.create.gabbro": "æ–‘ã‚Œã�„岩", - "block.create.gabbro_bricks": "æ–‘ã‚Œã�„岩レンガ", -======= "block.create.fluid_valve": "UNLOCALIZED: Fluid Valve", "block.create.flywheel": "勢車", "block.create.framed_glass": "大きなガラス窓", @@ -178,19 +146,18 @@ "block.create.furnace_engine": "かまどエンジン", "block.create.gabbro": "斑れい岩", "block.create.gabbro_bricks": "斑れい岩レンガ", ->>>>>>> mc1.15/dev "block.create.gabbro_bricks_slab": "UNLOCALIZED: Gabbro Bricks Slab", - "block.create.gabbro_bricks_stairs": "æ–‘ã‚Œã�„岩レンガã�®éšŽæ®µ", - "block.create.gabbro_bricks_wall": "æ–‘ã‚Œã�„岩レンガã�®å¡€", + "block.create.gabbro_bricks_stairs": "斑れい岩レンガの階段", + "block.create.gabbro_bricks_wall": "斑れい岩レンガの塀", "block.create.gabbro_cobblestone": "UNLOCALIZED: Gabbro Cobblestone", "block.create.gabbro_cobblestone_slab": "UNLOCALIZED: Gabbro Cobblestone Slab", "block.create.gabbro_cobblestone_stairs": "UNLOCALIZED: Gabbro Cobblestone Stairs", "block.create.gabbro_cobblestone_wall": "UNLOCALIZED: Gabbro Cobblestone Wall", "block.create.gabbro_pillar": "UNLOCALIZED: Gabbro Pillar", - "block.create.gearbox": "ギアボックス", - "block.create.gearshift": "ギアシフト", + "block.create.gearbox": "ギアボックス", + "block.create.gearshift": "ギアシフト", "block.create.glass_fluid_pipe": "UNLOCALIZED: Glass Fluid Pipe", - "block.create.granite_bricks": "花崗岩レンガ", + "block.create.granite_bricks": "花崗岩レンガ", "block.create.granite_bricks_slab": "UNLOCALIZED: Granite Bricks Slab", "block.create.granite_bricks_stairs": "UNLOCALIZED: Granite Bricks Stairs", "block.create.granite_bricks_wall": "UNLOCALIZED: Granite Bricks Wall", @@ -202,19 +169,13 @@ "block.create.gray_seat": "UNLOCALIZED: Gray Seat", "block.create.gray_valve_handle": "UNLOCALIZED: Gray Valve Handle", "block.create.green_seat": "UNLOCALIZED: Green Seat", -<<<<<<< HEAD - "block.create.hand_crank": "ãƒ�ンドクランク", - "block.create.horizontal_framed_glass": "横型ガラス窓", - "block.create.horizontal_framed_glass_pane": "横型ガラス窓æ�¿", -======= "block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle", "block.create.hand_crank": "ハンドクランク", "block.create.horizontal_framed_glass": "横型ガラス窓", "block.create.horizontal_framed_glass_pane": "横型ガラス窓板", ->>>>>>> mc1.15/dev "block.create.jungle_window": "UNLOCALIZED: Jungle Window", "block.create.jungle_window_pane": "UNLOCALIZED: Jungle Window Pane", - "block.create.large_cogwheel": "大ã��ã�ªæ­¯è»Š", + "block.create.large_cogwheel": "大きな歯車", "block.create.layered_andesite": "UNLOCALIZED: Layered Andesite", "block.create.layered_dark_scoria": "UNLOCALIZED: Layered Dark Scoria", "block.create.layered_diorite": "UNLOCALIZED: Layered Diorite", @@ -229,14 +190,6 @@ "block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat", "block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle", "block.create.lime_seat": "UNLOCALIZED: Lime Seat", -<<<<<<< HEAD - "block.create.limesand": "石ç�°ç •ç ‚", - "block.create.limestone": "石ç�°å²©", - "block.create.limestone_bricks": "石ç�°å²©ãƒ¬ãƒ³ã‚¬", - "block.create.limestone_bricks_slab": "石ç�°å²©ãƒ¬ãƒ³ã‚¬ã�®ãƒ�ーフブロック", - "block.create.limestone_bricks_stairs": "石ç�°å²©ãƒ¬ãƒ³ã‚¬ã�®éšŽæ®µ", - "block.create.limestone_bricks_wall": "石ç�°å²©ãƒ¬ãƒ³ã‚¬ã�®å¡€", -======= "block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle", "block.create.limesand": "石灰砕砂", "block.create.limestone": "石灰岩", @@ -244,28 +197,27 @@ "block.create.limestone_bricks_slab": "石灰岩レンガのハーフブロック", "block.create.limestone_bricks_stairs": "石灰岩レンガの階段", "block.create.limestone_bricks_wall": "石灰岩レンガの塀", ->>>>>>> mc1.15/dev "block.create.limestone_cobblestone": "UNLOCALIZED: Limestone Cobblestone", "block.create.limestone_cobblestone_slab": "UNLOCALIZED: Limestone Cobblestone Slab", "block.create.limestone_cobblestone_stairs": "UNLOCALIZED: Limestone Cobblestone Stairs", "block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall", - "block.create.limestone_pillar": "石ç�°å²©ã�®æŸ±", - "block.create.linear_chassis": "リニアシャーシ", + "block.create.limestone_pillar": "石灰岩の柱", + "block.create.linear_chassis": "リニアシャーシ", "block.create.magenta_seat": "UNLOCALIZED: Magenta Seat", "block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle", "block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm", - "block.create.mechanical_bearing": "メカニカルベアリング", - "block.create.mechanical_crafter": "メカニカルクラフター", - "block.create.mechanical_drill": "メカニカルドリル", - "block.create.mechanical_harvester": "メカニカルãƒ�ーベスター", - "block.create.mechanical_mixer": "メカニカルミキサー", - "block.create.mechanical_piston": "メカニカルピストン", - "block.create.mechanical_piston_head": "メカニカルピストンヘッド", + "block.create.mechanical_bearing": "メカニカルベアリング", + "block.create.mechanical_crafter": "メカニカルクラフター", + "block.create.mechanical_drill": "メカニカルドリル", + "block.create.mechanical_harvester": "メカニカルハーベスター", + "block.create.mechanical_mixer": "メカニカルミキサー", + "block.create.mechanical_piston": "メカニカルピストン", + "block.create.mechanical_piston_head": "メカニカルピストンヘッド", "block.create.mechanical_plough": "UNLOCALIZED: Mechanical Plough", - "block.create.mechanical_press": "メカニカルプレス", + "block.create.mechanical_press": "メカニカルプレス", "block.create.mechanical_pump": "UNLOCALIZED: Mechanical Pump", - "block.create.mechanical_saw": "メカニカル鋸", - "block.create.millstone": "石臼", + "block.create.mechanical_saw": "メカニカル鋸", + "block.create.millstone": "石臼", "block.create.minecart_anchor": "UNLOCALIZED: Minecart Anchor", "block.create.mossy_andesite": "UNLOCALIZED: Mossy Andesite", "block.create.mossy_dark_scoria": "UNLOCALIZED: Mossy Dark Scoria", @@ -277,9 +229,9 @@ "block.create.mossy_scoria": "UNLOCALIZED: Mossy Scoria", "block.create.mossy_weathered_limestone": "UNLOCALIZED: Mossy Weathered Limestone", "block.create.mysterious_cuckoo_clock": "UNLOCALIZED: Cuckoo Clock", - "block.create.natural_scoria": "自然スコリア", + "block.create.natural_scoria": "自然スコリア", "block.create.nixie_tube": "UNLOCALIZED: Nixie Tube", - "block.create.nozzle": "ノズル", + "block.create.nozzle": "ノズル", "block.create.oak_window": "UNLOCALIZED: Oak Window", "block.create.oak_window_pane": "UNLOCALIZED: Oak Window Pane", "block.create.orange_seat": "UNLOCALIZED: Orange Seat", @@ -332,65 +284,53 @@ "block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs", "block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall", "block.create.pink_seat": "UNLOCALIZED: Pink Seat", -<<<<<<< HEAD - "block.create.piston_extension_pole": "ピストン延長ãƒ�ール", - "block.create.polished_dark_scoria": "磨ã�‹ã‚Œã�Ÿãƒ€ãƒ¼ã‚¯ã‚¹ã‚³ãƒªã‚¢", -======= "block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle", "block.create.piston_extension_pole": "ピストン延長ポール", "block.create.polished_dark_scoria": "磨かれたダークスコリア", ->>>>>>> mc1.15/dev "block.create.polished_dark_scoria_slab": "UNLOCALIZED: Polished Dark Scoria Slab", "block.create.polished_dark_scoria_stairs": "UNLOCALIZED: Polished Dark Scoria Stairs", "block.create.polished_dark_scoria_wall": "UNLOCALIZED: Polished Dark Scoria Wall", - "block.create.polished_dolomite": "磨ã�‹ã‚Œã�Ÿè‹¦ç�°çŸ³", + "block.create.polished_dolomite": "磨かれた苦灰石", "block.create.polished_dolomite_slab": "UNLOCALIZED: Polished Dolomite Slab", "block.create.polished_dolomite_stairs": "UNLOCALIZED: Polished Dolomite Stairs", "block.create.polished_dolomite_wall": "UNLOCALIZED: Polished Dolomite Wall", - "block.create.polished_gabbro": "磨ã�‹ã‚Œã�Ÿæ–‘ã‚Œã�„岩", + "block.create.polished_gabbro": "磨かれた斑れい岩", "block.create.polished_gabbro_slab": "UNLOCALIZED: Polished Gabbro Slab", "block.create.polished_gabbro_stairs": "UNLOCALIZED: Polished Gabbro Stairs", "block.create.polished_gabbro_wall": "UNLOCALIZED: Polished Gabbro Wall", - "block.create.polished_limestone": "磨ã�‹ã‚Œã�ŸçŸ³ç�°å²©", - "block.create.polished_limestone_slab": "磨ã�‹ã‚Œã�ŸçŸ³ç�°å²©ã�®ãƒ�ーフブロック", + "block.create.polished_limestone": "磨かれた石灰岩", + "block.create.polished_limestone_slab": "磨かれた石灰岩のハーフブロック", "block.create.polished_limestone_stairs": "UNLOCALIZED: Polished Limestone Stairs", "block.create.polished_limestone_wall": "UNLOCALIZED: Polished Limestone Wall", - "block.create.polished_scoria": "磨ã�‹ã‚Œã�Ÿã‚¹ã‚³ãƒªã‚¢", - "block.create.polished_scoria_slab": "磨ã�‹ã‚Œã�Ÿã‚¹ã‚³ãƒªã‚¢ã�®ãƒ�ーフブロック", + "block.create.polished_scoria": "磨かれたスコリア", + "block.create.polished_scoria_slab": "磨かれたスコリアのハーフブロック", "block.create.polished_scoria_stairs": "UNLOCALIZED: Polished Scoria Stairs", "block.create.polished_scoria_wall": "UNLOCALIZED: Polished Scoria Wall", - "block.create.polished_weathered_limestone": "磨ã�‹ã‚Œã�Ÿé¢¨åŒ–石ç�°å²©", - "block.create.polished_weathered_limestone_slab": "磨ã�‹ã‚Œã�Ÿé¢¨åŒ–石ç�°å²©ã�®ãƒ�ーフブロック", + "block.create.polished_weathered_limestone": "磨かれた風化石灰岩", + "block.create.polished_weathered_limestone_slab": "磨かれた風化石灰岩のハーフブロック", "block.create.polished_weathered_limestone_stairs": "UNLOCALIZED: Polished Weathered Limestone Stairs", "block.create.polished_weathered_limestone_wall": "UNLOCALIZED: Polished Weathered Limestone Wall", - "block.create.portable_storage_interface": "ãƒ�ータブルストレージインターフェイス", - "block.create.powered_latch": "パワードラッãƒ�", - "block.create.powered_toggle_latch": "パワードトグルラッãƒ�", - "block.create.pulley_magnet": "プーリーマグãƒ�ット", - "block.create.pulse_repeater": "パルスリピーター", + "block.create.portable_storage_interface": "ポータブルストレージインターフェイス", + "block.create.powered_latch": "パワードラッチ", + "block.create.powered_toggle_latch": "パワードトグルラッチ", + "block.create.pulley_magnet": "プーリーマグネット", + "block.create.pulse_repeater": "パルスリピーター", "block.create.purple_seat": "UNLOCALIZED: Purple Seat", -<<<<<<< HEAD - "block.create.radial_chassis": "ラジアルシャーシ", - "block.create.red_seat": "UNLOCALIZED: Red Seat", - "block.create.redstone_contact": "レッドストーンコンタクト", - "block.create.redstone_link": "レッドストーンリンク", -======= "block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle", "block.create.radial_chassis": "ラジアルシャーシ", "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle", "block.create.redstone_contact": "レッドストーンコンタクト", "block.create.redstone_link": "レッドストーンリンク", ->>>>>>> mc1.15/dev "block.create.refined_radiance_casing": "UNLOCALIZED: Radiant Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", - "block.create.rope": "ロープ", - "block.create.rope_pulley": "ローププーリー", - "block.create.rotation_speed_controller": "回転速度制御器", - "block.create.schematic_table": "概略図テーブル", - "block.create.schematicannon": "概略図砲", - "block.create.scoria": "スコリア", - "block.create.scoria_bricks": "スコリアレンガ", + "block.create.rope": "ロープ", + "block.create.rope_pulley": "ローププーリー", + "block.create.rotation_speed_controller": "回転速度制御器", + "block.create.schematic_table": "概略図テーブル", + "block.create.schematicannon": "概略図砲", + "block.create.scoria": "スコリア", + "block.create.scoria_bricks": "スコリアレンガ", "block.create.scoria_bricks_slab": "UNLOCALIZED: Scoria Bricks Slab", "block.create.scoria_bricks_stairs": "UNLOCALIZED: Scoria Bricks Stairs", "block.create.scoria_bricks_wall": "UNLOCALIZED: Scoria Bricks Wall", @@ -398,105 +338,100 @@ "block.create.scoria_cobblestone_slab": "UNLOCALIZED: Scoria Cobblestone Slab", "block.create.scoria_cobblestone_stairs": "UNLOCALIZED: Scoria Cobblestone Stairs", "block.create.scoria_cobblestone_wall": "UNLOCALIZED: Scoria Cobblestone Wall", - "block.create.scoria_pillar": "スコリアã�®æŸ±", + "block.create.scoria_pillar": "スコリアの柱", "block.create.secondary_linear_chassis": "UNLOCALIZED: Secondary Linear Chassis", - "block.create.sequenced_gearshift": "シーケンスギアシフト", + "block.create.sequenced_gearshift": "シーケンスギアシフト", "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Casing", - "block.create.shaft": "軸", - "block.create.speedometer": "スピードメーター", + "block.create.shaft": "軸", + "block.create.speedometer": "スピードメーター", "block.create.spout": "UNLOCALIZED: Spout", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", "block.create.spruce_window_pane": "UNLOCALIZED: Spruce Window Pane", - "block.create.sticky_mechanical_piston": "粘ç�€ãƒ¡ã‚«ãƒ‹ã‚«ãƒ«ãƒ”ストン", - "block.create.stockpile_switch": "在庫スイッãƒ�", - "block.create.stressometer": "ストレスメーター", - "block.create.tiled_glass": "タイルガラス", - "block.create.tiled_glass_pane": "タイルガラスæ�¿", - "block.create.turntable": "ターンテーブル", - "block.create.vertical_framed_glass": "垂直ガラス窓", - "block.create.vertical_framed_glass_pane": "垂直ガラス窓æ�¿", - "block.create.water_wheel": "水車", - "block.create.weathered_limestone": "風化ã�—ã�ŸçŸ³ç�°å²©", - "block.create.weathered_limestone_bricks": "風化ã�—ã�ŸçŸ³ç�°å²©ãƒ¬ãƒ³ã‚¬", - "block.create.weathered_limestone_bricks_slab": "風化ã�—ã�ŸçŸ³ç�°å²©ãƒ¬ãƒ³ã‚¬ã�®ãƒ�ーフブロック", - "block.create.weathered_limestone_bricks_stairs": "風化ã�—ã�ŸçŸ³ç�°å²©ãƒ¬ãƒ³ã‚¬ã�®éšŽæ®µ", - "block.create.weathered_limestone_bricks_wall": "風化ã�—ã�ŸçŸ³ç�°å²©ãƒ¬ãƒ³ã‚¬ã�®å¡€", + "block.create.sticky_mechanical_piston": "粘着メカニカルピストン", + "block.create.stockpile_switch": "在庫スイッチ", + "block.create.stressometer": "ストレスメーター", + "block.create.tiled_glass": "タイルガラス", + "block.create.tiled_glass_pane": "タイルガラス板", + "block.create.turntable": "ターンテーブル", + "block.create.vertical_framed_glass": "垂直ガラス窓", + "block.create.vertical_framed_glass_pane": "垂直ガラス窓板", + "block.create.water_wheel": "水車", + "block.create.weathered_limestone": "風化した石灰岩", + "block.create.weathered_limestone_bricks": "風化した石灰岩レンガ", + "block.create.weathered_limestone_bricks_slab": "風化した石灰岩レンガのハーフブロック", + "block.create.weathered_limestone_bricks_stairs": "風化した石灰岩レンガの階段", + "block.create.weathered_limestone_bricks_wall": "風化した石灰岩レンガの塀", "block.create.weathered_limestone_cobblestone": "UNLOCALIZED: Weathered Limestone Cobblestone", "block.create.weathered_limestone_cobblestone_slab": "UNLOCALIZED: Weathered Limestone Cobblestone Slab", "block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs", "block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall", - "block.create.weathered_limestone_pillar": "風化ã�—ã�ŸçŸ³ç�°å²©ã�®æŸ±", + "block.create.weathered_limestone_pillar": "風化した石灰岩の柱", "block.create.white_seat": "UNLOCALIZED: White Seat", "block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle", "block.create.yellow_seat": "UNLOCALIZED: Yellow Seat", -<<<<<<< HEAD - "block.create.zinc_block": "亜鉛ブロック", - "block.create.zinc_ore": "亜鉛鉱石", -======= "block.create.yellow_valve_handle": "UNLOCALIZED: Yellow Valve Handle", "block.create.zinc_block": "亜鉛ブロック", "block.create.zinc_ore": "亜鉛鉱石", ->>>>>>> mc1.15/dev "entity.create.contraption": "UNLOCALIZED: Contraption", "entity.create.seat": "UNLOCALIZED: Seat", "entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption", "entity.create.super_glue": "UNLOCALIZED: Super Glue", - "item.create.andesite_alloy": "安山岩å�ˆé‡‘", - "item.create.attribute_filter": "属性フィルター", - "item.create.belt_connector": "メカニカルベルト", - "item.create.brass_hand": "手", - "item.create.brass_ingot": "真é�®ã‚¤ãƒ³ã‚´ãƒƒãƒˆ", - "item.create.brass_nugget": "真é�®ãƒŠã‚²ãƒƒãƒˆ", - "item.create.brass_sheet": "真é�®ã‚·ãƒ¼ãƒˆ", - "item.create.chromatic_compound": "色彩ã�®åŒ–å�ˆç‰©", - "item.create.copper_ingot": "銅インゴット", - "item.create.copper_nugget": "銅塊", - "item.create.copper_sheet": "銅æ�¿", - "item.create.crafter_slot_cover": "クラフタースロットカãƒ�ー", - "item.create.crushed_brass": "ç •ã�„ã�ŸçœŸé�®", + "item.create.andesite_alloy": "安山岩合金", + "item.create.attribute_filter": "属性フィルター", + "item.create.belt_connector": "メカニカルベルト", + "item.create.brass_hand": "手", + "item.create.brass_ingot": "真鍮インゴット", + "item.create.brass_nugget": "真鍮ナゲット", + "item.create.brass_sheet": "真鍮シート", + "item.create.chromatic_compound": "色彩の化合物", + "item.create.copper_ingot": "銅インゴット", + "item.create.copper_nugget": "銅塊", + "item.create.copper_sheet": "銅板", + "item.create.crafter_slot_cover": "クラフタースロットカバー", + "item.create.crushed_brass": "砕いた真鍮", "item.create.crushed_copper_ore": "UNLOCALIZED: Crushed Copper Ore", "item.create.crushed_gold_ore": "UNLOCALIZED: Crushed Gold Ore", "item.create.crushed_iron_ore": "UNLOCALIZED: Crushed Iron Ore", "item.create.crushed_zinc_ore": "UNLOCALIZED: Crushed Zinc Ore", - "item.create.deforester": "デフォレスター", - "item.create.dough": "生地", - "item.create.electron_tube": "é›»å­�管", + "item.create.deforester": "デフォレスター", + "item.create.dough": "生地", + "item.create.electron_tube": "電子管", "item.create.empty_blaze_burner": "UNLOCALIZED: Empty Blaze Burner", - "item.create.empty_schematic": "空ã�®æ¦‚略図", + "item.create.empty_schematic": "空の概略図", "item.create.extendo_grip": "UNLOCALIZED: Extendo Grip", - "item.create.filter": "フィルター", + "item.create.filter": "フィルター", "item.create.fuel_pellet": "UNLOCALIZED: Fuel Pellet", "item.create.furnace_minecart_contraption": "UNLOCALIZED: Furnace Minecart Contraption", - "item.create.goggles": "エンジニアã�®ã‚´ãƒ¼ã‚°ãƒ«", + "item.create.goggles": "エンジニアのゴーグル", "item.create.golden_sheet": "UNLOCALIZED: Golden Sheet", - "item.create.handheld_blockzapper": "æ�ºå¸¯åž‹ãƒ–ロックザッパー", - "item.create.handheld_worldshaper": "æ�ºå¸¯åž‹ãƒ¯ãƒ¼ãƒ«ãƒ‰ã‚·ã‚§ã‚¤ãƒ‘ー", - "item.create.integrated_circuit": "集ç©�回路", - "item.create.iron_sheet": "鉄æ�¿", + "item.create.handheld_blockzapper": "携帯型ブロックザッパー", + "item.create.handheld_worldshaper": "携帯型ワールドシェイパー", + "item.create.integrated_circuit": "集積回路", + "item.create.iron_sheet": "鉄板", "item.create.lapis_sheet": "UNLOCALIZED: Lapis Sheet", "item.create.minecart_contraption": "UNLOCALIZED: Minecart Contraption", "item.create.minecart_coupling": "UNLOCALIZED: Minecart Coupling", - "item.create.polished_rose_quartz": "磨ã�‹ã‚Œã�Ÿãƒ­ãƒ¼ã‚ºã‚¯ã‚©ãƒ¼ãƒ„", + "item.create.polished_rose_quartz": "磨かれたローズクォーツ", "item.create.powdered_obsidian": "UNLOCALIZED: Powdered Obsidian", - "item.create.propeller": "プロペラ", - "item.create.red_sand_paper": "赤ã�„紙やã�™ã‚Š", - "item.create.refined_radiance": "æ´—ç·´ã�•ã‚Œã�Ÿè¼�ã��", - "item.create.rose_quartz": "ローズクォーツ", - "item.create.sand_paper": "紙やã�™ã‚Š", - "item.create.schematic": "概略図", - "item.create.schematic_and_quill": "概略図ã�¨ç¾½æ ¹ãƒšãƒ³", - "item.create.shadow_steel": "シャドウスãƒ�ール", + "item.create.propeller": "プロペラ", + "item.create.red_sand_paper": "赤い紙やすり", + "item.create.refined_radiance": "洗練された輝き", + "item.create.rose_quartz": "ローズクォーツ", + "item.create.sand_paper": "紙やすり", + "item.create.schematic": "概略図", + "item.create.schematic_and_quill": "概略図と羽根ペン", + "item.create.shadow_steel": "シャドウスチール", "item.create.super_glue": "UNLOCALIZED: Super Glue", - "item.create.tree_fertilizer": "木ã�®è‚¥æ–™", + "item.create.tree_fertilizer": "木の肥料", "item.create.vertical_gearbox": "UNLOCALIZED: Vertical Gearbox", - "item.create.wand_of_symmetry": "対称ã�®æ�–", + "item.create.wand_of_symmetry": "対称の杖", "item.create.wheat_flour": "UNLOCALIZED: Wheat Flour", - "item.create.whisk": "泡立ã�¦å™¨", - "item.create.wrench": "レンãƒ�", - "item.create.zinc_ingot": "亜鉛棒", - "item.create.zinc_nugget": "亜鉛塊", + "item.create.whisk": "泡立て器", + "item.create.wrench": "レンチ", + "item.create.zinc_ingot": "亜鉛棒", + "item.create.zinc_nugget": "亜鉛塊", "_": "->------------------------] Advancements [------------------------<-", @@ -592,187 +527,143 @@ "itemGroup.create.base": "UNLOCALIZED: Create", "itemGroup.create.palettes": "UNLOCALIZED: Create Palettes", - "death.attack.create.crush": "%1$s ã�¯ç ´ç •ãƒ›ã‚¤ãƒ¼ãƒ«ã�«ã‚ˆã�£ã�¦å‡¦ç�†ã�•ã‚Œã�¾ã�—ã�Ÿ", - "death.attack.create.fan_fire": "%1$s ã�¯ç†±é¢¨ã�§ç„¼æ­»ã�—ã�Ÿ", - "death.attack.create.fan_lava": "%1$s ã�¯æº¶å²©ãƒ•ã‚¡ãƒ³ã�«ã‚ˆã�£ã�¦ç„¼æ­»ã�—ã�Ÿ", - "death.attack.create.mechanical_drill": "%1$s ã�¯ãƒ¡ã‚«ãƒ‹ã‚«ãƒ«ãƒ‰ãƒªãƒ«ã�«çª�ã��刺ã�•ã�£ã�Ÿ", - "death.attack.create.mechanical_saw": "%1$s ã�¯ãƒ¡ã‚«ãƒ‹ã‚«ãƒ«é‹¸ã�§å�Šåˆ†ã�«ã‚«ãƒƒãƒˆã�•ã‚Œã�Ÿ", - "death.attack.create.cuckoo_clock_explosion": "%1$s ã�¯æ”¹ã�–ã‚“ã�•ã‚Œã�Ÿé³©æ™‚計ã�«çˆ†ç ´ã�•ã‚Œã�Ÿ", + "death.attack.create.crush": "%1$s は破砕ホイールによって処理されました", + "death.attack.create.fan_fire": "%1$s は熱風で焼死した", + "death.attack.create.fan_lava": "%1$s は溶岩ファンによって焼死した", + "death.attack.create.mechanical_drill": "%1$s はメカニカルドリルに突き刺さった", + "death.attack.create.mechanical_saw": "%1$s はメカニカル鋸で半分にカットされた", + "death.attack.create.cuckoo_clock_explosion": "%1$s は改ざんされた鳩時計に爆破された", - "create.block.deployer.damage_source_name": "悪ã�„デプロイヤー", + "create.block.deployer.damage_source_name": "悪いデプロイヤー", "create.block.cart_assembler.invalid": "UNLOCALIZED: Place your Cart Assembler on a rail block", - "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.pressing": "押ã�—ã�¤ã�¶ã�—", - "create.recipe.mixing": "æ··å�ˆ", - "create.recipe.packing": "圧縮", - "create.recipe.mechanical_sawing": "製æ��", - "create.recipe.mechanical_crafting": "メカニカルクラフト", - "create.recipe.block_cutting": "ブロックカット", - "create.recipe.blockzapper_upgrade": "æ�ºå¸¯åž‹ãƒ–ロックザッパー", - "create.recipe.sandpaper_polishing": "紙やã�™ã‚Šã�§ã�®ç ”磨", - "create.recipe.mystery_conversion": "色彩変態", - "create.recipe.processing.catalyst": "触媒", - "create.recipe.processing.chance": "%1$s%%ãƒ�ャンス", - "create.recipe.processing.chanceToReturn": "%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.pressing": "押しつぶし", + "create.recipe.mixing": "混合", + "create.recipe.packing": "圧縮", + "create.recipe.mechanical_sawing": "製材", + "create.recipe.mechanical_crafting": "メカニカルクラフト", + "create.recipe.block_cutting": "ブロックカット", + "create.recipe.blockzapper_upgrade": "携帯型ブロックザッパー", + "create.recipe.sandpaper_polishing": "紙やすりでの研磨", + "create.recipe.mystery_conversion": "色彩変態", + "create.recipe.processing.catalyst": "触媒", + "create.recipe.processing.chance": "%1$s%%チャンス", + "create.recipe.processing.chanceToReturn": "%1$s%%チャンスで戻る", - "create.generic.range": "範囲", - "create.generic.radius": "å�Šå¾„", - "create.generic.width": "å¹…", - "create.generic.height": "高ã�•", - "create.generic.length": "é•·ã�•", - "create.generic.speed": "速度", - "create.generic.delay": "é�…延", - "create.generic.unit.ticks": "ティック", - "create.generic.unit.seconds": "秒", - "create.generic.unit.minutes": "分", + "create.generic.range": "範囲", + "create.generic.radius": "半径", + "create.generic.width": "幅", + "create.generic.height": "高さ", + "create.generic.length": "長さ", + "create.generic.speed": "速度", + "create.generic.delay": "遅延", + "create.generic.unit.ticks": "ティック", + "create.generic.unit.seconds": "秒", + "create.generic.unit.minutes": "分", "create.generic.unit.rpm": "RPM", "create.generic.unit.stress": "su", - "create.generic.unit.degrees": "°", + "create.generic.unit.degrees": "°", - "create.action.scroll": "スクロール", - "create.action.confirm": "確èª�", - "create.action.abort": "中止", - "create.action.saveToFile": "ä¿�å­˜", - "create.action.discard": "æ�¨ã�¦ã‚‹", + "create.action.scroll": "スクロール", + "create.action.confirm": "確認", + "create.action.abort": "中止", + "create.action.saveToFile": "保存", + "create.action.discard": "捨てる", - "create.keyinfo.toolmenu": "フォーカスツールメニュー", - "create.keyinfo.scrollup": "マウスホイールアップをシミュレート(ã�“ã�®ä¸–ç•Œã�§)", - "create.keyinfo.scrolldown": "マウスホイールダウンをシミュレーション(ã�“ã�®ä¸–ç•Œã�§)", + "create.keyinfo.toolmenu": "フォーカスツールメニュー", + "create.keyinfo.scrollup": "マウスホイールアップをシミュレート(この世界で)", + "create.keyinfo.scrolldown": "マウスホイールダウンをシミュレーション(この世界で)", - "create.gui.scrollInput.defaultTitle": "オプションをé�¸æŠž:", - "create.gui.scrollInput.scrollToModify": "スクロールã�—ã�¦å¤‰æ›´", - "create.gui.scrollInput.scrollToAdjustAmount": "スクロールã�—ã�¦é‡‘é¡�を調整", - "create.gui.scrollInput.scrollToSelect": "スクロールã�—ã�¦é�¸æŠž", - "create.gui.scrollInput.shiftScrollsFaster": "シフトを押ã�—ã�¦ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«ã‚’加速", - "create.gui.toolmenu.focusKey": "[%1$s] 長押ã�—ã�§ãƒ•ã‚©ãƒ¼ã‚«ã‚¹", - "create.gui.toolmenu.cycle": "[SCROLL] ã�§ã‚µã‚¤ã‚¯ãƒ«", - "create.gui.symmetryWand.mirrorType": "ミラー", - "create.gui.symmetryWand.orientation": "オリエンテーション", + "create.gui.scrollInput.defaultTitle": "オプションを選択:", + "create.gui.scrollInput.scrollToModify": "スクロールして変更", + "create.gui.scrollInput.scrollToAdjustAmount": "スクロールして金額を調整", + "create.gui.scrollInput.scrollToSelect": "スクロールして選択", + "create.gui.scrollInput.shiftScrollsFaster": "シフトを押してスクロールを加速", + "create.gui.toolmenu.focusKey": "[%1$s] 長押しでフォーカス", + "create.gui.toolmenu.cycle": "[SCROLL] でサイクル", + "create.gui.symmetryWand.mirrorType": "ミラー", + "create.gui.symmetryWand.orientation": "オリエンテーション", - "create.symmetry.mirror.plane": "線対称", - "create.symmetry.mirror.doublePlane": "長方形", - "create.symmetry.mirror.triplePlane": "八角形", + "create.symmetry.mirror.plane": "線対称", + "create.symmetry.mirror.doublePlane": "長方形", + "create.symmetry.mirror.triplePlane": "八角形", - "create.orientation.orthogonal": "直交", - "create.orientation.diagonal": "対角線", - "create.orientation.horizontal": "横型", - "create.orientation.alongZ": "Zã�«æ²¿ã‚‹", - "create.orientation.alongX": "Xã�«æ²¿ã‚‹", + "create.orientation.orthogonal": "直交", + "create.orientation.diagonal": "対角線", + "create.orientation.horizontal": "横型", + "create.orientation.alongZ": "Zに沿る", + "create.orientation.alongX": "Xに沿る", - "create.gui.blockzapper.title": "æ�ºå¸¯åž‹ãƒ–ロックザッパー", - "create.gui.blockzapper.replaceMode": "ç½®æ�›ãƒ¢ãƒ¼ãƒ‰", - "create.gui.blockzapper.searchDiagonal": "対角線ã�«ãƒ•ã‚©ãƒ­ãƒ¼", - "create.gui.blockzapper.searchFuzzy": "マテリアルã�®å¢ƒç•Œã‚’無視", - "create.gui.blockzapper.range": "範囲", - "create.gui.blockzapper.needsUpgradedAmplifier": "増幅アップグレードã�Œå¿…è¦�", - "create.gui.blockzapper.patternSection": "模様", - "create.gui.blockzapper.pattern.solid": "æ•·ã��è©°ã‚�", - "create.gui.blockzapper.pattern.checkered": "ãƒ�ェッカーボード", - "create.gui.blockzapper.pattern.inversecheckered": "逆ãƒ�ェッカーボード", - "create.gui.blockzapper.pattern.chance25": "25% ロール", - "create.gui.blockzapper.pattern.chance50": "50% ロール", - "create.gui.blockzapper.pattern.chance75": "75% ロール", - "create.gui.terrainzapper.title": "æ�ºå¸¯åž‹ãƒ¯ãƒ¼ãƒ«ãƒ‰ã‚·ã‚§ã‚¤ãƒ‘ー", - "create.gui.terrainzapper.placement": "é…�ç½®", - "create.gui.terrainzapper.placement.merged": "å�ˆä½µ", - "create.gui.terrainzapper.placement.attached": "æ·»ã�ˆã‚‹", - "create.gui.terrainzapper.placement.inserted": "挿入", - "create.gui.terrainzapper.brush": "磨ã��", - "create.gui.terrainzapper.brush.cuboid": "立方体", - "create.gui.terrainzapper.brush.sphere": "ç�ƒä½“", - "create.gui.terrainzapper.brush.cylinder": "円筒", - "create.gui.terrainzapper.tool": "ツール", - "create.gui.terrainzapper.tool.fill": "埋立", - "create.gui.terrainzapper.tool.place": "設置", - "create.gui.terrainzapper.tool.replace": "ç½®æ�›", - "create.gui.terrainzapper.tool.clear": "削除", - "create.gui.terrainzapper.tool.overlay": "é‡�ã�­ã‚‹", - "create.gui.terrainzapper.tool.flatten": "å¹³å�¦åŒ–", + "create.gui.blockzapper.title": "携帯型ブロックザッパー", + "create.gui.blockzapper.replaceMode": "置換モード", + "create.gui.blockzapper.searchDiagonal": "対角線にフォロー", + "create.gui.blockzapper.searchFuzzy": "マテリアルの境界を無視", + "create.gui.blockzapper.range": "範囲", + "create.gui.blockzapper.needsUpgradedAmplifier": "増幅アップグレードが必要", + "create.gui.blockzapper.patternSection": "模様", + "create.gui.blockzapper.pattern.solid": "敷き詰め", + "create.gui.blockzapper.pattern.checkered": "チェッカーボード", + "create.gui.blockzapper.pattern.inversecheckered": "逆チェッカーボード", + "create.gui.blockzapper.pattern.chance25": "25% ロール", + "create.gui.blockzapper.pattern.chance50": "50% ロール", + "create.gui.blockzapper.pattern.chance75": "75% ロール", + "create.gui.terrainzapper.title": "携帯型ワールドシェイパー", + "create.gui.terrainzapper.placement": "配置", + "create.gui.terrainzapper.placement.merged": "合併", + "create.gui.terrainzapper.placement.attached": "添える", + "create.gui.terrainzapper.placement.inserted": "挿入", + "create.gui.terrainzapper.brush": "磨き", + "create.gui.terrainzapper.brush.cuboid": "立方体", + "create.gui.terrainzapper.brush.sphere": "球体", + "create.gui.terrainzapper.brush.cylinder": "円筒", + "create.gui.terrainzapper.tool": "ツール", + "create.gui.terrainzapper.tool.fill": "埋立", + "create.gui.terrainzapper.tool.place": "設置", + "create.gui.terrainzapper.tool.replace": "置換", + "create.gui.terrainzapper.tool.clear": "削除", + "create.gui.terrainzapper.tool.overlay": "重ねる", + "create.gui.terrainzapper.tool.flatten": "平坦化", - "create.terrainzapper.shiftRightClickToSet": "シフト-å�³ã‚¯ãƒªãƒƒã‚¯ã�§å½¢çŠ¶ã‚’é�¸æŠž", + "create.terrainzapper.shiftRightClickToSet": "シフト-右クリックで形状を選択", - "create.blockzapper.usingBlock": "使用中: %1$s", - "create.blockzapper.componentUpgrades": "コンãƒ�ーãƒ�ントアップグレード:", - "create.blockzapper.component.body": "ボディー", - "create.blockzapper.component.amplifier": "増幅", - "create.blockzapper.component.accelerator": "加速", - "create.blockzapper.component.retriever": "レトリーãƒ�ー", - "create.blockzapper.component.scope": "範囲", - "create.blockzapper.componentTier.none": "ç„¡ã�—", - "create.blockzapper.componentTier.brass": "真é�®", - "create.blockzapper.componentTier.chromatic": "色彩", - "create.blockzapper.leftClickToSet": "ブロックをシフト-左クリックã�§ãƒžãƒ†ãƒªã‚¢ãƒ«ã‚’é�¸æŠž", - "create.blockzapper.empty": "ブロックä¸�足!", + "create.blockzapper.usingBlock": "使用中: %1$s", + "create.blockzapper.componentUpgrades": "コンポーネントアップグレード:", + "create.blockzapper.component.body": "ボディー", + "create.blockzapper.component.amplifier": "増幅", + "create.blockzapper.component.accelerator": "加速", + "create.blockzapper.component.retriever": "レトリーバー", + "create.blockzapper.component.scope": "範囲", + "create.blockzapper.componentTier.none": "無し", + "create.blockzapper.componentTier.brass": "真鍮", + "create.blockzapper.componentTier.chromatic": "色彩", + "create.blockzapper.leftClickToSet": "ブロックをシフト-左クリックでマテリアルを選択", + "create.blockzapper.empty": "ブロック不足!", - "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.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": "UNLOCALIZED: Cart Movement Mode", "create.contraptions.cart_movement_mode.rotate": "UNLOCALIZED: Always face toward motion", "create.contraptions.cart_movement_mode.rotate_paused": "UNLOCALIZED: Pause actors while rotating", "create.contraptions.cart_movement_mode.rotation_locked": "UNLOCALIZED: Lock rotation", - "create.logistics.filter": "フィルタ", + "create.logistics.filter": "フィルタ", "create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter", "create.logistics.firstFrequency": "Freq. #1", "create.logistics.secondFrequency": "Freq. #2", -<<<<<<< HEAD - "create.gui.goggles.generator_stats": "ジェãƒ�レータã�®çµ±è¨ˆ:", - "create.gui.goggles.kinetic_stats": "動力ã�®çµ±è¨ˆ:", - "create.gui.goggles.at_current_speed": "ç�¾åœ¨ã�®é€Ÿåº¦", - "create.gui.goggles.base_value": "基本値", - "create.gui.gauge.info_header": "計器ã�®æƒ…å ±:", - "create.gui.speedometer.title": "回転速度", - "create.gui.stressometer.title": "ãƒ�ットワークã�®å¿œåŠ›", - "create.gui.stressometer.capacity": "残りã�®å®¹é‡�", - "create.gui.stressometer.overstressed": "超é�Žå¿œåŠ›", - "create.gui.stressometer.no_rotation": "回転ã�ªã�—", - "create.gui.contraptions.not_fast_enough": "ã�“ã�® %1$s ã�¯_å��分ã�ª_回転を_ã�—ã�¦ã�„ã�ªã�„_よã�†ã�§ã�™ã€‚", - "create.gui.contraptions.network_overstressed": "ã�“ã�®ä»•æŽ›ã�‘ã�¯_超é�Žå¿œåŠ›_ã�®ã‚ˆã�†ã�§ã�™ã€‚ã�•ã‚‰ã�«ã‚½ãƒ¼ã‚¹ã‚’追加ã�™ã‚‹ã�‹ã€�コンãƒ�ーãƒ�ントã�«_è² è�·ã‚’ã�‹ã�‘_応力ã�®å½±éŸ¿ã‚’大ã��ã��ã�—ã�¾ã�™ã€‚", - "create.gui.adjustable_crate.title": "調整å�¯èƒ½ã�ªã‚¯ãƒ¬ãƒ¼ãƒˆ", - "create.gui.adjustable_crate.storageSpace": "å�Žç´�スペース", - "create.gui.stockpile_switch.title": "在庫スイッãƒ�", - "create.gui.stockpile_switch.lowerLimit": "下é™�ã�—ã��ã�„値", - "create.gui.stockpile_switch.upperLimit": "上é™�ã�—ã��ã�„値", - "create.gui.stockpile_switch.startAt": "開始信å�·", - "create.gui.stockpile_switch.startAbove": "以上ã�®é–‹å§‹ä¿¡å�·", - "create.gui.stockpile_switch.stopAt": "å�œæ­¢ä¿¡å�·", - "create.gui.stockpile_switch.stopBelow": "以下ã�®å�œæ­¢ä¿¡å�·", - "create.gui.sequenced_gearshift.title": "シーケンスギアシフト", - "create.gui.sequenced_gearshift.instruction": "命令", - "create.gui.sequenced_gearshift.instruction.turn_angle": "回転", - "create.gui.sequenced_gearshift.instruction.turn_angle.angle": "角度", - "create.gui.sequenced_gearshift.instruction.turn_distance": "ピストン", - "create.gui.sequenced_gearshift.instruction.turn_distance.distance": "è·�離", - "create.gui.sequenced_gearshift.instruction.wait": "å¾…æ©Ÿ", - "create.gui.sequenced_gearshift.instruction.wait.duration": "期間", - "create.gui.sequenced_gearshift.instruction.end": "終了", - "create.gui.sequenced_gearshift.speed": "速度, æ–¹å�‘", - "create.gui.sequenced_gearshift.speed.forward": "入力速度, フォワード", - "create.gui.sequenced_gearshift.speed.forward_fast": "å€�速, フォワード", - "create.gui.sequenced_gearshift.speed.back": "入力速度, å��転", - "create.gui.sequenced_gearshift.speed.back_fast": "å€�速, å��転", - - "create.schematicAndQuill.dimensions": "概略図サイズ: %1$sx%2$sx%3$s", - "create.schematicAndQuill.firstPos": "最åˆ�ã�®ä½�置セット。", - "create.schematicAndQuill.secondPos": "2番目ã�®ä½�置セット。", - "create.schematicAndQuill.noTarget": "[Ctrl] を押ã�—ã�Ÿã�¾ã�¾ã�§ç©ºæ°—ブロックをé�¸æŠžã�—ã�¾ã�™", - "create.schematicAndQuill.abort": "é�¸æŠžã‚’削除ã�—ã�¾ã�—ã�Ÿã€‚", - "create.schematicAndQuill.prompt": "概略図ã�®å��å‰�を入力ã�—ã�¦ã��ã� ã�•ã�„:", -======= "create.gui.goggles.generator_stats": "ジェネレータの統計:", "create.gui.goggles.kinetic_stats": "動力の統計:", "create.gui.goggles.at_current_speed": "現在の速度", @@ -813,139 +704,51 @@ "create.schematicAndQuill.abort": "選択を削除しました。", "create.schematicAndQuill.title": "UNLOCALIZED: Schematic Name:", "create.schematicAndQuill.convert": "UNLOCALIZED: Save and Deploy Immediately", ->>>>>>> mc1.15/dev "create.schematicAndQuill.fallbackName": "My Schematic", - "create.schematicAndQuill.saved": "%1$s ã�¨ã�—ã�¦ä¿�å­˜ã�—ã�¾ã�—ã�Ÿ", + "create.schematicAndQuill.saved": "%1$s として保存しました", - "create.schematic.invalid": "[!] 無効ã�ªã‚¢ã‚¤ãƒ†ãƒ -代ã‚�ã‚Šã�«æ¦‚略図テーブルを使用ã�—ã�¦ã��ã� ã�•ã�„", - "create.schematic.position": "ä½�ç½®", - "create.schematic.rotation": "回転", - "create.schematic.rotation.none": "ç„¡ã�—", - "create.schematic.rotation.cw90": "時計回りã�«90", - "create.schematic.rotation.cw180": "時計回りã�«180", - "create.schematic.rotation.cw270": "時計回りã�«270", - "create.schematic.mirror": "ミラー", - "create.schematic.mirror.none": "ç„¡ã�—", - "create.schematic.mirror.frontBack": "æ­£é�¢-背é�¢", - "create.schematic.mirror.leftRight": "å·¦-å�³", - "create.schematic.tool.deploy": "é…�ç½®ã�™ã‚‹", - "create.schematic.tool.move": "XZを移動", - "create.schematic.tool.movey": "Yを移動", - "create.schematic.tool.rotate": "回転", - "create.schematic.tool.print": "å�°åˆ·", - "create.schematic.tool.flip": "フリップ", - "create.schematic.tool.deploy.description.0": "構造を特定ã�®å ´æ‰€ã�«ç§»å‹•ã�—ã�¾ã�™ã€‚", - "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.invalid": "[!] 無効なアイテム-代わりに概略図テーブルを使用してください", + "create.schematic.position": "位置", + "create.schematic.rotation": "回転", + "create.schematic.rotation.none": "無し", + "create.schematic.rotation.cw90": "時計回りに90", + "create.schematic.rotation.cw180": "時計回りに180", + "create.schematic.rotation.cw270": "時計回りに270", + "create.schematic.mirror": "ミラー", + "create.schematic.mirror.none": "無し", + "create.schematic.mirror.frontBack": "正面-背面", + "create.schematic.mirror.leftRight": "左-右", + "create.schematic.tool.deploy": "配置する", + "create.schematic.tool.move": "XZを移動", + "create.schematic.tool.movey": "Yを移動", + "create.schematic.tool.rotate": "回転", + "create.schematic.tool.print": "印刷", + "create.schematic.tool.flip": "フリップ", + "create.schematic.tool.deploy.description.0": "構造を特定の場所に移動します。", + "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.2": "", "create.schematic.tool.move.description.3": "", - "create.schematic.tool.movey.description.0": "概略図を垂直ã�«å‹•ã�‹ã�—ã�¾ã�™ã€‚", - "create.schematic.tool.movey.description.1": "[Ctrl]-スクロールã�—ã�¦ä¸Šä¸‹ã�«ç§»å‹•ã�—ã�¾ã�™ã€‚", + "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.1": "[Ctrl]-スクロールã�—ã�¦90度回転ã�—ã�¾ã�™ã€‚", + "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": "", - "create.schematic.tool.print.description.0": "構造物をå�³åº§ã�«ãƒ¯ãƒ¼ãƒ«ãƒ‰ã�«é…�ç½®ã�—ã�¾ã�™ã€‚", - "create.schematic.tool.print.description.1": "[å�³ã‚¯ãƒªãƒƒã‚¯] ã�—ã�¦ã€�ç�¾åœ¨ã�®å ´æ‰€ã�¸ã�®é…�置を確èª�ã�—ã�¾ã�™ã€‚", - "create.schematic.tool.print.description.2": "ã�“ã�®ãƒ„ールã�¯ã‚¯ãƒªã‚¨ã‚¤ãƒ†ã‚£ãƒ–モード専用ã�§ã�™ã€‚", + "create.schematic.tool.print.description.0": "構造物を即座にワールドに配置します。", + "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": "", -<<<<<<< HEAD - "create.schematics.synchronizing": "å�ŒæœŸã�—ã�¦ã�„ã�¾ã�™...", - "create.schematics.uploadTooLarge": "概略図ã�Œå¤§ã��ã�™ã�Žã�¾ã�™ã€‚", - "create.schematics.maxAllowedSize": "最大許容概略図ファイルサイズã�¯:", - - "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.settingsTitle": "é…�置設定", - "create.gui.schematicannon.listPrinter": "æ��料リストプリンター", - "create.gui.schematicannon.gunpowderLevel": "ç�«è–¬ã�¯ã�‚ã�¨ %1$s%% 残ã�£ã�¦ã�„ã�¾ã�™", - "create.gui.schematicannon.shotsRemaining": "残りã�®ã‚·ãƒ§ãƒƒãƒˆæ•°: %1$s", - "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.skipMissing": "ä¸�足ã�—ã�¦ã�„るブロックをスキップ", - "create.gui.schematicannon.option.skipTileEntities": "タイルエンティティをä¿�è­·ã�™ã‚‹", - "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.replaceWithEmpty.description": "大砲ã�¯ã€�空気ã�«ç½®ã��æ�›ã�ˆã‚‰ã‚Œã�Ÿã‚‚ã�®ã‚’å�«ã‚�ã€�ã��ã�®ä½œæ¥­ã‚¨ãƒªã‚¢å†…ã�®ã�™ã�¹ã�¦ã�®ãƒ–ロックを一掃ã�—ã�¾ã�™ã€‚", - - "create.schematicannon.status.idle": "å�œæ­¢ä¸­", - "create.schematicannon.status.ready": "準備完了", - "create.schematicannon.status.running": "稼åƒ�中", - "create.schematicannon.status.finished": "完æˆ�", - "create.schematicannon.status.paused": "一時å�œæ­¢ä¸­", - "create.schematicannon.status.stopped": "å�œæ­¢", - "create.schematicannon.status.noGunpowder": "ç�«è–¬ä¸�足", - "create.schematicannon.status.targetNotLoaded": "ブロックã�Œèª­ã�¿è¾¼ã�¾ã‚Œã�¦ã�„ã�¾ã�›ã‚“", - "create.schematicannon.status.targetOutsideRange": "ターゲットã�Œé� ã�™ã�Žã�¾ã�™", - "create.schematicannon.status.searching": "検索中", - "create.schematicannon.status.skipping": "スキップ", - "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.filter.blacklist": "ブラックリスト", - "create.gui.filter.blacklist.description": "上記ã�®ã�„ã�šã‚Œã�«ã‚‚一致ã�—ã�ªã�„å ´å�ˆã€�アイテムã�¯é€šã‚ŠæŠœã�‘ã�¾ã�™ã€‚ 空ã�®ãƒ–ラックリストã�¯ã�™ã�¹ã�¦ã‚’å�—ã�‘入れã�¾ã�™ã€‚", - "create.gui.filter.whitelist": "ホワイトリスト", - "create.gui.filter.whitelist.description": "上記ã�®ã�„ã�šã‚Œã�‹ã�«ä¸€è‡´ã�—ã�Ÿå ´å�ˆã€�アイテムã�¯é€šã‚ŠæŠœã�‘ã�¾ã�™ã€‚ 空ã�®ãƒ›ãƒ¯ã‚¤ãƒˆãƒªã‚¹ãƒˆã�¯ã�™ã�¹ã�¦ã‚’æ‹’å�¦ã�—ã�¾ã�™ã€‚", - "create.gui.filter.respect_data": "データをé‡�視", - "create.gui.filter.respect_data.description": "アイテムã�¯ã€�è€�久性ã€�エンãƒ�ャントã€�ã��ã�®ä»–ã�®å±žæ€§ã‚‚一致ã�™ã‚‹å ´å�ˆã�«ã�®ã�¿ä¸€è‡´ã�—ã�¾ã�™ã€‚", - "create.gui.filter.ignore_data": "データを無視", - "create.gui.filter.ignore_data.description": "アイテムã�¯å±žæ€§ã�«é–¢ä¿‚ã�ªã��一致ã�—ã�¾ã�™ã€‚", - - "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": "ã�²ã�©ã��æ��å‚·ã�—ã�¦ã‚‹ã�‹", - "create.item_attributes.not_stackable": "スタックå�¯èƒ½ã�‹", - "create.item_attributes.equipable": "装備å�¯èƒ½ã�‹", - "create.item_attributes.furnace_fuel": "ã�‹ã�¾ã�©ã�®ç‡ƒæ–™ã�‹", - "create.item_attributes.in_tag": "%1$s ã�®ã‚¿ã‚°ã�Œä»˜ã�‘られã�¦ã‚‹ã�‹", - "create.item_attributes.in_item_group": "%1$s ã�«å±žã�—ã�¦ã‚‹ã�‹", - "create.item_attributes.added_by": "%1$s ã�«ã‚ˆã�£ã�¦è¿½åŠ ã�•ã‚Œã�Ÿã�‹", - - "create.gui.attribute_filter.no_selected_attributes": "属性ã�Œé�¸æŠžã�•ã‚Œã�¦ã�„ã�¾ã�›ã‚“", - "create.gui.attribute_filter.selected_attributes": "é�¸æŠžã�•ã‚Œã�Ÿå±žæ€§:", - "create.gui.attribute_filter.whitelist_disjunctive": "ホワイトリスト（ã�©ã‚Œã�‹ï¼‰", - "create.gui.attribute_filter.whitelist_disjunctive.description": "é�¸æŠžã�—ã�Ÿå±žæ€§ã�®ã�„ã�šã‚Œã�‹ã‚’æŒ�ã�£ã�¦ã�„ã‚‹å ´å�ˆã€�アイテムã�¯é€šã‚ŠæŠœã�‘ã�¾ã�™ã€‚", - "create.gui.attribute_filter.whitelist_conjunctive": "ホワイトリスト（全ã�¦ï¼‰", - "create.gui.attribute_filter.whitelist_conjunctive.description": "é�¸æŠžã�—ã�Ÿå±žæ€§ã‚’ã�™ã�¹ã�¦ã‚’æŒ�ã�£ã�¦ã�„ã‚‹å ´å�ˆã€�アイテムã�¯é€šã‚ŠæŠœã�‘ã�¾ã�™ã€‚", - "create.gui.attribute_filter.blacklist": "ブラックリスト", - "create.gui.attribute_filter.blacklist.description": "é�¸æŠžã�•ã‚Œã�Ÿå±žæ€§ã‚’æŒ�ã�Ÿã�ªã�„å ´å�ˆã€�アイテムã�¯é€šã‚ŠæŠœã�‘ã�¾ã�™ã€‚", - "create.gui.attribute_filter.add_reference_item": "å�‚照アイテムを追加", - - "create.tooltip.holdKey": "[%1$s] を長押ã�—", - "create.tooltip.holdKeyOrKey": "[%1$s] ã�¾ã�Ÿã�¯ [%2$s] を長押ã�—", -======= "create.schematics.synchronizing": "同期しています...", "create.schematics.uploadTooLarge": "概略図が大きすぎます。", "create.schematics.maxAllowedSize": "最大許容概略図ファイルサイズは:", @@ -1055,25 +858,24 @@ "create.tooltip.holdKey": "[%1$s] を長押し", "create.tooltip.holdKeyOrKey": "[%1$s] または [%2$s] を長押し", ->>>>>>> mc1.15/dev "create.tooltip.keyShift": "Shift", "create.tooltip.keyCtrl": "Ctrl", - "create.tooltip.speedRequirement": "スピードè¦�件: %1$s", - "create.tooltip.speedRequirement.none": "ç„¡ã�—", - "create.tooltip.speedRequirement.medium": "中速", - "create.tooltip.speedRequirement.high": "高速", - "create.tooltip.stressImpact": "応力ã�¸ã�®å½±éŸ¿: %1$s", - "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": "(ジェãƒ�レータã�¨ã�—ã�¦)", - "create.tooltip.generationSpeed": "%1$s %2$sを生æˆ�", - "create.tooltip.analogStrength": "アナログ強度: %1$s/15", + "create.tooltip.speedRequirement": "スピード要件: %1$s", + "create.tooltip.speedRequirement.none": "無し", + "create.tooltip.speedRequirement.medium": "中速", + "create.tooltip.speedRequirement.high": "高速", + "create.tooltip.stressImpact": "応力への影響: %1$s", + "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": "(ジェネレータとして)", + "create.tooltip.generationSpeed": "%1$s %2$sを生成", + "create.tooltip.analogStrength": "アナログ強度: %1$s/15", "create.mechanical_arm.extract_from": "UNLOCALIZED: Take items from %1$s", "create.mechanical_arm.deposit_to": "UNLOCALIZED: Deposit items to %1$s", @@ -1103,238 +905,238 @@ "create.gui.config.overlay8": "UNLOCALIZED: to reset to the default position", "create.command.killTPSCommand": "killtps", - "create.command.killTPSCommand.status.slowed_by.0": "[Create]:サーãƒ�ーティックã�¯ç�¾åœ¨ %s ms é�…ã��ã�ªã�£ã�¦ã�„ã�¾ã�™ :o", - "create.command.killTPSCommand.status.slowed_by.1": "[Create]: サーãƒ�ーティックã�Œ %s ms é�…ã��ã�ªã‚Šã�¾ã�—ã�Ÿ >:)", - "create.command.killTPSCommand.status.slowed_by.2": "[Create]: サーãƒ�ーティックã�Œé€šå¸¸ã�®é€Ÿåº¦ã�«æˆ»ã‚Šã�¾ã�—ã�Ÿ:D", - "create.command.killTPSCommand.status.usage.0": "[Create]: /killtps stopを使用ã�—ã�¦ã‚µãƒ¼ãƒ�ーã�®ãƒ†ã‚£ãƒƒã‚¯ã‚’通常ã�®é€Ÿåº¦ã�«æˆ»ã�—ã�¾ã�™", - "create.command.killTPSCommand.status.usage.1": "[Create]: /killtps start を使用ã�—ã�¦ã€�サーãƒ�ーã�®ãƒ†ã‚£ãƒƒã‚¯ã‚’æ„�図的ã�«é�…ã��ã�—ã�¾ã�™", + "create.command.killTPSCommand.status.slowed_by.0": "[Create]:サーバーティックは現在 %s ms 遅くなっています :o", + "create.command.killTPSCommand.status.slowed_by.1": "[Create]: サーバーティックが %s ms 遅くなりました >:)", + "create.command.killTPSCommand.status.slowed_by.2": "[Create]: サーバーティックが通常の速度に戻りました:D", + "create.command.killTPSCommand.status.usage.0": "[Create]: /killtps stopを使用してサーバーのティックを通常の速度に戻します", + "create.command.killTPSCommand.status.usage.1": "[Create]: /killtps start を使用して、サーバーのティックを意図的に遅くします", "create.command.killTPSCommand.argument.tickTime": "tickTime", - "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": "ファンãƒ�ル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": "ファンネルCHOMPS", "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily", "_": "->------------------------] Item Descriptions [------------------------<-", - "item.create.example_item.tooltip": "アイテムã�®ä¾‹ï¼ˆã�“ã�®ãƒ„ールãƒ�ップã�Œå­˜åœ¨ã�™ã‚‹å�˜ã�ªã‚‹ãƒžãƒ¼ã‚«ãƒ¼ï¼‰", - "item.create.example_item.tooltip.summary": "アイテムã�®ç°¡å�˜ã�ªèª¬æ˜Žã€‚ _アンダースコア_用語を強調表示ã�—ã�¾ã�™ã€‚", - "item.create.example_item.tooltip.condition1": "ã�“ã‚Œã�¯", - "item.create.example_item.tooltip.behaviour1": "次ã�«ã€�ã�“ã�®ã‚¢ã‚¤ãƒ†ãƒ ã�¯ã�“れを行ã�„ã�¾ã�™ã€‚ （行動ã�¯ã‚·ãƒ•ãƒˆã�§ç¤ºã�•ã‚Œã�¾ã�™ï¼‰", - "item.create.example_item.tooltip.condition2": "ã��ã�—ã�¦ã�“ã‚Œã�¯", - "item.create.example_item.tooltip.behaviour2": "ã�‚ã�ªã�Ÿã�¯å¥½ã��ã�ªã� ã�‘行動を追加ã�™ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™", - "item.create.example_item.tooltip.control1": "Ctrlを押ã�—ã�Ÿã�¨ã��", - "item.create.example_item.tooltip.action1": "ã�“れらã�®ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã�Œè¡¨ç¤ºã�•ã‚Œã�¾ã�™ã€‚", + "item.create.example_item.tooltip": "アイテムの例（このツールチップが存在する単なるマーカー）", + "item.create.example_item.tooltip.summary": "アイテムの簡単な説明。 _アンダースコア_用語を強調表示します。", + "item.create.example_item.tooltip.condition1": "これは", + "item.create.example_item.tooltip.behaviour1": "次に、このアイテムはこれを行います。 （行動はシフトで示されます）", + "item.create.example_item.tooltip.condition2": "そしてこれは", + "item.create.example_item.tooltip.behaviour2": "あなたは好きなだけ行動を追加することができます", + "item.create.example_item.tooltip.control1": "Ctrlを押したとき", + "item.create.example_item.tooltip.action1": "これらのコントロールが表示されます。", - "item.create.wand_of_symmetry.tooltip": "対称性ã�Œå¿…è¦�", - "item.create.wand_of_symmetry.tooltip.summary": "構æˆ�ã�•ã‚Œã�Ÿãƒ—レーン全体ã�®ãƒ–ロックé…�置を完全ã�«ãƒŸãƒ©ãƒ¼ãƒªãƒ³ã‚°ã�—ã�¾ã�™ã€‚", - "item.create.wand_of_symmetry.tooltip.condition1": "ホットãƒ�ーã�«ã�‚ã‚‹ã�¨ã��", - "item.create.wand_of_symmetry.tooltip.behaviour1": "アクティブã�®ã�¾ã�¾", - "item.create.wand_of_symmetry.tooltip.control1": "地é�¢ã‚’å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.wand_of_symmetry.tooltip.action1": "ミラーを_作æˆ�_ã�¾ã�Ÿã�¯_移動_", - "item.create.wand_of_symmetry.tooltip.control2": "空中をå�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.wand_of_symmetry.tooltip.action2": "アクティブã�ªãƒŸãƒ©ãƒ¼ã‚’_削除_", - "item.create.wand_of_symmetry.tooltip.control3": "スニークã�—ã�ªã�Œã‚‰å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.wand_of_symmetry.tooltip.action3": "_設定インターフェース_ã‚’é–‹ã��ã�¾ã�™", + "item.create.wand_of_symmetry.tooltip": "対称性が必要", + "item.create.wand_of_symmetry.tooltip.summary": "構成されたプレーン全体のブロック配置を完全にミラーリングします。", + "item.create.wand_of_symmetry.tooltip.condition1": "ホットバーにあるとき", + "item.create.wand_of_symmetry.tooltip.behaviour1": "アクティブのまま", + "item.create.wand_of_symmetry.tooltip.control1": "地面を右クリックしたとき", + "item.create.wand_of_symmetry.tooltip.action1": "ミラーを_作成_または_移動_", + "item.create.wand_of_symmetry.tooltip.control2": "空中を右クリックしたとき", + "item.create.wand_of_symmetry.tooltip.action2": "アクティブなミラーを_削除_", + "item.create.wand_of_symmetry.tooltip.control3": "スニークしながら右クリックしたとき", + "item.create.wand_of_symmetry.tooltip.action3": "_設定インターフェース_を開きます", - "item.create.handheld_blockzapper.tooltip": "ブロックザッパー", - "item.create.handheld_blockzapper.tooltip.summary": "離れã�Ÿå ´æ‰€ã�«ãƒ–ロックをé…�ç½®ã�¾ã�Ÿã�¯äº¤æ�›ã�™ã‚‹ã�Ÿã‚�ã�®æ–°ã�—ã�„ガジェット。", - "item.create.handheld_blockzapper.tooltip.control1": "ブロックを左クリックã�—ã�Ÿã�¨ã��", - "item.create.handheld_blockzapper.tooltip.action1": "ターゲットã�®ãƒ–ロックをã�“ã�®ãƒ„ールã�«è¨­å®šã�—ã�¾ã�™ã€‚", - "item.create.handheld_blockzapper.tooltip.control2": "ブロックをå�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.handheld_blockzapper.tooltip.action2": "ターゲットブロックを_é…�ç½®_ã�¾ã�Ÿã�¯_ç½®æ�›_ã�—ã�¾ã�™ã€‚", - "item.create.handheld_blockzapper.tooltip.control3": "スニークã�—ã�ªã�Œã‚‰å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.handheld_blockzapper.tooltip.action3": "_設定インターフェース_ã‚’é–‹ã��ã�¾ã�™", + "item.create.handheld_blockzapper.tooltip": "ブロックザッパー", + "item.create.handheld_blockzapper.tooltip.summary": "離れた場所にブロックを配置または交換するための新しいガジェット。", + "item.create.handheld_blockzapper.tooltip.control1": "ブロックを左クリックしたとき", + "item.create.handheld_blockzapper.tooltip.action1": "ターゲットのブロックをこのツールに設定します。", + "item.create.handheld_blockzapper.tooltip.control2": "ブロックを右クリックしたとき", + "item.create.handheld_blockzapper.tooltip.action2": "ターゲットブロックを_配置_または_置換_します。", + "item.create.handheld_blockzapper.tooltip.control3": "スニークしながら右クリックしたとき", + "item.create.handheld_blockzapper.tooltip.action3": "_設定インターフェース_を開きます", - "item.create.handheld_worldshaper.tooltip": "ãƒ�ンドヘルドワールドシェーパー", - "item.create.handheld_worldshaper.tooltip.summary": "_風景_ã‚„_地形ã�®ç‰¹å¾´_を作æˆ�ã�™ã‚‹ã�Ÿã‚�ã�®ä¾¿åˆ©ã�ªãƒ„ール。", - "item.create.handheld_worldshaper.tooltip.control1": "ブロックを左クリックã�—ã�Ÿã�¨ã��", - "item.create.handheld_worldshaper.tooltip.action1": "ターゲットã�®ãƒ–ロックをã�“ã�®ãƒ„ールã�«è¨­å®šã�—ã�¾ã�™ã€‚", - "item.create.handheld_worldshaper.tooltip.control2": "ブロックをå�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.handheld_worldshaper.tooltip.action2": "ç�¾åœ¨é�¸æŠžã�•ã‚Œã�¦ã�„ã‚‹_ブラシ_ã�¨_ツール_をターゲットã�®å ´æ‰€ã�«é�©ç”¨ã�—ã�¾ã�™ã€‚", - "item.create.handheld_worldshaper.tooltip.control3": "スニークã�—ã�ªã�Œã‚‰å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.handheld_worldshaper.tooltip.action3": "_設定インターフェース_ã‚’é–‹ã��ã�¾ã�™", + "item.create.handheld_worldshaper.tooltip": "ハンドヘルドワールドシェーパー", + "item.create.handheld_worldshaper.tooltip.summary": "_風景_や_地形の特徴_を作成するための便利なツール。", + "item.create.handheld_worldshaper.tooltip.control1": "ブロックを左クリックしたとき", + "item.create.handheld_worldshaper.tooltip.action1": "ターゲットのブロックをこのツールに設定します。", + "item.create.handheld_worldshaper.tooltip.control2": "ブロックを右クリックしたとき", + "item.create.handheld_worldshaper.tooltip.action2": "現在選択されている_ブラシ_と_ツール_をターゲットの場所に適用します。", + "item.create.handheld_worldshaper.tooltip.control3": "スニークしながら右クリックしたとき", + "item.create.handheld_worldshaper.tooltip.action3": "_設定インターフェース_を開きます", - "item.create.tree_fertilizer.tooltip": "木質肥料", - "item.create.tree_fertilizer.tooltip.summary": "一般的ã�ªæœ¨ã�®ç¨®é¡žã�®æˆ�長を加速ã�™ã‚‹ã�®ã�«é�©ã�—ã�ŸãƒŸãƒ�ラルã�®å¼·åŠ›ã�ªçµ„ã�¿å�ˆã‚�ã�›ã€‚", - "item.create.tree_fertilizer.tooltip.condition1": "苗木ã�«ä½¿ç”¨ã�—ã�Ÿã�¨ã��", - "item.create.tree_fertilizer.tooltip.behaviour1": "_é–“éš”ã�®æ�¡ä»¶_ã�«_関係ã�ªã��_ツリーをæˆ�é•·ã�•ã�›ã‚‹", + "item.create.tree_fertilizer.tooltip": "木質肥料", + "item.create.tree_fertilizer.tooltip.summary": "一般的な木の種類の成長を加速するのに適したミネラルの強力な組み合わせ。", + "item.create.tree_fertilizer.tooltip.condition1": "苗木に使用したとき", + "item.create.tree_fertilizer.tooltip.behaviour1": "_間隔の条件_に_関係なく_ツリーを成長させる", - "item.create.deforester.tooltip": "デフォレスター", - "item.create.deforester.tooltip.summary": "一瞬ã�§æœ¨ã‚’切り倒ã�™ã�“ã�¨ã�Œã�§ã��ã‚‹_è¼�ã��æ–§_。", + "item.create.deforester.tooltip": "デフォレスター", + "item.create.deforester.tooltip.summary": "一瞬で木を切り倒すことができる_輝く斧_。", "item.create.extendo_grip.tooltip": "UNLOCALIZED: EXTENDO GRIP", "item.create.extendo_grip.tooltip.summary": "UNLOCALIZED: Boioioing! Greatly _increases_ _reach_ _distance_ of the wielder.", "item.create.extendo_grip.tooltip.condition1": "UNLOCALIZED: When in Off-Hand", "item.create.extendo_grip.tooltip.behaviour1": "UNLOCALIZED: Increases _reach_ _distance_ of items used in the _Main-Hand_.", - "item.create.filter.tooltip": "フィルタ", - "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.filter.tooltip": "フィルタ", + "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.attribute_filter.tooltip": "属性フィルター", - "item.create.attribute_filter.tooltip.summary": "ロジスティックデãƒ�イスã�®_出力_ã�¨_入力_をより_正確_ã�«_制御_ã�—ã€�アイテムã�®_属性_ã�¨_カテゴリã�®ã‚»ãƒƒãƒˆ_ã�¨ç…§å�ˆã�—ã�¾ã�™ã€‚", - "item.create.attribute_filter.tooltip.condition1": "フィルタースロットã�«ã‚»ãƒƒãƒˆã�—ã�Ÿã�¨ã��", - "item.create.attribute_filter.tooltip.behaviour1": "_構æˆ�_ã�«å¿œã�˜ã�¦ã‚¢ã‚¤ãƒ†ãƒ ã�®æµ�れを_制御_ã�—ã�¾ã�™ã€‚", - "item.create.attribute_filter.tooltip.condition2": "å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.attribute_filter.tooltip.behaviour2": "_設定インターフェース_ã‚’é–‹ã��ã�¾ã�™", + "item.create.attribute_filter.tooltip": "属性フィルター", + "item.create.attribute_filter.tooltip.summary": "ロジスティックデバイスの_出力_と_入力_をより_正確_に_制御_し、アイテムの_属性_と_カテゴリのセット_と照合します。", + "item.create.attribute_filter.tooltip.condition1": "フィルタースロットにセットしたとき", + "item.create.attribute_filter.tooltip.behaviour1": "_構成_に応じてアイテムの流れを_制御_します。", + "item.create.attribute_filter.tooltip.condition2": "右クリックしたとき", + "item.create.attribute_filter.tooltip.behaviour2": "_設定インターフェース_を開きます", - "item.create.empty_schematic.tooltip": "空ã�®ã‚¹ã‚­ãƒ¼ãƒž", - "item.create.empty_schematic.tooltip.summary": "レシピã�®æ��æ–™ã�¨ã�—ã�¦ã€�ã�Šã‚ˆã�³_概略図テーブル_ã�§ã�®è¨˜è¿°ã�«ä½¿ç”¨ã�•ã‚Œã�¾ã�™ã€‚", + "item.create.empty_schematic.tooltip": "空のスキーマ", + "item.create.empty_schematic.tooltip.summary": "レシピの材料として、および_概略図テーブル_での記述に使用されます。", - "item.create.schematic.tooltip": "概略図", - "item.create.schematic.tooltip.summary": "ワールドã�«é…�ç½®ã�Šã‚ˆã�³é…�ç½®ã�•ã‚Œã‚‹æ§‹é€ ã‚’ä¿�æŒ�ã�—ã�¾ã�™ã€‚ ホログラムを必è¦�ã�«å¿œã�˜ã�¦é…�ç½®ã�—ã€�_概略図砲_を使用ã�—ã�¦ä½œæˆ�ã�—ã�¾ã�™ã€‚", - "item.create.schematic.tooltip.condition1": "æŒ�ã�£ã�Ÿã�¨ã��", - "item.create.schematic.tooltip.behaviour1": "ç”»é�¢ä¸Šã�®ãƒ„ールを使用ã�—ã�¦é…�ç½®ã�§ã��ã�¾ã�™ã€‚", - "item.create.schematic.tooltip.control1": "スニークã�—ã�ªã�Œã‚‰å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.schematic.tooltip.action1": "正確ã�ª_座標_を入力ã�™ã‚‹ã�Ÿã‚�ã�®_インターフェース_ã‚’é–‹ã��ã�¾ã�™ã€‚", + "item.create.schematic.tooltip": "概略図", + "item.create.schematic.tooltip.summary": "ワールドに配置および配置される構造を保持します。 ホログラムを必要に応じて配置し、_概略図砲_を使用して作成します。", + "item.create.schematic.tooltip.condition1": "持ったとき", + "item.create.schematic.tooltip.behaviour1": "画面上のツールを使用して配置できます。", + "item.create.schematic.tooltip.control1": "スニークしながら右クリックしたとき", + "item.create.schematic.tooltip.action1": "正確な_座標_を入力するための_インターフェース_を開きます。", - "item.create.schematic_and_quill.tooltip": "概略図ã�¨ç¾½æ ¹ãƒšãƒ³", - "item.create.schematic_and_quill.tooltip.summary": "ワールドã�®æ§‹é€ ç‰©ã‚’.nbtファイルã�«ä¿�å­˜ã�™ã‚‹ã�Ÿã‚�ã�«ä½¿ç”¨ã�•ã‚Œã�¾ã�™ã€‚", - "item.create.schematic_and_quill.tooltip.condition1": "ステップ1", - "item.create.schematic_and_quill.tooltip.behaviour1": "å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�¦2ã�¤ã�®ã‚³ãƒ¼ãƒŠãƒ¼ãƒ�イントをé�¸æŠžã�—ã�¾ã�™ã€‚", - "item.create.schematic_and_quill.tooltip.condition2": "ステップ2", - "item.create.schematic_and_quill.tooltip.behaviour2": "_Ctrlキーを押ã�—ã�ªã�Œã‚‰ã‚¹ã‚¯ãƒ­ãƒ¼ãƒ«_ã�—ã�¦ã€�サイズを調整ã�—ã�¾ã�™ã€‚ ã‚‚ã�†ä¸€åº¦å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�¦ä¿�å­˜ã�—ã�¾ã�™ã€‚", - "item.create.schematic_and_quill.tooltip.control1": "å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.schematic_and_quill.tooltip.action1": "コーナーãƒ�イントをé�¸æŠž/ä¿�存を確èª�ã�—ã�¾ã�™ã€‚", - "item.create.schematic_and_quill.tooltip.control2": "Ctrlを長押ã�—ã�¦ã‚‹ã�¨ã��", - "item.create.schematic_and_quill.tooltip.action2": "_空中_ã�§ãƒ�イントをé�¸æŠžã�—ã�¾ã�™ã€‚ _スクロール_ã�—ã�¦è·�離を調整ã�—ã�¾ã�™ã€‚", - "item.create.schematic_and_quill.tooltip.control3": "スニークã�—ã�ªã�Œã‚‰å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.schematic_and_quill.tooltip.action3": "é�¸æŠžã‚’_リセット_ã�—ã�¦å‰Šé™¤ã�—ã�¾ã�™ã€‚", + "item.create.schematic_and_quill.tooltip": "概略図と羽根ペン", + "item.create.schematic_and_quill.tooltip.summary": "ワールドの構造物を.nbtファイルに保存するために使用されます。", + "item.create.schematic_and_quill.tooltip.condition1": "ステップ1", + "item.create.schematic_and_quill.tooltip.behaviour1": "右クリックして2つのコーナーポイントを選択します。", + "item.create.schematic_and_quill.tooltip.condition2": "ステップ2", + "item.create.schematic_and_quill.tooltip.behaviour2": "_Ctrlキーを押しながらスクロール_して、サイズを調整します。 もう一度右クリックして保存します。", + "item.create.schematic_and_quill.tooltip.control1": "右クリックしたとき", + "item.create.schematic_and_quill.tooltip.action1": "コーナーポイントを選択/保存を確認します。", + "item.create.schematic_and_quill.tooltip.control2": "Ctrlを長押してるとき", + "item.create.schematic_and_quill.tooltip.action2": "_空中_でポイントを選択します。 _スクロール_して距離を調整します。", + "item.create.schematic_and_quill.tooltip.control3": "スニークしながら右クリックしたとき", + "item.create.schematic_and_quill.tooltip.action3": "選択を_リセット_して削除します。", - "block.create.schematicannon.tooltip": "スキーマキャノン", - "block.create.schematicannon.tooltip.summary": "ブロックを撃ã�£ã�¦ã€�展開ã�•ã‚Œã�Ÿ_概略図_ã‚’ã‚‚ã�¨ã�«ãƒ¯ãƒ¼ãƒ«ãƒ‰ã�«è¨­ç½®ã�—ã�¾ã�™ã€‚ 隣接ã�™ã‚‹ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã�‹ã‚‰ã�®ã‚¢ã‚¤ãƒ†ãƒ ã‚’供給ã�—ã€�_ç�«è–¬_を燃料ã�¨ã�—ã�¦ä½¿ç”¨ã�—ã�¾ã�™ã€‚", - "block.create.schematicannon.tooltip.control1": "å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "block.create.schematicannon.tooltip.action1": "_インターフェイス_ã‚’é–‹ã��ã�¾ã�™", + "block.create.schematicannon.tooltip": "スキーマキャノン", + "block.create.schematicannon.tooltip.summary": "ブロックを撃って、展開された_概略図_をもとにワールドに設置します。 隣接するインベントリからのアイテムを供給し、_火薬_を燃料として使用します。", + "block.create.schematicannon.tooltip.control1": "右クリックしたとき", + "block.create.schematicannon.tooltip.action1": "_インターフェイス_を開きます", - "block.create.schematic_table.tooltip": "概略図テーブル", - "block.create.schematic_table.tooltip.summary": "ä¿�å­˜ã�•ã‚Œã�Ÿæ¦‚略図を_空ã�®æ¦‚略図_ã�«æ›¸ã��è¾¼ã�¿ã�¾ã�™ã€‚", - "block.create.schematic_table.tooltip.condition1": "空ã�®æ¦‚略図ã�Œä¸Žã�ˆã‚‰ã‚Œã�Ÿã�¨ã��", - "block.create.schematic_table.tooltip.behaviour1": "Schematicsフォルダã�‹ã‚‰é�¸æŠžã�—ã�Ÿãƒ•ã‚¡ã‚¤ãƒ«ã‚’アップロードã�—ã�¾ã�™ã€‚", + "block.create.schematic_table.tooltip": "概略図テーブル", + "block.create.schematic_table.tooltip.summary": "保存された概略図を_空の概略図_に書き込みます。", + "block.create.schematic_table.tooltip.condition1": "空の概略図が与えられたとき", + "block.create.schematic_table.tooltip.behaviour1": "Schematicsフォルダから選択したファイルをアップロードします。", - "block.create.shaft.tooltip": "軸", - "block.create.shaft.tooltip.summary": "_回転_ã‚’ç›´ç·šã�§_中継_ã�—ã�¾ã�™ã€‚", + "block.create.shaft.tooltip": "軸", + "block.create.shaft.tooltip.summary": "_回転_を直線で_中継_します。", - "block.create.cogwheel.tooltip": "コグホイール", - "block.create.cogwheel.tooltip.summary": "_回転_ã‚’ç›´ç·šã�§ã€�隣接ã�™ã‚‹_歯車_ã�«_中継_ã�—ã�¾ã�™ã€‚", + "block.create.cogwheel.tooltip": "コグホイール", + "block.create.cogwheel.tooltip.summary": "_回転_を直線で、隣接する_歯車_に_中継_します。", - "block.create.large_cogwheel.tooltip": "大型コグホイール", - "block.create.large_cogwheel.tooltip.summary": "より大ã��ã�ªãƒ�ージョンã�®_歯車_ã�«ã‚ˆã‚Šã€�å°�ã�•ã�ªå¯¾å¿œç‰©ã�«æŽ¥ç¶šã�—ã�Ÿã�¨ã��ã�«_回転速度_ã‚’_変更_ã�§ã��ã�¾ã�™ã€‚", + "block.create.large_cogwheel.tooltip": "大型コグホイール", + "block.create.large_cogwheel.tooltip.summary": "より大きなバージョンの_歯車_により、小さな対応物に接続したときに_回転速度_を_変更_できます。", - "block.create.encased_shaft.tooltip": "内蔵シャフト", - "block.create.encased_shaft.tooltip.summary": "_回転_ã‚’ç›´ç·šã�§_中継_ã�—ã�¾ã�™ã€‚ å£�を通é�Žã�™ã‚‹å›žè»¢ã�®ä¼�æ’­ã�«é�©ã�—ã�¦ã�„ã�¾ã�™ã€‚", + "block.create.encased_shaft.tooltip": "内蔵シャフト", + "block.create.encased_shaft.tooltip.summary": "_回転_を直線で_中継_します。 壁を通過する回転の伝播に適しています。", - "block.create.gearbox.tooltip": "ギアボックス", - "block.create.gearbox.tooltip.summary": "_中継_ã�™ã‚‹_4æ–¹å�‘_ã�®_回転_直線接続を逆ã�«ã�—ã�¾ã�™ã€‚", + "block.create.gearbox.tooltip": "ギアボックス", + "block.create.gearbox.tooltip.summary": "_中継_する_4方向_の_回転_直線接続を逆にします。", "item.create.vertical_gearbox.tooltip": "UNLOCALIZED: VERTICAL GEARBOX", "item.create.vertical_gearbox.tooltip.summary": "UNLOCALIZED: _Relays_ _Rotation_ in _four_ _directions_ Reverses straight connections.", - "block.create.gearshift.tooltip": "ギアシフト", - "block.create.gearshift.tooltip.summary": "接続ã�•ã‚Œã�Ÿã‚·ãƒ£ãƒ•ãƒˆã�®å›žè»¢æ–¹å�‘を切り替ã�ˆã‚‹ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã€‚", - "block.create.gearshift.tooltip.condition1": "パワーã�Œå…¥ã�£ã�¦ã‚‹ã�¨ã��", - "block.create.gearshift.tooltip.behaviour1": "出ã�¦è¡Œã��回転を_逆_ã�«ã�—ã�¾ã�™ã€‚", + "block.create.gearshift.tooltip": "ギアシフト", + "block.create.gearshift.tooltip.summary": "接続されたシャフトの回転方向を切り替えるコントロール。", + "block.create.gearshift.tooltip.condition1": "パワーが入ってるとき", + "block.create.gearshift.tooltip.behaviour1": "出て行く回転を_逆_にします。", - "block.create.clutch.tooltip": "クラッãƒ�", - "block.create.clutch.tooltip.summary": "接続ã�•ã‚Œã�Ÿã‚·ãƒ£ãƒ•ãƒˆã�®å›žè»¢ã‚’オン/オフã�™ã‚‹ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ«ã€‚", - "block.create.clutch.tooltip.condition1": "パワーã�Œå…¥ã�£ã�¦ã‚‹ã�¨ã��", - "block.create.clutch.tooltip.behaviour1": "å��対å�´ã�¸ã�®å›žè»¢ã�®ä¼�é�”ã‚’_å�œæ­¢_ã�—ã�¾ã�™ã€‚", + "block.create.clutch.tooltip": "クラッチ", + "block.create.clutch.tooltip.summary": "接続されたシャフトの回転をオン/オフするコントロール。", + "block.create.clutch.tooltip.condition1": "パワーが入ってるとき", + "block.create.clutch.tooltip.behaviour1": "反対側への回転の伝達を_停止_します。", - "block.create.encased_belt.tooltip": "ケース入りベルト", - "block.create.encased_belt.tooltip.summary": "_回転_ã‚’ã��ã�®ãƒ–ロックã�¨æŽ¥ç¶šã�•ã‚Œã�Ÿ_ケース入りベルト_ã�«_中継_ã�—ã�¾ã�™ã€‚", - "block.create.encased_belt.tooltip.condition1": "接続ã�—ã�Ÿã�¨ã��", - "block.create.encased_belt.tooltip.behaviour1": "アタッãƒ�ã�•ã‚Œã�Ÿãƒ–ロックã�®_回転速度_ã�¨æ–¹å�‘ã�¯ã�¾ã�£ã�Ÿã��_å�Œã�˜_ã�§ã�™ã€‚ 彼らã�¯å�Œã�˜ã‚ˆã�†ã�«å�‘ã��å�ˆã�†å¿…è¦�ã�¯ã�‚ã‚Šã�¾ã�›ã‚“。", + "block.create.encased_belt.tooltip": "ケース入りベルト", + "block.create.encased_belt.tooltip.summary": "_回転_をそのブロックと接続された_ケース入りベルト_に_中継_します。", + "block.create.encased_belt.tooltip.condition1": "接続したとき", + "block.create.encased_belt.tooltip.behaviour1": "アタッチされたブロックの_回転速度_と方向はまったく_同じ_です。 彼らは同じように向き合う必要はありません。", - "block.create.adjustable_pulley.tooltip": "アナログベルトプーリー", - "block.create.adjustable_pulley.tooltip.summary": "ブロックを介ã�—ã�¦_回転を中継_ã�—ã€�å�–り付ã�‘られã�Ÿ_ケース入りベルト_ã�«ä¼�é�”ã�—ã�¾ã�™ã€‚ å�–り付ã�‘られã�ŸåŒ…ã�¿è¾¼ã�¾ã‚Œã�Ÿãƒ™ãƒ«ãƒˆã�¯ã€�ã�“ã�®ãƒ–ロックã�Œå�—ä¿¡ã�™ã‚‹_アナログレッドストーン信å�·_ã�«åŸºã�¥ã�„ã�¦_より速ã��回転_ã�—ã�¾ã�™ã€‚", - "block.create.adjustable_pulley.tooltip.condition1": "レッドストーンコントロール", - "block.create.adjustable_pulley.tooltip.behaviour1": "ä¿¡å�·ã�Œã�ªã�„ã�¨ã€�接続ã�•ã‚Œã�¦ã�„るベルトã�®_速度ã�Œä¸Šã�Œã‚Šã�¾ã�›ã‚“_。 フルストレングスシグナル接続ベルトã�«ã‚ˆã‚Šã€�_速度ã�¯2å€�ã�«ã�ªã‚Šã�¾ã�™_。", + "block.create.adjustable_pulley.tooltip": "アナログベルトプーリー", + "block.create.adjustable_pulley.tooltip.summary": "ブロックを介して_回転を中継_し、取り付けられた_ケース入りベルト_に伝達します。 取り付けられた包み込まれたベルトは、このブロックが受信する_アナログレッドストーン信号_に基づいて_より速く回転_します。", + "block.create.adjustable_pulley.tooltip.condition1": "レッドストーンコントロール", + "block.create.adjustable_pulley.tooltip.behaviour1": "信号がないと、接続されているベルトの_速度が上がりません_。 フルストレングスシグナル接続ベルトにより、_速度は2倍になります_。", - "item.create.belt_connector.tooltip": "ベルトコãƒ�クター", - "item.create.belt_connector.tooltip.summary": "2ã�¤ä»¥ä¸Šã�®_シャフト_ã‚’_メカニカルベルト_ã�§æŽ¥ç¶šã�—ã�¾ã�™ã€‚ 接続ã�•ã‚Œã�Ÿã‚·ãƒ£ãƒ•ãƒˆã�®å›žè»¢é€Ÿåº¦ã�¨æ–¹å�‘ã�¯ã�¾ã�£ã�Ÿã��å�Œã�˜ã�§ã�™ã€‚ ベルトã�¯ã€�_アイテム_ã�¨_エンティティ_ã�®_コンベア_ã�¨ã�—ã�¦æ©Ÿèƒ½ã�§ã��ã�¾ã�™ã€‚", - "item.create.belt_connector.tooltip.control1": "シャフトをå�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.belt_connector.tooltip.action1": "ベルトã�®1ã�¤ã�®ãƒ—ーリーã�¨ã�—ã�¦ã‚·ãƒ£ãƒ•ãƒˆã‚’é�¸æŠžã�—ã�¾ã�™ã€‚ é�¸æŠžã�—ã�Ÿä¸¡æ–¹ã�®ã‚·ãƒ£ãƒ•ãƒˆã�¯ã€�_ベルトã�®æ–¹å�‘_ã�«å�‘ã�‹ã�£ã�¦_åž‚ç›´_ã€�_æ°´å¹³_ã€�ã�¾ã�Ÿã�¯_æ–œã‚�_ã�«æ•´åˆ—ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚", - "item.create.belt_connector.tooltip.control2": "スニークã�—ã�ªã�Œã‚‰ã‚·ãƒ£ãƒ•ãƒˆã‚’å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "item.create.belt_connector.tooltip.action2": "ベルトã�®æœ€åˆ�ã�«é�¸æŠžã�•ã‚Œã�Ÿä½�置を_リセット_ã�—ã�¾ã�™ã€‚", + "item.create.belt_connector.tooltip": "ベルトコネクター", + "item.create.belt_connector.tooltip.summary": "2つ以上の_シャフト_を_メカニカルベルト_で接続します。 接続されたシャフトの回転速度と方向はまったく同じです。 ベルトは、_アイテム_と_エンティティ_の_コンベア_として機能できます。", + "item.create.belt_connector.tooltip.control1": "シャフトを右クリックしたとき", + "item.create.belt_connector.tooltip.action1": "ベルトの1つのプーリーとしてシャフトを選択します。 選択した両方のシャフトは、_ベルトの方向_に向かって_垂直_、_水平_、または_斜め_に整列する必要があります。", + "item.create.belt_connector.tooltip.control2": "スニークしながらシャフトを右クリックしたとき", + "item.create.belt_connector.tooltip.action2": "ベルトの最初に選択された位置を_リセット_します。", - "item.create.goggles.tooltip": "ゴーグル", - "item.create.goggles.tooltip.summary": "有用ã�ªå‹•åŠ›æƒ…å ±ã�§è¦–覚を強化ã�™ã‚‹ã�Ÿã‚�ã�®çœ¼é�¡ã€‚", - "item.create.goggles.tooltip.condition1": "ç�€ç”¨ã�—ã�Ÿã�¨ã��", - "item.create.goggles.tooltip.behaviour1": "é…�ç½®ã�•ã‚Œã�Ÿã‚­ãƒ�ティックコンãƒ�ーãƒ�ントã�®_速度レベル_ã�«å¯¾å¿œã�™ã‚‹_色付ã��ã�®ã‚¤ãƒ³ã‚¸ã‚±ãƒ¼ã‚¿ãƒ¼_ã�¨ã€�個々ã�®ã‚³ãƒ³ãƒ�ーãƒ�ント_ã�®å¿œåŠ›ã�®å½±éŸ¿_ã�¨_容é‡�_を表示ã�—ã�¾ã�™ã€‚", - "item.create.goggles.tooltip.condition2": "計器を見ã�Ÿã�¨ã��", - "item.create.goggles.tooltip.behaviour2": "計器ã�ŒæŽ¥ç¶šã�•ã‚Œã�¦ã�„ã‚‹ãƒ�ットワークã�®é€Ÿåº¦ã�¾ã�Ÿã�¯å¿œåŠ›ã�«é–¢ã�™ã‚‹è©³ç´°æƒ…報を表示ã�—ã�¾ã�™ã€‚", + "item.create.goggles.tooltip": "ゴーグル", + "item.create.goggles.tooltip.summary": "有用な動力情報で視覚を強化するための眼鏡。", + "item.create.goggles.tooltip.condition1": "着用したとき", + "item.create.goggles.tooltip.behaviour1": "配置されたキネティックコンポーネントの_速度レベル_に対応する_色付きのインジケーター_と、個々のコンポーネント_の応力の影響_と_容量_を表示します。", + "item.create.goggles.tooltip.condition2": "計器を見たとき", + "item.create.goggles.tooltip.behaviour2": "計器が接続されているネットワークの速度または応力に関する詳細情報を表示します。", - "item.create.wrench.tooltip": "レンãƒ�", - "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": "_動力コンãƒ�ーãƒ�ントを分解_ã�—ã€�_インベントリ_ã�«æˆ»ã�—ã�¾ã�™ã€‚", + "item.create.wrench.tooltip": "レンチ", + "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": "_動力コンポーネントを分解_し、_インベントリ_に戻します。", - "block.create.creative_motor.tooltip": "クリエイティブモーター", - "block.create.creative_motor.tooltip.summary": "_回転力_を設定å�¯èƒ½ã�ªã‚½ãƒ¼ã‚¹ã€‚", + "block.create.creative_motor.tooltip": "クリエイティブモーター", + "block.create.creative_motor.tooltip.summary": "_回転力_を設定可能なソース。", - "block.create.water_wheel.tooltip": "水車", - "block.create.water_wheel.tooltip.summary": "_隣接ã�™ã‚‹æ°´æµ�_ã�‹ã‚‰å�–å¾—ã�•ã‚Œã‚‹_回転力_ã‚’æ��ä¾›ã�—ã�¾ã�™ã€‚", + "block.create.water_wheel.tooltip": "水車", + "block.create.water_wheel.tooltip.summary": "_隣接する水流_から取得される_回転力_を提供します。", - "block.create.encased_fan.tooltip": "内蔵ファン", - "block.create.encased_fan.tooltip.summary": "_回転力_ã‚’_æ°—æµ�_ã�«å¤‰æ�›ã�—ã€�戻ã�—ã�¾ã�™ã€‚ã�•ã�¾ã�–ã�¾ã�ªç”¨é€”ã�Œã�‚ã‚Šã�¾ã�™ã€‚", - "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": "特別ã�ªãƒ–ロックをå�¹ã��抜ã�‘ã‚‹ã�¨ã��", - "block.create.encased_fan.tooltip.behaviour3": "_液体_ã�¨_ç‚Ž_ã�®ç²’å­�ã�Œç©ºæ°—ã�®æµ�ã‚Œã�«æ”¾å‡ºã�•ã‚Œã�¾ã�™ã€‚ ã�“ã‚Œã�¯ã€�_アイテムã�®å‡¦ç�†_ã�«ä½¿ç”¨ã�§ã��ã�¾ã�™ã€‚", + "block.create.encased_fan.tooltip": "内蔵ファン", + "block.create.encased_fan.tooltip.summary": "_回転力_を_気流_に変換し、戻します。さまざまな用途があります。", + "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": "特別なブロックを吹き抜けるとき", + "block.create.encased_fan.tooltip.behaviour3": "_液体_と_炎_の粒子が空気の流れに放出されます。 これは、_アイテムの処理_に使用できます。", - "block.create.nozzle.tooltip": "ノズル", - "block.create.nozzle.tooltip.summary": "_ケース入りファン_ã�®å‰�é�¢ã�«å�–り付ã�‘ã�¦ã€�エンティティã�¸ã�®å½±éŸ¿ã‚’_全方å�‘_ã�«åˆ†æ•£ã�—ã�¾ã�™ã€‚", + "block.create.nozzle.tooltip": "ノズル", + "block.create.nozzle.tooltip.summary": "_ケース入りファン_の前面に取り付けて、エンティティへの影響を_全方向_に分散します。", - "block.create.hand_crank.tooltip": "ãƒ�ンドクランク", - "block.create.hand_crank.tooltip.summary": "プレイヤーã�®ç›¸äº’作用を必è¦�ã�¨ã�™ã‚‹_回転力ã�®å�˜ç´”ã�ªæƒ…å ±æº�_。", - "block.create.hand_crank.tooltip.condition1": "使用ã�—ã�¦ã‚‹ã�¨ã��", - "block.create.hand_crank.tooltip.behaviour1": "付属ã�®ä»•æŽ›ã�‘ã�«_回転力_ã‚’æ��ä¾›ã�—ã�¾ã�™ã€‚ _スニークã�§å›žè»¢ã‚’逆_ã�«ã�—ã�¾ã�™ã€‚", + "block.create.hand_crank.tooltip": "ハンドクランク", + "block.create.hand_crank.tooltip.summary": "プレイヤーの相互作用を必要とする_回転力の単純な情報源_。", + "block.create.hand_crank.tooltip.condition1": "使用してるとき", + "block.create.hand_crank.tooltip.behaviour1": "付属の仕掛けに_回転力_を提供します。 _スニークで回転を逆_にします。", - "block.create.cuckoo_clock.tooltip": "鳩時計", - "block.create.cuckoo_clock.tooltip.summary": "空間を_飾り_ã€�_時間を追跡ã�™ã‚‹_ã�Ÿã‚�ã�®ç´ æ™´ã‚‰ã�—ã�„è�·äººæŠ€ã€‚", - "block.create.cuckoo_clock.tooltip.condition1": "回転ã�—ã�Ÿã�¨ã��", - "block.create.cuckoo_clock.tooltip.behaviour1": "_ç�¾åœ¨ã�®æ™‚刻_を表示ã�—ã€�1æ—¥ã�«2回曲をå†�生ã�—ã�¾ã�™ã€‚ _プレイヤーã�Œçœ ã‚Œã‚‹ã‚ˆã�†ã�«ã�ªã‚‹_ã�¨ã�™ã��ã�«ã€�_æ­£å�ˆ_ã�¨å¤•æš®ã‚Œã�«1回_アクティブ_ã�«ã�ªã‚Šã�¾ã�™ã€‚", + "block.create.cuckoo_clock.tooltip": "鳩時計", + "block.create.cuckoo_clock.tooltip.summary": "空間を_飾り_、_時間を追跡する_ための素晴らしい職人技。", + "block.create.cuckoo_clock.tooltip.condition1": "回転したとき", + "block.create.cuckoo_clock.tooltip.behaviour1": "_現在の時刻_を表示し、1日に2回曲を再生します。 _プレイヤーが眠れるようになる_とすぐに、_正午_と夕暮れに1回_アクティブ_になります。", - "block.create.turntable.tooltip": "ターンテーブル", - "block.create.turntable.tooltip.summary": "_回転力_ã‚’æ´—ç·´ã�•ã‚Œã�Ÿä¹—り物酔ã�„ã�«å¤‰ã�ˆã�¾ã�™ã€‚", + "block.create.turntable.tooltip": "ターンテーブル", + "block.create.turntable.tooltip.summary": "_回転力_を洗練された乗り物酔いに変えます。", - "block.create.millstone.tooltip": "石臼", - "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.millstone.tooltip": "石臼", + "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": "クラッシングホイール", - "block.create.crushing_wheel.tooltip.summary": "何ã�‹ã‚’_分解_ã�™ã‚‹å¤§ã��ã�ªå›žè»¢å�¯èƒ½ã�ªãƒ›ã‚¤ãƒ¼ãƒ«ã€‚", - "block.create.crushing_wheel.tooltip.condition1": "ä»–ã�®ç ´ç •ãƒ›ã‚¤ãƒ¼ãƒ«ã�«å�–り付ã�‘ã�Ÿã�¨ã��", - "block.create.crushing_wheel.tooltip.behaviour1": "様々ã�ªç‰©ã‚’処ç�†ã�™ã‚‹ã�Ÿã‚�ã�®ç ´ç •æ©Ÿã‚’å½¢æˆ�ã�—ã�¾ã�™ã€‚ ホイールã�®æ­¯ã�¯ã€�å�Œã�˜é€Ÿåº¦ã�§æŽ¥ç¶šã�—ã€�å��対方å�‘ã�«å‹•ã��å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚", + "block.create.crushing_wheel.tooltip": "クラッシングホイール", + "block.create.crushing_wheel.tooltip.summary": "何かを_分解_する大きな回転可能なホイール。", + "block.create.crushing_wheel.tooltip.condition1": "他の破砕ホイールに取り付けたとき", + "block.create.crushing_wheel.tooltip.behaviour1": "様々な物を処理するための破砕機を形成します。 ホイールの歯は、同じ速度で接続し、反対方向に動く必要があります。", - "block.create.mechanical_press.tooltip": "メカニカルプレス", - "block.create.mechanical_press.tooltip.summary": "ã��ã�®ä¸‹ã�®ã‚¢ã‚¤ãƒ†ãƒ ã‚’圧縮ã�™ã‚‹ã�Ÿã‚�ã�®å¼·åŠ›ã�ªãƒ”ストン。 一定ã�®_回転力_ã�Œå¿…è¦�ã�§ã�™ã€‚", - "block.create.mechanical_press.tooltip.condition1": "レッドストーン動力をå�—ã�‘ã�Ÿã�¨ã��", - "block.create.mechanical_press.tooltip.behaviour1": "ã��ã�®ä¸‹ã�«ãƒ‰ãƒ­ãƒƒãƒ—ã�•ã‚Œã�Ÿã‚¢ã‚¤ãƒ†ãƒ ã�®åœ§ç¸®ã‚’_開始_ã�—ã�¾ã�™ã€‚", - "block.create.mechanical_press.tooltip.condition2": "メカニカルベルトã�®ä¸Šã�«ã�‚ã‚‹ã�¨ã��", - "block.create.mechanical_press.tooltip.behaviour2": "ベルト上ã�®ãƒ�イパスアイテムを_自動的_ã�«åœ§ç¸®ã�—ã�¾ã�™ã€‚", + "block.create.mechanical_press.tooltip": "メカニカルプレス", + "block.create.mechanical_press.tooltip.summary": "その下のアイテムを圧縮するための強力なピストン。 一定の_回転力_が必要です。", + "block.create.mechanical_press.tooltip.condition1": "レッドストーン動力を受けたとき", + "block.create.mechanical_press.tooltip.behaviour1": "その下にドロップされたアイテムの圧縮を_開始_します。", + "block.create.mechanical_press.tooltip.condition2": "メカニカルベルトの上にあるとき", + "block.create.mechanical_press.tooltip.behaviour2": "ベルト上のバイパスアイテムを_自動的_に圧縮します。", "block.create.mechanical_press.tooltip.condition3": "UNLOCALIZED: When above Basin", "block.create.mechanical_press.tooltip.behaviour3": "UNLOCALIZED: Starts to _compact_ _items_ in the basin whenever all necessary ingredients are present.", - "block.create.basin.tooltip": "鉢", - "block.create.basin.tooltip.summary": "_メカニカルミキサー_ã�¨_メカニカルプレス_ã�§ã�®å‡¦ç�†ã�«ä½¿ç”¨ã�•ã‚Œã‚‹ä¾¿åˆ©ã�ª_アイテムã�®å…¥ã‚Œç‰©_。_レッドストーンコンパレータ_をサãƒ�ートã�—ã�¾ã�™ã€‚", + "block.create.basin.tooltip": "鉢", + "block.create.basin.tooltip.summary": "_メカニカルミキサー_と_メカニカルプレス_での処理に使用される便利な_アイテムの入れ物_。_レッドストーンコンパレータ_をサポートします。", "block.create.blaze_heater.tooltip": "UNLOCALIZED: BLAZE HEATER", "block.create.blaze_heater.tooltip.summary": "UNLOCALIZED: A block to heat a basin when housing a tamed blaze.", @@ -1348,82 +1150,82 @@ "block.create.reinforced_rail.tooltip": "UNLOCALIZED: REINFORCED RAIL", "block.create.reinforced_rail.tooltip.summary": "UNLOCALIZED: A timber stabilized rail, _does_ _not_ _need_ _supports_.", - "block.create.mechanical_mixer.tooltip": "メカニカルミキサー", - "block.create.mechanical_mixer.tooltip.summary": "ã��ã�®ä¸‹ã�®ã‚¢ã‚¤ãƒ†ãƒ ã�«å½¢çŠ¶ã�®ã�ªã�„製作レシピをé�©ç”¨ã�™ã‚‹ã�Ÿã‚�ã�®å‹•åŠ›ãƒŸã‚­ã‚µãƒ¼ã€‚ 一定ã�®_回転力_ã�¨ä¸‹ã�«é…�ç½®ã�•ã‚Œã�Ÿ_鉢_ã�Œå¿…è¦�ã�§ã�™ï¼ˆé–“ã�«ã‚®ãƒ£ãƒƒãƒ—ã�Œã�‚ã‚Šã�¾ã�™ï¼‰ã€‚", - "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": "メカニカルミキサー", + "block.create.mechanical_mixer.tooltip.summary": "その下のアイテムに形状のない製作レシピを適用するための動力ミキサー。 一定の_回転力_と下に配置された_鉢_が必要です（間にギャップがあります）。", + "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_crafter.tooltip": "メカニカルクラフト", - "block.create.mechanical_crafter.tooltip.summary": "_ã�‚らゆる形状ã�®è£½ä½œãƒ¬ã‚·ãƒ”_を自動化ã�™ã‚‹ã�Ÿã‚�ã�®å‹•çš„アセンブラー。 _レシピã�«å¯¾å¿œã�™ã‚‹ã‚°ãƒªãƒƒãƒ‰ã�«è¤‡æ•°ã‚’é…�ç½®_ã�—ã€�_フェアベルトをé…�ç½®ã�—ã�¦_ã€�ã�„ã�šã‚Œã�‹ã�®ã‚¯ãƒ©ãƒ•ã‚¿ãƒ¼ã�®ã‚°ãƒªãƒƒãƒ‰ã�‹ã‚‰å‡ºã‚‹_æµ�ã‚Œ_を作æˆ�ã�—ã�¾ã�™ã€‚", - "block.create.mechanical_crafter.tooltip.condition1": "回転ã�—ã�Ÿã�¨ã��", - "block.create.mechanical_crafter.tooltip.behaviour1": "グリッド内ã�®_ã�™ã�¹ã�¦ã�®ã‚¯ãƒ©ãƒ•ã‚¿ãƒ¼_ã�«ãƒ†ãƒ³ãƒ—レートã�Œ_与ã�ˆã‚‰ã‚Œã‚‹_ã�¨ã�™ã��ã�«ã€�_生産プロセスを開始_ã�—ã�¾ã�™ã€‚", + "block.create.mechanical_crafter.tooltip": "メカニカルクラフト", + "block.create.mechanical_crafter.tooltip.summary": "_あらゆる形状の製作レシピ_を自動化するための動的アセンブラー。 _レシピに対応するグリッドに複数を配置_し、_フェアベルトを配置して_、いずれかのクラフターのグリッドから出る_流れ_を作成します。", + "block.create.mechanical_crafter.tooltip.condition1": "回転したとき", + "block.create.mechanical_crafter.tooltip.behaviour1": "グリッド内の_すべてのクラフター_にテンプレートが_与えられる_とすぐに、_生産プロセスを開始_します。", "block.create.mechanical_crafter.tooltip.condition2": "UNLOCALIZED: On Redstone Pulse", "block.create.mechanical_crafter.tooltip.behaviour2": "UNLOCALIZED: _Forces_ the start of the _crafting_ _process_ with all currently given _items_ in the grid.", - "block.create.mechanical_crafter.tooltip.control1": "フロントã�§ãƒ¬ãƒ³ãƒ�ã�—ã�Ÿã�¨ã��", - "block.create.mechanical_crafter.tooltip.action1": "_個々ã�®ç”Ÿç”£è€…ã�Œ_アイテムを移動_ã�™ã‚‹_æ–¹å�‘_を循環ã�•ã�›ã�¾ã�™ã€‚ 作業グリッドを形æˆ�ã�™ã‚‹ã�«ã�¯ã€�ã�™ã�¹ã�¦ã�®ã‚¢ã‚¤ãƒ†ãƒ ã‚’最終的ã�ªã‚¯ãƒ©ãƒ•ã‚¿ãƒ¼ã�«å�‘ã�‹ã�£ã�¦_移動ã�•ã�›ã‚‹æµ�ã‚Œ_ã�«_ベルト_ã‚’é…�ç½®ã�—ã�¾ã�™ã€‚ 最終的ã�ªã‚¯ãƒ©ãƒ•ã‚¿ãƒ¼ã�¯ã‚°ãƒªãƒƒãƒ‰ã�‹ã‚‰_離れる_æ–¹å�‘を指ã�•ã�ªã�‘ã‚Œã�°ã�ªã‚Šã�¾ã�›ã‚“。", - "block.create.mechanical_crafter.tooltip.control2": "後ã‚�ã�§ãƒ¬ãƒ³ãƒ�ã�—ã�Ÿã�¨ã��", - "block.create.mechanical_crafter.tooltip.action2": "隣接ã�™ã‚‹ã‚¯ãƒ©ãƒ•ã‚¿ãƒ¼ã�®_入力インベントリ_ã‚’_接続_ã�—ã�¾ã�™ã€‚ ã�“れを使用ã�—ã�¦ã€�クラフトグリッドã�®_スロットをçµ�å�ˆ_ã�—ã€�_入力作業を節約_ã�—ã�¾ã�™ã€‚", + "block.create.mechanical_crafter.tooltip.control1": "フロントでレンチしたとき", + "block.create.mechanical_crafter.tooltip.action1": "_個々の生産者が_アイテムを移動_する_方向_を循環させます。 作業グリッドを形成するには、すべてのアイテムを最終的なクラフターに向かって_移動させる流れ_に_ベルト_を配置します。 最終的なクラフターはグリッドから_離れる_方向を指さなければなりません。", + "block.create.mechanical_crafter.tooltip.control2": "後ろでレンチしたとき", + "block.create.mechanical_crafter.tooltip.action2": "隣接するクラフターの_入力インベントリ_を_接続_します。 これを使用して、クラフトグリッドの_スロットを結合_し、_入力作業を節約_します。", - "block.create.furnace_engine.tooltip": "ã�‹ã�¾ã�©ã‚¨ãƒ³ã‚¸ãƒ³", - "block.create.furnace_engine.tooltip.summary": "_稼åƒ�ã�™ã‚‹ã�‹ã�¾ã�©_ã�Œæ©Ÿèƒ½ã�™ã‚‹ã�“ã�¨ã‚’å¿…è¦�ã�¨ã�™ã‚‹å¼·åŠ›ã�ª_回転動力æº�_。", - "block.create.furnace_engine.tooltip.condition1": "燃ã�ˆã�¦ã‚‹ã�‹ã�¾ã�©ã�«å�–り付ã�‘ã�Ÿã�¨ã��", - "block.create.furnace_engine.tooltip.behaviour1": "ã��ã�®å‰�（1m離れã�¦ï¼‰ã�«é…�ç½®ã�•ã‚Œã�Ÿ_フライホイールã�¸ã�®å‹•åŠ›ä¾›çµ¦ã‚’開始_ã�—ã�¾ã�™ã€‚ 高速化ã�™ã‚‹ã�«ã�¯é«˜ç‚‰ã‚’使用ã�—ã�¦ã��ã� ã�•ã�„。", + "block.create.furnace_engine.tooltip": "かまどエンジン", + "block.create.furnace_engine.tooltip.summary": "_稼働するかまど_が機能することを必要とする強力な_回転動力源_。", + "block.create.furnace_engine.tooltip.condition1": "燃えてるかまどに取り付けたとき", + "block.create.furnace_engine.tooltip.behaviour1": "その前（1m離れて）に配置された_フライホイールへの動力供給を開始_します。 高速化するには高炉を使用してください。", - "block.create.flywheel.tooltip": "勢車", - "block.create.flywheel.tooltip.summary": "_å�–り付ã�‘ã�Ÿã�®ã‚¨ãƒ³ã‚¸ãƒ³_ã�Œç™ºç”Ÿã�™ã‚‹_力を利用ã�—ã�¦å®‰å®š_ã�•ã�›ã‚‹å¤§åž‹ã�®é‡‘属ホイール。 勢車ã�Œ_1 m離れã�¦ã�„ã�¦_ã€�_互ã�„ã�«90°ã�®è§’度ã�«ã�‚ã‚‹_å ´å�ˆã€�エンジンã�«æŽ¥ç¶šã�—ã�¾ã�™ã€‚", - "block.create.flywheel.tooltip.condition1": "実行中ã�®ã‚¨ãƒ³ã‚¸ãƒ³ã�«å�–り付ã�‘られã�¦ã‚‹ã�¨ã��", - "block.create.flywheel.tooltip.behaviour1": "ジェãƒ�レータã�®å¼·åº¦ã�¨é€Ÿåº¦ã�«åŸºã�¥ã�„ã�¦ã€�å�–り付ã�‘ã�Ÿä»•æŽ›ã�‘ã�«_回転力_ã‚’æ��ä¾›ã�—ã�¾ã�™ã€‚", + "block.create.flywheel.tooltip": "勢車", + "block.create.flywheel.tooltip.summary": "_取り付けたのエンジン_が発生する_力を利用して安定_させる大型の金属ホイール。 勢車が_1 m離れていて_、_互いに90°の角度にある_場合、エンジンに接続します。", + "block.create.flywheel.tooltip.condition1": "実行中のエンジンに取り付けられてるとき", + "block.create.flywheel.tooltip.behaviour1": "ジェネレータの強度と速度に基づいて、取り付けた仕掛けに_回転力_を提供します。", - "block.create.portable_storage_interface.tooltip": "ãƒ�ータブルストレージインターフェイス", - "block.create.portable_storage_interface.tooltip.summary": "ピストンã€�ベアリングã€�トロッコã€�ã�¾ã�Ÿã�¯ãƒ—ーリーã�«ã‚ˆã�£ã�¦ç§»å‹•ã�•ã‚Œã‚‹_構造物_ã�¨ã�®é–“ã�§_アイテムを移動_ã�™ã‚‹ã�Ÿã‚�ã�®ãƒ�ータブル交æ�›ãƒ�イント。", - "block.create.portable_storage_interface.tooltip.condition1": "移動ã�—ã�¦ã‚‹ã�¨ã��", - "block.create.portable_storage_interface.tooltip.behaviour1": "インターフェースã�®_å��対å�´_ã�«ã�‚ã‚‹_トランスãƒ�ーザー_ã�Œ_アイテムを引ã�£å¼µã‚Š_ã€�インターフェースをターゲットã�¨ã�™ã‚‹ãƒˆãƒ©ãƒ³ã‚¹ãƒ�ーザーã�ŒæŽ¥ç¶šã�•ã‚Œã�Ÿã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã�‹ã‚‰_アイテムを挿入_ã�™ã‚‹ã‚ˆã�†ã�«ã€�固定トランスãƒ�ーザーã�¨ç›¸äº’作用ã�—ã�¾ã�™ã€‚ アイテムã�Œäº¤æ�›ã�•ã‚Œã‚‹ã�¨ã€�ã�‹ã‚‰ã��ã‚Šã�¯ä¸€æ™‚çš„ã�«å�œæ­¢ã�—ã�¾ã�™ã€‚", + "block.create.portable_storage_interface.tooltip": "ポータブルストレージインターフェイス", + "block.create.portable_storage_interface.tooltip.summary": "ピストン、ベアリング、トロッコ、またはプーリーによって移動される_構造物_との間で_アイテムを移動_するためのポータブル交換ポイント。", + "block.create.portable_storage_interface.tooltip.condition1": "移動してるとき", + "block.create.portable_storage_interface.tooltip.behaviour1": "インターフェースの_反対側_にある_トランスポーザー_が_アイテムを引っ張り_、インターフェースをターゲットとするトランスポーザーが接続されたインベントリから_アイテムを挿入_するように、固定トランスポーザーと相互作用します。 アイテムが交換されると、からくりは一時的に停止します。", - "block.create.rotation_speed_controller.tooltip": "回転速度コントローラー", - "block.create.rotation_speed_controller.tooltip.summary": "ターゲットコンãƒ�ーãƒ�ントを任æ„�ã�®é€Ÿåº¦ã�«åŠ é€Ÿã�¾ã�Ÿã�¯æ¸›é€Ÿã�§ã��ã‚‹_構æˆ�å�¯èƒ½ã�ªä¸­ç¶™_。", - "block.create.rotation_speed_controller.tooltip.condition1": "大ã��ã�ªæ­¯è»Šã�«å�–り付ã�‘ã�Ÿã�¨ã��", - "block.create.rotation_speed_controller.tooltip.behaviour1": "å…¥ã�£ã�¦ã��る回転力をホイールã�«ä¸­ç¶™ã�—ã€�目標ã�¨ã�™ã‚‹ã‚ˆã�†ã�«æ§‹æˆ�ã�•ã‚Œã�Ÿ_速度ã�«ä¸€è‡´_ã�•ã�›ã‚ˆã�†ã�¨ã�—ã�¾ã�™ã€‚ _歯車ã�¯ã‚³ãƒ³ãƒˆãƒ­ãƒ¼ãƒ©ãƒ¼ã�®ä¸Šã�«å�–り付ã�‘ã‚‹_å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚", + "block.create.rotation_speed_controller.tooltip": "回転速度コントローラー", + "block.create.rotation_speed_controller.tooltip.summary": "ターゲットコンポーネントを任意の速度に加速または減速できる_構成可能な中継_。", + "block.create.rotation_speed_controller.tooltip.condition1": "大きな歯車に取り付けたとき", + "block.create.rotation_speed_controller.tooltip.behaviour1": "入ってくる回転力をホイールに中継し、目標とするように構成された_速度に一致_させようとします。 _歯車はコントローラーの上に取り付ける_必要があります。", - "block.create.mechanical_piston.tooltip": "メカニカルピストン", - "block.create.mechanical_piston.tooltip.summary": "_ピストン_より高度ã�ªã‚‚ã�®ã€‚ _回転力_を使用ã�—ã�¦ã€�å�–り付ã�‘られã�Ÿæ§‹é€ ç‰©ã‚’正確ã�«ç§»å‹•ã�—ã�¾ã�™ã€‚ 背é�¢ã�®_ピストン延長極_ã�¯ã€�ã�“ã�®ãƒ‡ãƒ�イスã�®_範囲_を定義ã�—ã�¾ã�™ã€‚ 延長ã�Œã�ªã�„ã�¨ã€�ピストンã�¯å‹•ã��ã�¾ã�›ã‚“。 _シャーシ_ã�¾ã�Ÿã�¯_スライムブロック_を使用ã�—ã�¦ã€�1行以上ã�®ãƒ–ロックを移動ã�—ã�¾ã�™ã€‚", - "block.create.mechanical_piston.tooltip.condition1": "回転ã�—ã�Ÿã�¨ã��", - "block.create.mechanical_piston.tooltip.behaviour1": "å�–り付ã�‘られã�Ÿæ§‹é€ ç‰©ã�®ç§»å‹•ã‚’開始ã�—ã�¾ã�™ã€‚ 速度ã�¨æ–¹å�‘ã�¯ã€�入力ã�•ã‚Œã‚‹å›žè»¢é€Ÿåº¦ã�¨ç›¸é–¢ã�—ã�¾ã�™ã€‚", + "block.create.mechanical_piston.tooltip": "メカニカルピストン", + "block.create.mechanical_piston.tooltip.summary": "_ピストン_より高度なもの。 _回転力_を使用して、取り付けられた構造物を正確に移動します。 背面の_ピストン延長極_は、このデバイスの_範囲_を定義します。 延長がないと、ピストンは動きません。 _シャーシ_または_スライムブロック_を使用して、1行以上のブロックを移動します。", + "block.create.mechanical_piston.tooltip.condition1": "回転したとき", + "block.create.mechanical_piston.tooltip.behaviour1": "取り付けられた構造物の移動を開始します。 速度と方向は、入力される回転速度と相関します。", - "block.create.sticky_mechanical_piston.tooltip": "粘ç�€ãƒ¡ã‚«ãƒ‹ã‚«ãƒ«ãƒ”ストン", - "block.create.sticky_mechanical_piston.tooltip.summary": "_粘ç�€ãƒ”ストン_より高度ã�ªã‚‚ã�®ã€‚ _回転力_を使用ã�—ã�¦ã€�å�–り付ã�‘られã�Ÿæ§‹é€ ç‰©ã‚’正確ã�«ç§»å‹•ã�—ã�¾ã�™ã€‚ 背é�¢ã�®_ピストン延長極_ã�¯ã€�ã�“ã�®ãƒ‡ãƒ�イスã�®_範囲_を定義ã�—ã�¾ã�™ã€‚ 延長ã�Œã�ªã�„ã�¨ã€�ピストンã�¯å‹•ã��ã�¾ã�›ã‚“。 _シャーシ_ã�¾ã�Ÿã�¯_スライムブロック_を使用ã�—ã�¦ã€�1行以上ã�®ãƒ–ロックを移動ã�—ã�¾ã�™ã€‚", - "block.create.sticky_mechanical_piston.tooltip.condition1": "回転ã�—ã�Ÿã�¨ã��", - "block.create.sticky_mechanical_piston.tooltip.behaviour1": "å�–り付ã�‘られã�Ÿæ§‹é€ ç‰©ã�®ç§»å‹•ã‚’開始ã�—ã�¾ã�™ã€‚ 速度ã�¨æ–¹å�‘ã�¯ã€�入力ã�•ã‚Œã‚‹å›žè»¢é€Ÿåº¦ã�¨ç›¸é–¢ã�—ã�¾ã�™ã€‚", + "block.create.sticky_mechanical_piston.tooltip": "粘着メカニカルピストン", + "block.create.sticky_mechanical_piston.tooltip.summary": "_粘着ピストン_より高度なもの。 _回転力_を使用して、取り付けられた構造物を正確に移動します。 背面の_ピストン延長極_は、このデバイスの_範囲_を定義します。 延長がないと、ピストンは動きません。 _シャーシ_または_スライムブロック_を使用して、1行以上のブロックを移動します。", + "block.create.sticky_mechanical_piston.tooltip.condition1": "回転したとき", + "block.create.sticky_mechanical_piston.tooltip.behaviour1": "取り付けられた構造物の移動を開始します。 速度と方向は、入力される回転速度と相関します。", - "block.create.piston_extension_pole.tooltip": "ピストンãƒ�ール", - "block.create.piston_extension_pole.tooltip.summary": "メカニカルピストンã�®ç¯„囲を拡張ã�—ã�¾ã�™ã€‚", - "block.create.piston_extension_pole.tooltip.condition1": "メカニカルピストンã�«å�–り付ã�‘ã�Ÿã�¨ã��", - "block.create.piston_extension_pole.tooltip.behaviour1": "ピストンã�®ç¯„囲を1ブロック拡張", + "block.create.piston_extension_pole.tooltip": "ピストンポール", + "block.create.piston_extension_pole.tooltip.summary": "メカニカルピストンの範囲を拡張します。", + "block.create.piston_extension_pole.tooltip.condition1": "メカニカルピストンに取り付けたとき", + "block.create.piston_extension_pole.tooltip.behaviour1": "ピストンの範囲を1ブロック拡張", - "block.create.mechanical_bearing.tooltip": "メカニカルベアリング", - "block.create.mechanical_bearing.tooltip.summary": "_大ã��ã�ªæ§‹é€ ç‰©_を回転ã�•ã�›ã�Ÿã‚Šã€�風ã�‹ã‚‰ã�®_回転力_を利用ã�—ã�Ÿã‚Šã�™ã‚‹ã�Ÿã‚�ã�«ä½¿ç”¨ã�•ã‚Œã�¾ã�™ã€‚", - "block.create.mechanical_bearing.tooltip.condition1": "回転ã�—ã�Ÿã�¨ã��", - "block.create.mechanical_bearing.tooltip.behaviour1": "アタッãƒ�ã�•ã‚Œã�Ÿãƒ–ロックã�®å›žè»¢ã‚’開始ã�—ã�¾ã�™ã€‚_シャーシ_ã�¾ã�Ÿã�¯_スライムブロック_を使用ã�—ã�¦ã€�複数ã�®ãƒ–ロックを移動ã�—ã�¾ã�™ã€‚", - "block.create.mechanical_bearing.tooltip.condition2": "レッドストーン動力を与ã�ˆã�Ÿã�¨ã��", - "block.create.mechanical_bearing.tooltip.behaviour2": "å�–り付ã�‘ã�Ÿæ§‹é€ ç‰©ã�®å›žè»¢ã�‹ã‚‰ç”Ÿæˆ�ã�•ã‚Œã‚‹_回転力_ã�®æ��供を開始ã�—ã�¾ã�™ã€‚ 構造ã�«ã�¯ã€�é�©åˆ‡ã�ª_帆ブロック_（ç�¾åœ¨ã�¯ã�™ã�¹ã�¦ã�®ã‚¦ãƒ¼ãƒ«ãƒ–ロック）をå�«ã‚�ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚", + "block.create.mechanical_bearing.tooltip": "メカニカルベアリング", + "block.create.mechanical_bearing.tooltip.summary": "_大きな構造物_を回転させたり、風からの_回転力_を利用したりするために使用されます。", + "block.create.mechanical_bearing.tooltip.condition1": "回転したとき", + "block.create.mechanical_bearing.tooltip.behaviour1": "アタッチされたブロックの回転を開始します。_シャーシ_または_スライムブロック_を使用して、複数のブロックを移動します。", + "block.create.mechanical_bearing.tooltip.condition2": "レッドストーン動力を与えたとき", + "block.create.mechanical_bearing.tooltip.behaviour2": "取り付けた構造物の回転から生成される_回転力_の提供を開始します。 構造には、適切な_帆ブロック_（現在はすべてのウールブロック）を含める必要があります。", - "block.create.clockwork_bearing.tooltip": "時計仕掛ã�‘ベアリング", - "block.create.clockwork_bearing.tooltip.summary": "ç�¾åœ¨ã�®_ゲーム内時間_ã�«å¿œã�˜ã�¦æœ€å¤§2ã�¤ã�®_時計ã�®é‡�_を回転ã�•ã�›ã‚‹ã€�_メカニカルベアリング_より高度ã�ªã‚‚ã�®ã€‚", - "block.create.clockwork_bearing.tooltip.condition1": "回転ã�—ã�Ÿã�¨ã��", - "block.create.clockwork_bearing.tooltip.behaviour1": "ç�¾åœ¨ã�®æ™‚é–“ã�«å�‘ã�‹ã�£ã�¦å�–り付ã�‘ã�Ÿæ§‹é€ ç‰©ã�®å›žè»¢ã‚’開始ã�—ã�¾ã�™ã€‚ 2番目ã�®æ§‹é€ ã�Œå­˜åœ¨ã�™ã‚‹å ´å�ˆã€�ã��ã‚Œã�¯åˆ†é‡�ã�¨ã�—ã�¦æ©Ÿèƒ½ã�—ã�¾ã�™ã€‚", + "block.create.clockwork_bearing.tooltip": "時計仕掛けベアリング", + "block.create.clockwork_bearing.tooltip.summary": "現在の_ゲーム内時間_に応じて最大2つの_時計の針_を回転させる、_メカニカルベアリング_より高度なもの。", + "block.create.clockwork_bearing.tooltip.condition1": "回転したとき", + "block.create.clockwork_bearing.tooltip.behaviour1": "現在の時間に向かって取り付けた構造物の回転を開始します。 2番目の構造が存在する場合、それは分針として機能します。", - "block.create.sequenced_gearshift.tooltip": "順次ギアシフト", - "block.create.sequenced_gearshift.tooltip.summary": "最大_5ã�¤ã�®é€£ç¶šã�™ã‚‹å‘½ä»¤_ã�«å¾“ã�£ã�¦_回転スループット_を変更ã�§ã��ã‚‹_プログラムå�¯èƒ½_ã�ª_ユーティリティコンãƒ�ーãƒ�ント_。 ã�“れを使用ã�—ã�¦ã€�メカニカルベアリングã€�ピストンã€�ã�¾ã�Ÿã�¯ãƒ—ーリーã�«å‹•åŠ›ã‚’供給ã�—ã€�タイミングã�¨é€Ÿåº¦ã‚’より細ã�‹ã��制御ã�—ã�¾ã�™ã€‚ 高速ã�§ã�¯ç²¾åº¦ã�Œä½Žä¸‹ã�™ã‚‹å�¯èƒ½æ€§ã�Œã�‚ã‚Šã�¾ã�™ã€‚", - "block.create.sequenced_gearshift.tooltip.condition1": "レッドストーン信å�·ã‚’与ã�ˆã�Ÿã�¨ã��", - "block.create.sequenced_gearshift.tooltip.behaviour1": "入力速度ã�«åŸºã�¥ã�„ã�¦ãƒ—ログラムã�•ã‚Œã�Ÿå‘½ä»¤ã�®å®Ÿè¡Œã‚’開始ã�—ã�¾ã�™ã€‚", - "block.create.sequenced_gearshift.tooltip.condition2": "å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "block.create.sequenced_gearshift.tooltip.behaviour2": "_設定インターフェース_ã‚’é–‹ã��ã�¾ã�™", + "block.create.sequenced_gearshift.tooltip": "順次ギアシフト", + "block.create.sequenced_gearshift.tooltip.summary": "最大_5つの連続する命令_に従って_回転スループット_を変更できる_プログラム可能_な_ユーティリティコンポーネント_。 これを使用して、メカニカルベアリング、ピストン、またはプーリーに動力を供給し、タイミングと速度をより細かく制御します。 高速では精度が低下する可能性があります。", + "block.create.sequenced_gearshift.tooltip.condition1": "レッドストーン信号を与えたとき", + "block.create.sequenced_gearshift.tooltip.behaviour1": "入力速度に基づいてプログラムされた命令の実行を開始します。", + "block.create.sequenced_gearshift.tooltip.condition2": "右クリックしたとき", + "block.create.sequenced_gearshift.tooltip.behaviour2": "_設定インターフェース_を開きます", - "block.create.cart_assembler.tooltip": "カートアッセンブラー", - "block.create.cart_assembler.tooltip.summary": "接続ã�•ã‚Œã�Ÿæ§‹é€ ç‰©ã‚’_通é�Žã�™ã‚‹ãƒˆãƒ­ãƒƒã‚³_ã�«å�–り付ã�‘ã�¾ã�™ã€‚", - "block.create.cart_assembler.tooltip.condition1": "レッドストーン信å�·ã‚’与ã�ˆã�Ÿã�¨ã��", - "block.create.cart_assembler.tooltip.behaviour1": "_通é�Žã�™ã‚‹ã‚«ãƒ¼ãƒˆ_ã�®ãƒžã‚¦ãƒ³ãƒˆã�•ã‚Œã�Ÿæ§‹é€ ç‰©ã‚’_分解_ã�—ã€�ã��れらをワールドã�«æˆ»ã�—ã�¾ã�™ã€‚", + "block.create.cart_assembler.tooltip": "カートアッセンブラー", + "block.create.cart_assembler.tooltip.summary": "接続された構造物を_通過するトロッコ_に取り付けます。", + "block.create.cart_assembler.tooltip.condition1": "レッドストーン信号を与えたとき", + "block.create.cart_assembler.tooltip.behaviour1": "_通過するカート_のマウントされた構造物を_分解_し、それらをワールドに戻します。", "block.create.cart_assembler.tooltip.condition2": "UNLOCALIZED: When placed above Powered Rail", "block.create.cart_assembler.tooltip.behaviour2": "UNLOCALIZED: _Assembles_ and _accelerates_ _carts_ _when_ _powered_, _disassembles_ and _holds_ them _otherwise_.", "block.create.cart_assembler.tooltip.condition3": "UNLOCALIZED: When placed above Detector Rail", @@ -1431,162 +1233,162 @@ "block.create.cart_assembler.tooltip.condition4": "UNLOCALIZED: When placed above Activator Rail", "block.create.cart_assembler.tooltip.behaviour4": "UNLOCALIZED: _Disassembles_ _carts_ when _powered_.", - "block.create.rope_pulley.tooltip": "ローププーリー", - "block.create.rope_pulley.tooltip.summary": "å�–り付ã�‘ã�Ÿ_ブロックã�¨æ§‹é€ ç‰©ã‚’åž‚ç›´_ã�«ç§»å‹•ã�—ã�¾ã�™ã€‚ _シャーシブロック_ã�¾ã�Ÿã�¯_スライムブロック_を使用ã�—ã�¦ã€�1ã�¤ä»¥ä¸Šã�®ãƒ–ロックを移動ã�—ã�¾ã�™ã€‚", - "block.create.rope_pulley.tooltip.condition1": "回転ã�—ã�Ÿã�¨ã��", - "block.create.rope_pulley.tooltip.behaviour1": "å�–り付ã�‘ã�Ÿæ§‹é€ ç‰©ã�®ç§»å‹•ã‚’開始ã�—ã�¾ã�™ã€‚ 速度ã�¨æ–¹å�‘ã�¯ã€�入力ã�•ã‚Œã‚‹å›žè»¢é€Ÿåº¦ã�«ç›¸é–¢ã�—ã�¾ã�™ã€‚", + "block.create.rope_pulley.tooltip": "ローププーリー", + "block.create.rope_pulley.tooltip.summary": "取り付けた_ブロックと構造物を垂直_に移動します。 _シャーシブロック_または_スライムブロック_を使用して、1つ以上のブロックを移動します。", + "block.create.rope_pulley.tooltip.condition1": "回転したとき", + "block.create.rope_pulley.tooltip.behaviour1": "取り付けた構造物の移動を開始します。 速度と方向は、入力される回転速度に相関します。", - "block.create.linear_chassis.tooltip": "トランスシャーシ", - "block.create.linear_chassis.tooltip.summary": "移動用ã�®æ§‹é€ ã‚’接続ã�™ã‚‹æ§‹æˆ�å�¯èƒ½ã�ªãƒ™ãƒ¼ã‚¹ãƒ–ロック。", - "block.create.linear_chassis.tooltip.condition1": "移動ã�—ã�Ÿã�¨ã��", - "block.create.linear_chassis.tooltip.behaviour1": "_å�–り付ã�‘られるã�™ã�¹ã�¦ã�®ã‚·ãƒ£ãƒ¼ã‚·_ã‚’å�Œã�˜æ–¹å�‘ã�«ç§»å‹•ã�—ã€�ブロックã�®åˆ—ã‚’ã��ã�®ç¯„囲内ã�«ç§»å‹•ã�—ã�¾ã�™ã€‚ ブロックã�¯ã€�シャーシã�®è¡¨é�¢ã�Œ_粘ç�€æ€§_ã�Œã�‚ã‚‹å ´å�ˆã�«ã�®ã�¿å¼•ã�£å¼µã‚‰ã‚Œã�¾ã�™ï¼ˆ[Ctrl]ã‚’å�‚照）。", - "block.create.linear_chassis.tooltip.condition2": "レンãƒ�ã�—ã�Ÿã�¨ã��", - "block.create.linear_chassis.tooltip.behaviour2": "ã�“ã�®ã‚·ãƒ£ãƒ¼ã‚·ãƒ–ロックã�®_範囲_を構æˆ�ã�—ã�¾ã�™ã€‚ CTRLキーを押ã�—ã�Ÿã�¾ã�¾ã€�接続ã�•ã‚Œã�¦ã�„ã‚‹ã�™ã�¹ã�¦ã�®ã‚·ãƒ£ãƒ¼ã‚·ãƒ–ロックã�®ç¯„囲も変更ã�—ã�¾ã�™ã€‚", - "block.create.linear_chassis.tooltip.control1": "スライムボールã�§å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "block.create.linear_chassis.tooltip.action1": "クリックã�—ã�Ÿé�¢ã‚’_粘ç�€æ€§_ã�«ã�—ã�¾ã�™ã€‚ 移動ã�™ã‚‹ã�¨ã€�シャーシã�¯ç§»å‹•æ–¹å�‘ã�«é–¢ä¿‚ã�ªã��ã€�å�–り付ã�‘られã�Ÿãƒ–ロックを_引ã�£å¼µã‚Š_ã�¾ã�™ã€‚", + "block.create.linear_chassis.tooltip": "トランスシャーシ", + "block.create.linear_chassis.tooltip.summary": "移動用の構造を接続する構成可能なベースブロック。", + "block.create.linear_chassis.tooltip.condition1": "移動したとき", + "block.create.linear_chassis.tooltip.behaviour1": "_取り付けられるすべてのシャーシ_を同じ方向に移動し、ブロックの列をその範囲内に移動します。 ブロックは、シャーシの表面が_粘着性_がある場合にのみ引っ張られます（[Ctrl]を参照）。", + "block.create.linear_chassis.tooltip.condition2": "レンチしたとき", + "block.create.linear_chassis.tooltip.behaviour2": "このシャーシブロックの_範囲_を構成します。 CTRLキーを押したまま、接続されているすべてのシャーシブロックの範囲も変更します。", + "block.create.linear_chassis.tooltip.control1": "スライムボールで右クリックしたとき", + "block.create.linear_chassis.tooltip.action1": "クリックした面を_粘着性_にします。 移動すると、シャーシは移動方向に関係なく、取り付けられたブロックを_引っ張り_ます。", - "block.create.radial_chassis.tooltip": "回転シャーシ", - "block.create.radial_chassis.tooltip.summary": "移動用ã�®æ§‹é€ ã‚’å�–り付ã�‘る構æˆ�å�¯èƒ½ã�ªãƒ™ãƒ¼ã‚¹ãƒ–ロック。", - "block.create.radial_chassis.tooltip.condition1": "å‹•ã�‹ã�—ã�Ÿã�¨ã��", - "block.create.radial_chassis.tooltip.behaviour1": "列ã�«_å�–り付ã�‘られã�¦ã‚‹ã�™ã�¹ã�¦ã�®ã‚·ãƒ£ãƒ¼ã‚·_ã€�ã�Šã‚ˆã�³ã��れ自体ã�®å‘¨ã‚Šã�®ãƒ–ロックã�®ã‚·ãƒªãƒ³ãƒ€ãƒ¼ã‚’_移動_ã�—ã�¾ã�™ã€‚ 周囲ã�®ãƒ–ロックã�¯ã€�範囲内ã�«ã�‚ã‚Šã€�粘ç�€é�¢ã�«æŽ¥ç¶šã�•ã‚Œã�¦ã�„ã‚‹å ´å�ˆã�«ã�®ã�¿ç§»å‹•ã�•ã‚Œã�¾ã�™ï¼ˆ[Ctrl]ã‚’å�‚照）。", - "block.create.radial_chassis.tooltip.condition2": "レンãƒ�を使ã�£ã�Ÿã�¨ã��", - "block.create.radial_chassis.tooltip.behaviour2": "ã�“ã�®ã‚·ãƒ£ãƒ¼ã‚·ãƒ–ロックã�®_範囲_を構æˆ�ã�—ã�¾ã�™ã€‚ CTRLキーを押ã�—ã�Ÿã�¾ã�¾ã€�接続ã�•ã‚Œã�¦ã�„ã‚‹ã�™ã�¹ã�¦ã�®ã‚·ãƒ£ãƒ¼ã‚·ãƒ–ロックã�®ç¯„囲も変更ã�—ã�¾ã�™ã€‚", - "block.create.radial_chassis.tooltip.control1": "スライムボールã�§å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "block.create.radial_chassis.tooltip.action1": "クリックã�—ã�Ÿé�¢ã‚’_粘ç�€æ€§_ã�«ã�—ã�¾ã�™ã€‚ シャーシã�Œç§»å‹•ã�™ã‚‹ã�¨ã€�粘ç�€é�¢ã�«æŽ¥ç¶šã�•ã‚Œã�¦ã�„ã‚‹ã�™ã�¹ã�¦ã�®æŒ‡å®šãƒ–ロックã�Œä¸€ç·’ã�«ç§»å‹•ã�—ã�¾ã�™ã€‚", + "block.create.radial_chassis.tooltip": "回転シャーシ", + "block.create.radial_chassis.tooltip.summary": "移動用の構造を取り付ける構成可能なベースブロック。", + "block.create.radial_chassis.tooltip.condition1": "動かしたとき", + "block.create.radial_chassis.tooltip.behaviour1": "列に_取り付けられてるすべてのシャーシ_、およびそれ自体の周りのブロックのシリンダーを_移動_します。 周囲のブロックは、範囲内にあり、粘着面に接続されている場合にのみ移動されます（[Ctrl]を参照）。", + "block.create.radial_chassis.tooltip.condition2": "レンチを使ったとき", + "block.create.radial_chassis.tooltip.behaviour2": "このシャーシブロックの_範囲_を構成します。 CTRLキーを押したまま、接続されているすべてのシャーシブロックの範囲も変更します。", + "block.create.radial_chassis.tooltip.control1": "スライムボールで右クリックしたとき", + "block.create.radial_chassis.tooltip.action1": "クリックした面を_粘着性_にします。 シャーシが移動すると、粘着面に接続されているすべての指定ブロックが一緒に移動します。", - "block.create.mechanical_drill.tooltip": "機械ドリル", - "block.create.mechanical_drill.tooltip.summary": "_ブロックを壊ã�™_ã�®ã�«é�©ã�—ã�Ÿæ©Ÿæ¢°è£…置。 _メカニカルピストン_ã�¾ã�Ÿã�¯_ベアリング_ã�§ç§»å‹•å�¯èƒ½ã�§ã�™ã€‚", - "block.create.mechanical_drill.tooltip.condition1": "回転ã�—ã�Ÿã�¨ã��", - "block.create.mechanical_drill.tooltip.behaviour1": "_é�™æ­¢_ã�—ã�Ÿãƒ–ロックブレーカーã�¨ã�—ã�¦æ©Ÿèƒ½ã�—ã�¾ã�™ã€‚ ã�¾ã�Ÿã€�有効領域ã�®_エンティティを傷ã�¤ã�‘ã�¾ã�™_。", - "block.create.mechanical_drill.tooltip.condition2": "å‹•ã�‹ã�—ã�Ÿã�¨ã��", - "block.create.mechanical_drill.tooltip.behaviour2": "ドリルã�Œè¡�çª�ã�™ã‚‹ãƒ–ロックを壊ã�—ã�¾ã�™ã€‚", + "block.create.mechanical_drill.tooltip": "機械ドリル", + "block.create.mechanical_drill.tooltip.summary": "_ブロックを壊す_のに適した機械装置。 _メカニカルピストン_または_ベアリング_で移動可能です。", + "block.create.mechanical_drill.tooltip.condition1": "回転したとき", + "block.create.mechanical_drill.tooltip.behaviour1": "_静止_したブロックブレーカーとして機能します。 また、有効領域の_エンティティを傷つけます_。", + "block.create.mechanical_drill.tooltip.condition2": "動かしたとき", + "block.create.mechanical_drill.tooltip.behaviour2": "ドリルが衝突するブロックを壊します。", - "block.create.mechanical_harvester.tooltip": "メカニカルãƒ�ーベスター", - "block.create.mechanical_harvester.tooltip.summary": "中è¦�模ã�®ä½œç‰©ã�®è‡ªå‹•åŒ–ã�«é�©ã�—ã�Ÿæ©Ÿæ¢°å¼�æ¤�物カッター。 _メカニカルピストン_ã�¾ã�Ÿã�¯_ベアリング_ã�§ç§»å‹•å�¯èƒ½ã�§ã�™ã€‚", - "block.create.mechanical_harvester.tooltip.condition1": "å‹•ã�‹ã�—ã�Ÿã�¨ã��", - "block.create.mechanical_harvester.tooltip.behaviour1": "ブレードã�Œè¡�çª�ã�™ã‚‹_ã�™ã�¹ã�¦ã�®æˆ�熟ã�—ã�Ÿä½œç‰©ã‚’å�Žç©«_ã�—ã€�ã��れらをåˆ�期ã�®æˆ�長状態ã�«ãƒªã‚»ãƒƒãƒˆã�—ã�¾ã�™ã€‚", + "block.create.mechanical_harvester.tooltip": "メカニカルハーベスター", + "block.create.mechanical_harvester.tooltip.summary": "中規模の作物の自動化に適した機械式植物カッター。 _メカニカルピストン_または_ベアリング_で移動可能です。", + "block.create.mechanical_harvester.tooltip.condition1": "動かしたとき", + "block.create.mechanical_harvester.tooltip.behaviour1": "ブレードが衝突する_すべての成熟した作物を収穫_し、それらを初期の成長状態にリセットします。", "block.create.mechanical_plough.tooltip": "UNLOCALIZED: MECHANICAL PLOUGH", "block.create.mechanical_plough.tooltip.summary": "UNLOCALIZED: A mechanical plough has a variety of uses. It is movable with _Mechanical_ _Pistons_, _Bearings_ or other controllers.", "block.create.mechanical_plough.tooltip.condition1": "UNLOCALIZED: While Moving", "block.create.mechanical_plough.tooltip.behaviour1": "UNLOCALIZED: _Breaks_ _blocks_ which _cannot_ _be_ _collided_ with, such as torches, tracks or snow layers. _Applies_ its _motion_ to _entities_ without hurting them. _Tills_ _soil_ _blocks_ as though a Hoe would be used on them.", - "block.create.mechanical_saw.tooltip": "メカニカル鋸", - "block.create.mechanical_saw.tooltip.summary": "木を効果的ã�«åˆ‡æ–­ã�—ã�Ÿã‚Šã€�大工ã�—ã�Ÿã‚‚ã�®ã�«ãƒ–ロックを切断ã�—ã�Ÿã‚Šã�™ã‚‹ã�®ã�«é�©ã�—ã�¦ã�„ã�¾ã�™ã€‚ メカニカルピストンã�¾ã�Ÿã�¯ãƒ™ã‚¢ãƒªãƒ³ã‚°ã‚’使用ã�—ã�¦ç§»å‹•å�¯èƒ½ã�§ã�™ã€‚", - "block.create.mechanical_saw.tooltip.condition1": "上å�‘ã��ã�®ã�¨ã��", - "block.create.mechanical_saw.tooltip.behaviour1": "ã��ã�“ã�«ãƒ‰ãƒ­ãƒƒãƒ—ã�¾ã�Ÿã�¯æŒ¿å…¥ã�•ã‚Œã�Ÿã‚¢ã‚¤ãƒ†ãƒ ã�«_製æ��_ã�Šã‚ˆã�³ã‚¹ãƒˆãƒ¼ãƒ³ã‚«ãƒƒãƒ†ã‚£ãƒ³ã‚°ãƒ¬ã‚·ãƒ”ã‚’é�©ç”¨ã�—ã�¾ã�™ã€‚ 複数ã�®å‡ºåŠ›ã�Œå�¯èƒ½ã�ªå ´å�ˆã€�フィルターã�Œå‰²ã‚Šå½“ã�¦ã‚‰ã‚Œã�¦ã�„ã�ªã�„é™�ã‚Šã€�出力ã�Œå¾ªç’°ã�—ã�¾ã�™ã€‚", - "block.create.mechanical_saw.tooltip.condition2": "横å�‘ã��ã�®å ´å�ˆ", - "block.create.mechanical_saw.tooltip.behaviour2": "ã��ã�®å‰�ã�§_原木を分割_ã�—ã�¾ã�™ã€‚ 原木ã�Œã��れ自体ã�§ãƒ„リーをサãƒ�ートã�—ã�¦ã�„ã�Ÿå ´å�ˆã€�_木ã�¯ã�®ã�“ã�Žã‚Šã�‹ã‚‰é›¢ã‚Œã�¦å´©å£Š_ã�—ã�¾ã�™ã€‚", - "block.create.mechanical_saw.tooltip.condition3": "å‹•ã�‹ã�—ã�Ÿã�¨ã��", - "block.create.mechanical_saw.tooltip.behaviour3": "ã�®ã�“ã�Žã‚Šã�Œè¡�çª�ã�™ã‚‹_ã�™ã�¹ã�¦ã�®æœ¨ã‚’切り倒ã�—ã�¾ã�™_。", + "block.create.mechanical_saw.tooltip": "メカニカル鋸", + "block.create.mechanical_saw.tooltip.summary": "木を効果的に切断したり、大工したものにブロックを切断したりするのに適しています。 メカニカルピストンまたはベアリングを使用して移動可能です。", + "block.create.mechanical_saw.tooltip.condition1": "上向きのとき", + "block.create.mechanical_saw.tooltip.behaviour1": "そこにドロップまたは挿入されたアイテムに_製材_およびストーンカッティングレシピを適用します。 複数の出力が可能な場合、フィルターが割り当てられていない限り、出力が循環します。", + "block.create.mechanical_saw.tooltip.condition2": "横向きの場合", + "block.create.mechanical_saw.tooltip.behaviour2": "その前で_原木を分割_します。 原木がそれ自体でツリーをサポートしていた場合、_木はのこぎりから離れて崩壊_します。", + "block.create.mechanical_saw.tooltip.condition3": "動かしたとき", + "block.create.mechanical_saw.tooltip.behaviour3": "のこぎりが衝突する_すべての木を切り倒します_。", - "block.create.stockpile_switch.tooltip": "在庫スイッãƒ�", - "block.create.stockpile_switch.tooltip.summary": "接続ã�•ã‚Œã�Ÿã‚³ãƒ³ãƒ†ãƒŠã�®_空ã��容é‡�_ã�«åŸºã�¥ã�„ã�¦ãƒ¬ãƒƒãƒ‰ã‚¹ãƒˆãƒ¼ãƒ³ä¿¡å�·ã‚’切り替ã�ˆã�¾ã�™ã€‚", - "block.create.stockpile_switch.tooltip.condition1": "下é™�を下回ã�£ã�Ÿã�¨ã��", - "block.create.stockpile_switch.tooltip.behaviour1": "レッドストーン信å�·ã‚’å�œæ­¢", - "block.create.stockpile_switch.tooltip.condition2": "上é™�を超ã�ˆã�Ÿã�¨ã��。", - "block.create.stockpile_switch.tooltip.behaviour2": "å†�ã�³ä¸‹é™�ã�«é�”ã�™ã‚‹ã�¾ã�§ã€�レッドストーン信å�·ã�®æ��供を開始ã�—ã�¾ã�™ã€‚", - "block.create.stockpile_switch.tooltip.control1": "å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "block.create.stockpile_switch.tooltip.action1": "_設定インターフェース_ã‚’é–‹ã��ã�¾ã�™", + "block.create.stockpile_switch.tooltip": "在庫スイッチ", + "block.create.stockpile_switch.tooltip.summary": "接続されたコンテナの_空き容量_に基づいてレッドストーン信号を切り替えます。", + "block.create.stockpile_switch.tooltip.condition1": "下限を下回ったとき", + "block.create.stockpile_switch.tooltip.behaviour1": "レッドストーン信号を停止", + "block.create.stockpile_switch.tooltip.condition2": "上限を超えたとき。", + "block.create.stockpile_switch.tooltip.behaviour2": "再び下限に達するまで、レッドストーン信号の提供を開始します。", + "block.create.stockpile_switch.tooltip.control1": "右クリックしたとき", + "block.create.stockpile_switch.tooltip.action1": "_設定インターフェース_を開きます", - "block.create.redstone_link.tooltip": "レッドストーンリンク", - "block.create.redstone_link.tooltip.summary": "_ワイヤレスレッドストーン_接続ã�®ã‚¨ãƒ³ãƒ‰ãƒ�イント。 ä»»æ„�ã�®ã‚¢ã‚¤ãƒ†ãƒ ã‚’使用ã�—ã�¦_周波数_を割り当ã�¦ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™ã€‚ ä¿¡å�·ç¯„囲ã�¯é™�られã�¦ã�„ã�¾ã�™ã�Œã€�ã�‹ã�ªã‚Šé›¢ã‚Œã�¦ã�„ã�¾ã�™ã€‚", - "block.create.redstone_link.tooltip.condition1": "入力ã�Œã�‚ã‚‹ã�¨ã��", - "block.create.redstone_link.tooltip.behaviour1": "å�Œã�˜å‘¨æ³¢æ•°ã�®ãƒªãƒ³ã‚¯ã‚’å�—ä¿¡ã�™ã‚‹ã�¨ã€�レッドストーン信å�·ã�Œç”Ÿæˆ�ã�•ã‚Œã�¾ã�™ã€‚", - "block.create.redstone_link.tooltip.control1": "アイテムã�§å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "block.create.redstone_link.tooltip.action1": "_周波数_ã‚’ã��ã�®ã‚¢ã‚¤ãƒ†ãƒ ã�«è¨­å®šã�—ã�¾ã�™ã€‚ 周波数を定義ã�™ã‚‹ã�Ÿã‚�ã�«ã€�_å�ˆè¨ˆ2ã�¤ã�®ç•°ã�ªã‚‹ã‚¢ã‚¤ãƒ†ãƒ _を組ã�¿å�ˆã‚�ã�›ã�¦ä½¿ç”¨ã�§ã��ã�¾ã�™ã€‚", - "block.create.redstone_link.tooltip.control2": "スニークã�—ã�ªã�Œã‚‰å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "block.create.redstone_link.tooltip.action2": "_å�—ä¿¡æ©Ÿ_モードã�¨_é€�ä¿¡æ©Ÿ_モードを切り替ã�ˆã�¾ã�™ã€‚", + "block.create.redstone_link.tooltip": "レッドストーンリンク", + "block.create.redstone_link.tooltip.summary": "_ワイヤレスレッドストーン_接続のエンドポイント。 任意のアイテムを使用して_周波数_を割り当てることができます。 信号範囲は限られていますが、かなり離れています。", + "block.create.redstone_link.tooltip.condition1": "入力があるとき", + "block.create.redstone_link.tooltip.behaviour1": "同じ周波数のリンクを受信すると、レッドストーン信号が生成されます。", + "block.create.redstone_link.tooltip.control1": "アイテムで右クリックしたとき", + "block.create.redstone_link.tooltip.action1": "_周波数_をそのアイテムに設定します。 周波数を定義するために、_合計2つの異なるアイテム_を組み合わせて使用できます。", + "block.create.redstone_link.tooltip.control2": "スニークしながら右クリックしたとき", + "block.create.redstone_link.tooltip.action2": "_受信機_モードと_送信機_モードを切り替えます。", "block.create.nixie_tube.tooltip": "UNLOCALIZED: NIXIE TUBE", "block.create.nixie_tube.tooltip.summary": "UNLOCALIZED: A fancy redstone-powered _Number_ _Display_ ranging from 0 to 15.", "block.create.nixie_tube.tooltip.condition1": "UNLOCALIZED: When Powered", "block.create.nixie_tube.tooltip.behaviour1": "UNLOCALIZED: Shows the current redstone _Signal_ _Strength_ as its displayed value.", - "block.create.redstone_contact.tooltip": "レッドストーンコンタクト", - "block.create.redstone_contact.tooltip.summary": "レッドストーンパワーã�®ã�¿ã‚’ペアã�§æ”¾å‡ºã�—ã�¾ã�™ã€‚ _メカニカルピストン_ã�¾ã�Ÿã�¯_ベアリング_ã�§ç§»å‹•å�¯èƒ½ã�§ã�™ã€‚", - "block.create.redstone_contact.tooltip.condition1": "ä»–ã�®ã‚³ãƒ³ã‚¿ã‚¯ãƒˆã�«ç›´é�¢ã�—ã�Ÿã�¨ã��", - "block.create.redstone_contact.tooltip.behaviour1": "レッドストーン信å�·ã‚’æ��ä¾›ã�—ã�¾ã�™ã€‚", - "block.create.redstone_contact.tooltip.condition2": "å‹•ã�‹ã�—ã�Ÿã�¨ã��", - "block.create.redstone_contact.tooltip.behaviour2": "通é�Žã�™ã‚‹ã�™ã�¹ã�¦ã�®å›ºå®šæŽ¥ç‚¹ã‚’トリガーã�—ã�¾ã�™ã€‚", + "block.create.redstone_contact.tooltip": "レッドストーンコンタクト", + "block.create.redstone_contact.tooltip.summary": "レッドストーンパワーのみをペアで放出します。 _メカニカルピストン_または_ベアリング_で移動可能です。", + "block.create.redstone_contact.tooltip.condition1": "他のコンタクトに直面したとき", + "block.create.redstone_contact.tooltip.behaviour1": "レッドストーン信号を提供します。", + "block.create.redstone_contact.tooltip.condition2": "動かしたとき", + "block.create.redstone_contact.tooltip.behaviour2": "通過するすべての固定接点をトリガーします。", - "block.create.adjustable_crate.tooltip": "調整å�¯èƒ½ã�ªã‚¯ãƒ¬ãƒ¼ãƒˆ", - "block.create.adjustable_crate.tooltip.summary": "ã�“ã�®_ストレージコンテナ_ã�§ã�¯ã€�容é‡�を手動ã�§åˆ¶å¾¡ã�§ã��ã�¾ã�™ã€‚ ä»»æ„�ã�®ã‚¢ã‚¤ãƒ†ãƒ ã�®æœ€å¤§_16スタック_ã‚’ä¿�æŒ�ã�§ã��ã�¾ã�™ã€‚ _レッドストーンコンパレータ_をサãƒ�ートã�—ã�¾ã�™ã€‚", - "block.create.adjustable_crate.tooltip.control1": "å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "block.create.adjustable_crate.tooltip.action1": "_インターフェース_ã‚’é–‹ã��ã�¾ã�™", + "block.create.adjustable_crate.tooltip": "調整可能なクレート", + "block.create.adjustable_crate.tooltip.summary": "この_ストレージコンテナ_では、容量を手動で制御できます。 任意のアイテムの最大_16スタック_を保持できます。 _レッドストーンコンパレータ_をサポートします。", + "block.create.adjustable_crate.tooltip.control1": "右クリックしたとき", + "block.create.adjustable_crate.tooltip.action1": "_インターフェース_を開きます", - "block.create.creative_crate.tooltip": "クリエイティブクレート", - "block.create.creative_crate.tooltip.summary": "隣接ã�™ã‚‹æ¦‚略図砲ã�¸ãƒ–ロックã�®ç„¡é™�ã�«ä¾›çµ¦ã�—ã�¾ã�™ã€‚", + "block.create.creative_crate.tooltip": "クリエイティブクレート", + "block.create.creative_crate.tooltip.summary": "隣接する概略図砲へブロックの無限に供給します。", "block.create.creative_crate.tooltip.condition1": "UNLOCALIZED: When Item in Filter Slot", "block.create.creative_crate.tooltip.behaviour1": "UNLOCALIZED: Anything _extracting_ from this container will provide an _endless_ _supply_ of the item specified. Items _inserted_ into this crate will be _voided._", - "block.create.deployer.tooltip": "デプロイヤ", - "block.create.deployer.tooltip.summary": "_パンãƒ�_ã€�_使用_ã€�_有効化_。 ã�“ã�®ãƒžã‚·ãƒ³ã�¯ã€�_プレイヤー_ã‚’ã�§ã��ã‚‹ã� ã�‘_真似_ã�—よã�†ã�¨ã�—ã�¾ã�™ã€‚ 隣接ã�™ã‚‹ã‚¤ãƒ³ãƒ™ãƒ³ãƒˆãƒªã�®_アイテムをå�—ã�‘å�–ã‚Š_ã€�_é �ã�‘ã‚‹_ã�“ã�¨ã�Œã�§ã��ã�¾ã�™ã€‚ _フィルター_ã�¨ã�—ã�¦ã‚¢ã‚¤ãƒ†ãƒ ã‚¹ã‚¿ãƒƒã‚¯ã‚’割り当ã�¦ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™ã€‚", - "block.create.deployer.tooltip.condition1": "回転ã�—ã�Ÿã�¨ã��", - "block.create.deployer.tooltip.behaviour1": "腕を伸ã�°ã�—ã€�_2må…ˆ_ã�®ãƒ–ロックスペースã�§_発動_。", - "block.create.deployer.tooltip.condition2": "レンãƒ�ã�§å�³ã‚¯ãƒªãƒƒã‚¯ã�—ã�Ÿã�¨ã��", - "block.create.deployer.tooltip.behaviour2": "パンãƒ�モードを切り替ã�ˆã�¾ã�™ã€‚ _パンãƒ�モード_ã�§ã�¯ã€�デプロイヤã�¯ã��ã�®ã‚¢ã‚¤ãƒ†ãƒ ã‚’使用ã�—ã�¦_ブロックを壊ã�—ã�Ÿã‚Šã‚¨ãƒ³ãƒ†ã‚£ãƒ†ã‚£ã‚’å‚·ã�¤ã�‘_ã�Ÿã‚Šã�—よã�†ã�¨ã�—ã�¾ã�™ã€‚", + "block.create.deployer.tooltip": "デプロイヤ", + "block.create.deployer.tooltip.summary": "_パンチ_、_使用_、_有効化_。 このマシンは、_プレイヤー_をできるだけ_真似_しようとします。 隣接するインベントリの_アイテムを受け取り_、_預ける_ことができます。 _フィルター_としてアイテムスタックを割り当てることができます。", + "block.create.deployer.tooltip.condition1": "回転したとき", + "block.create.deployer.tooltip.behaviour1": "腕を伸ばし、_2m先_のブロックスペースで_発動_。", + "block.create.deployer.tooltip.condition2": "レンチで右クリックしたとき", + "block.create.deployer.tooltip.behaviour2": "パンチモードを切り替えます。 _パンチモード_では、デプロイヤはそのアイテムを使用して_ブロックを壊したりエンティティを傷つけ_たりしようとします。", - "block.create.funnel.tooltip": "æ¼�æ–—", - "block.create.funnel.tooltip.summary": "_入力アイテムをå�Žé›†_ã�—ã€�å�¯èƒ½ã�ªå ´å�ˆã�¯ã��れらをå�–り付ã�‘ã�Ÿ_インベントリ_ã�«æŒ¿å…¥ã�—ã�¾ã�™ã€‚ _世界_ã�®ã‚¢ã‚¤ãƒ†ãƒ ã‚„_ベルト_ã�®ã‚¢ã‚¤ãƒ†ãƒ ã‚’集ã‚�ã‚‹ã�“ã�¨ã�Œã�§ã��ã�¾ã�™ã€‚", - "block.create.funnel.tooltip.condition1": "パッシブベルト引ã�£å¼µã‚Š", - "block.create.funnel.tooltip.behaviour1": "æ¼�æ–—ã�¯ã€�_ベルトã�®ä¸Š_ã�‹ã‚‰æ¨ªã�¾ã�Ÿã�¯ç«¯ã�«é…�ç½®ã�™ã‚‹ã�¨ã€�ベルトã�‹ã‚‰ã‚¢ã‚¤ãƒ†ãƒ ã‚’引ã��出ã�™ã�“ã�¨ã�Œã�§ã��ã�¾ã�™ã€‚ 横å�‘ã��ã�®ãƒ•ã‚¡ãƒ³ãƒ�ルをãƒ�ックアップã�™ã‚‹ã�¨ã€�_ベルト上ã�®ã‚¢ã‚¤ãƒ†ãƒ ã�Œå�œæ­¢ã�™ã‚‹ã�“ã�¨ã�¯ã�‚ã‚Šã�¾ã�›ã‚“_。", + "block.create.funnel.tooltip": "漏斗", + "block.create.funnel.tooltip.summary": "_入力アイテムを収集_し、可能な場合はそれらを取り付けた_インベントリ_に挿入します。 _世界_のアイテムや_ベルト_のアイテムを集めることができます。", + "block.create.funnel.tooltip.condition1": "パッシブベルト引っ張り", + "block.create.funnel.tooltip.behaviour1": "漏斗は、_ベルトの上_から横または端に配置すると、ベルトからアイテムを引き出すことができます。 横向きのファンネルをバックアップすると、_ベルト上のアイテムが停止することはありません_。", - "block.create.belt_tunnel.tooltip": "ベルトトンãƒ�ル", - "block.create.belt_tunnel.tooltip.summary": "_メカニカルベルト_ã‚’å£�ã�«é€šã�™ã�Ÿã‚�ã�®ç¾Žçš„ã�ªã‚ªãƒ—ション。 ベルトã�¯çœŸé�®ã�®_ケーシング_ã�§_補強_ã�™ã‚‹å¿…è¦�ã�Œã�‚ã‚Šã�¾ã�™ã€‚ トンãƒ�ルã�¯_隣接_グループã�¨å�ŒæœŸã�§ã��ã€�グループ内ã�®ã�™ã�¹ã�¦ã�®ãƒˆãƒ³ãƒ�ルã�«1ã�¤ã�®å¾…æ©Ÿã�Œã�‚ã‚‹å ´å�ˆã�«ã�®ã�¿ã‚¢ã‚¤ãƒ†ãƒ ã‚’通é�Žã�•ã�›ã�¾ã�™ã€‚ [Ctrl]", - "block.create.belt_tunnel.tooltip.control1": "å‰�é�¢ã‚’レンãƒ�ã�§å�³ã‚¯ãƒªãƒƒã‚¯", - "block.create.belt_tunnel.tooltip.action1": "_å�ŒæœŸå‹•ä½œ_を切り替ã�ˆã�¾ã�™ã€‚ å�ŒæœŸã�•ã‚Œã�Ÿãƒˆãƒ³ãƒ�ルã�¯ã€�ãƒ�イãƒ�ーã�Œã‚¢ã‚¤ãƒ†ãƒ ã‚’å�–å¾—ã�™ã‚‹ã�¾ã�§ã‚¢ã‚¤ãƒ†ãƒ ã‚’ä¿�æŒ�ã�—ã�¾ã�™ã€‚", - "block.create.belt_tunnel.tooltip.control2": "横é�¢ã‚’レンãƒ�ã�§å�³ã‚¯ãƒªãƒƒã‚¯", - "block.create.belt_tunnel.tooltip.action2": "トンãƒ�ルã�«ã��ã�®é�¢ã�«çª“ã�Œã�‚ã‚‹å ´å�ˆã€�_窓シャッターを調整_ã�—ã�¾ã�™ã€‚", + "block.create.belt_tunnel.tooltip": "ベルトトンネル", + "block.create.belt_tunnel.tooltip.summary": "_メカニカルベルト_を壁に通すための美的なオプション。 ベルトは真鍮の_ケーシング_で_補強_する必要があります。 トンネルは_隣接_グループと同期でき、グループ内のすべてのトンネルに1つの待機がある場合にのみアイテムを通過させます。 [Ctrl]", + "block.create.belt_tunnel.tooltip.control1": "前面をレンチで右クリック", + "block.create.belt_tunnel.tooltip.action1": "_同期動作_を切り替えます。 同期されたトンネルは、ネイバーがアイテムを取得するまでアイテムを保持します。", + "block.create.belt_tunnel.tooltip.control2": "横面をレンチで右クリック", + "block.create.belt_tunnel.tooltip.action2": "トンネルにその面に窓がある場合、_窓シャッターを調整_します。", - "block.create.brass_casing.tooltip": "真ã�¡ã‚…ã�†ã�®ã‚±ãƒ¼ã‚·ãƒ³ã‚°", - "block.create.brass_casing.tooltip.summary": "ã�•ã�¾ã�–ã�¾ã�ªç”¨é€”ã�«ä½¿ç”¨ã�§ã��る頑丈ã�ªæ©Ÿæ¢°ã‚±ãƒ¼ã‚·ãƒ³ã‚°ã€‚ 装飾用ã�«ã‚‚安全ã�§ã�™ã€‚", - "block.create.brass_casing.tooltip.condition1": "メカニカルベルトã�«ä½¿ç”¨ã�—ã�Ÿã�¨ã��", - "block.create.brass_casing.tooltip.behaviour1": "真é�®è£½ã�®ãƒ•ã‚¡ãƒ³ãƒ‡ãƒ¼ã‚·ãƒ§ãƒ³ã�§ãƒ™ãƒ«ãƒˆã‚’補強ã�—ã�¾ã�™ã€‚ 強化ベルトã�¯ã€�ベルトトンãƒ�ルã€�エクストラクタã€�ファンãƒ�ルã€�ã�Šã‚ˆã�³ãƒˆãƒ©ãƒ³ã‚¹ãƒ�ーザをベルトã�®å�´é�¢ã�Šã‚ˆã�³ä¸‹ã�‹ã‚‰ç›¸äº’作用ã�™ã‚‹ã�“ã�¨ã‚’サãƒ�ートã�§ã��ã�¾ã�™ã€‚", + "block.create.brass_casing.tooltip": "真ちゅうのケーシング", + "block.create.brass_casing.tooltip.summary": "さまざまな用途に使用できる頑丈な機械ケーシング。 装飾用にも安全です。", + "block.create.brass_casing.tooltip.condition1": "メカニカルベルトに使用したとき", + "block.create.brass_casing.tooltip.behaviour1": "真鍮製のファンデーションでベルトを補強します。 強化ベルトは、ベルトトンネル、エクストラクタ、ファンネル、およびトランスポーザをベルトの側面および下から相互作用することをサポートできます。", - "block.create.belt_observer.tooltip": "ベルトオブザーãƒ�ー", - "block.create.belt_observer.tooltip.summary": "ã��ã�®å‰�ã�®ãƒ¡ã‚«ãƒ‹ã‚«ãƒ«ãƒ™ãƒ«ãƒˆä¸Šã‚’通りé�Žã�Žã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã�¨ã‚¨ãƒ³ãƒ†ã‚£ãƒ†ã‚£ã‚’検出ã�—ã�¾ã�™ã€‚ レンãƒ�を使用ã�—ã�¦ã€�ã��ã�®å‹•ä½œã‚’循環ã�•ã�›ã�¾ã�™ã€‚ é�žã‚¢ã‚¤ãƒ†ãƒ ã�¯ã€�設定ã�«é–¢ä¿‚ã�ªã��常ã�«æ¤œå‡ºãƒ¢ãƒ¼ãƒ‰ã�§å‡¦ç�†ã�•ã‚Œã�¾ã�™ã€‚", - "block.create.belt_observer.tooltip.condition1": "検出モード", - "block.create.belt_observer.tooltip.behaviour1": "_一致ã�™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã�Œè¦³æ¸¬_ã�•ã‚Œã�Ÿãƒ™ãƒ«ãƒˆã‚»ã‚°ãƒ¡ãƒ³ãƒˆã�«ã�‚ã‚‹é–“ã€�レッドストーンを出力ã�—ã�¾ã�™ã€‚", - "block.create.belt_observer.tooltip.condition2": "パルスモード", - "block.create.belt_observer.tooltip.behaviour2": "一致ã�™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã�Œè¦³æ¸¬_ã�•ã‚Œã�Ÿãƒ™ãƒ«ãƒˆã‚»ã‚°ãƒ¡ãƒ³ãƒˆã�®ä¸­å¿ƒã‚’通é�Žã�™ã‚‹ã�¨ã��ã�«_パルス_を発ã�—ã�¾ã�™ã€‚", - "block.create.belt_observer.tooltip.condition3": "イジェクトモード", - "block.create.belt_observer.tooltip.behaviour3": "_一致ã�™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ _ã‚’å�´é�¢ã�‹ã‚‰æŽ’出ã�—ã�¾ã�™ã€‚ 対象ã�®ãƒ™ãƒ«ãƒˆã‚„スペースã�Œå� æœ‰ã�•ã‚Œã�¦ã�„ã‚‹å ´å�ˆã€�アイテムã�¯_所定ã�®ä½�ç½®ã�«ä¿�æŒ�_ã�•ã‚Œã�¾ã�™ã€‚", - "block.create.belt_observer.tooltip.condition4": "分割モード", - "block.create.belt_observer.tooltip.behaviour4": "_一致ã�™ã‚‹ã‚¢ã‚¤ãƒ†ãƒ ã‚¹ã‚¿ãƒƒã‚¯_を分割ã�—ã€�ã��ã�®_å�Šåˆ†_ã‚’å�´é�¢ã�‹ã‚‰_排出_ã�—ã�¾ã�™ã€‚", + "block.create.belt_observer.tooltip": "ベルトオブザーバー", + "block.create.belt_observer.tooltip.summary": "その前のメカニカルベルト上を通り過ぎるアイテムとエンティティを検出します。 レンチを使用して、その動作を循環させます。 非アイテムは、設定に関係なく常に検出モードで処理されます。", + "block.create.belt_observer.tooltip.condition1": "検出モード", + "block.create.belt_observer.tooltip.behaviour1": "_一致するアイテムが観測_されたベルトセグメントにある間、レッドストーンを出力します。", + "block.create.belt_observer.tooltip.condition2": "パルスモード", + "block.create.belt_observer.tooltip.behaviour2": "一致するアイテムが観測_されたベルトセグメントの中心を通過するときに_パルス_を発します。", + "block.create.belt_observer.tooltip.condition3": "イジェクトモード", + "block.create.belt_observer.tooltip.behaviour3": "_一致するアイテム_を側面から排出します。 対象のベルトやスペースが占有されている場合、アイテムは_所定の位置に保持_されます。", + "block.create.belt_observer.tooltip.condition4": "分割モード", + "block.create.belt_observer.tooltip.behaviour4": "_一致するアイテムスタック_を分割し、その_半分_を側面から_排出_します。", - "block.create.pulse_repeater.tooltip": "パルスリピーター", - "block.create.pulse_repeater.tooltip.summary": "通é�Žã�™ã‚‹ãƒ¬ãƒƒãƒ‰ã‚¹ãƒˆãƒ¼ãƒ³ä¿¡å�·ã‚’_1ティック_ã�®é•·ã�•ã�«ã‚«ãƒƒãƒˆã�™ã‚‹ç°¡å�˜ã�ªå›žè·¯ã€‚", + "block.create.pulse_repeater.tooltip": "パルスリピーター", + "block.create.pulse_repeater.tooltip.summary": "通過するレッドストーン信号を_1ティック_の長さにカットする簡単な回路。", - "block.create.adjustable_repeater.tooltip": "フレックスリピーター", - "block.create.adjustable_repeater.tooltip.summary": "最大_30分_ã�®é�…延を_設定å�¯èƒ½_ã�ªé«˜åº¦ã�ª_レッドストーンリピーター_。", + "block.create.adjustable_repeater.tooltip": "フレックスリピーター", + "block.create.adjustable_repeater.tooltip.summary": "最大_30分_の遅延を_設定可能_な高度な_レッドストーンリピーター_。", - "block.create.adjustable_pulse_repeater.tooltip": "フレックスパルスリピーター", - "block.create.adjustable_pulse_repeater.tooltip.summary": "最大_30分_ã�®é�…延を_設定å�¯èƒ½_ã�ª_パルスリピーター_。", + "block.create.adjustable_pulse_repeater.tooltip": "フレックスパルスリピーター", + "block.create.adjustable_pulse_repeater.tooltip.summary": "最大_30分_の遅延を_設定可能_な_パルスリピーター_。", - "block.create.analog_lever.tooltip": "アナログレãƒ�ー", - "block.create.analog_lever.tooltip.summary": "_発信信å�·å¼·åº¦_をより_正確ã�«åˆ¶å¾¡_ã�™ã‚‹ãƒ¬ãƒ�ー。", + "block.create.analog_lever.tooltip": "アナログレバー", + "block.create.analog_lever.tooltip.summary": "_発信信号強度_をより_正確に制御_するレバー。", - "block.create.powered_toggle_latch.tooltip": "パワードトグルラッãƒ�", - "block.create.powered_toggle_latch.tooltip.summary": "レッドストーンパルスã�«ã‚ˆã�£ã�¦ãƒˆã‚°ãƒ«ã�§ã��るレãƒ�ー。", + "block.create.powered_toggle_latch.tooltip": "パワードトグルラッチ", + "block.create.powered_toggle_latch.tooltip.summary": "レッドストーンパルスによってトグルできるレバー。", - "block.create.powered_latch.tooltip": "パワードラッãƒ�", - "block.create.powered_latch.tooltip.summary": "_レッドストーン信å�·_ã�§åˆ¶å¾¡ã�§ã��るレãƒ�ー。 _背é�¢ã�®ä¿¡å�·_ã�¯ã��れをå�¯èƒ½ã�«ã�—ã€�_å�´é�¢ã�‹ã‚‰ã�®ä¿¡å�·_ã�¯ã��れをリセットã�—ã�¾ã�™ã€‚", + "block.create.powered_latch.tooltip": "パワードラッチ", + "block.create.powered_latch.tooltip.summary": "_レッドストーン信号_で制御できるレバー。 _背面の信号_はそれを可能にし、_側面からの信号_はそれをリセットします。", - "block.create.speedometer.tooltip": "スピードメーター", - "block.create.speedometer.tooltip.summary": "接続ã�•ã‚Œã�Ÿå‹•åŠ›ã‚³ãƒ³ãƒ�ーãƒ�ントã�®_回転速度_を測定ã�—ã�¦è¡¨ç¤ºã�—ã�¾ã�™ã€‚ _レッドストーンコンパレータ_をサãƒ�ートã�—ã�¾ã�™ã€‚", - "block.create.speedometer.tooltip.condition1": "回転ã�—ã�Ÿã�¨ã��", - "block.create.speedometer.tooltip.behaviour1": "速度ã�®ãƒ¬ãƒ™ãƒ«ã�«å¯¾å¿œã�™ã‚‹è‰²ã‚’示ã�—ã�¾ã�™ã€‚ _ç·‘_ã�¯ä½Žé€Ÿã€�_é�’_ã�¯ä¸­ç¨‹åº¦ã€�_ç´«_ã�¯é«˜é€Ÿå›žè»¢ã‚’示ã�—ã�¾ã�™ã€‚ 一部ã�®æ©Ÿæ¢°ã‚³ãƒ³ãƒ�ーãƒ�ントã�¯ã€�é�©åˆ‡ã�«æ©Ÿèƒ½ã�™ã‚‹ã�Ÿã‚�ã�«å��分ã�ªãƒ¬ãƒ™ãƒ«ã�®é€Ÿåº¦ã‚’å¿…è¦�ã�¨ã�—ã�¾ã�™ã€‚", + "block.create.speedometer.tooltip": "スピードメーター", + "block.create.speedometer.tooltip.summary": "接続された動力コンポーネントの_回転速度_を測定して表示します。 _レッドストーンコンパレータ_をサポートします。", + "block.create.speedometer.tooltip.condition1": "回転したとき", + "block.create.speedometer.tooltip.behaviour1": "速度のレベルに対応する色を示します。 _緑_は低速、_青_は中程度、_紫_は高速回転を示します。 一部の機械コンポーネントは、適切に機能するために十分なレベルの速度を必要とします。", - "block.create.stressometer.tooltip": "ストレスメーター", - "block.create.stressometer.tooltip.summary": "接続ã�•ã‚Œã�Ÿå‹•åŠ›ãƒ�ットワークã�®å…¨ä½“çš„ã�ªå¿œåŠ›ã‚’測定ã�—ã�¦è¡¨ç¤ºã�—ã�¾ã�™ã€‚ レッドストーンコンパレータをサãƒ�ートã�—ã�¾ã�™ã€‚", - "block.create.stressometer.tooltip.condition1": "回転ã�—ã�Ÿã�¨ã��", - "block.create.stressometer.tooltip.behaviour1": "応力ã�®ãƒ¬ãƒ™ãƒ«ã�«å¯¾å¿œã�™ã‚‹è‰²ã‚’示ã�—ã�¾ã�™ã€‚ _é�Žåº¦ã�«å¿œåŠ›ã�Œã�‹ã�‹ã�£ã�Ÿãƒ�ットワーク_ã�¯å‹•ã��ã‚’æ­¢ã‚�ã�¾ã�™ã€‚ ãƒ�ットワークã�«_回転æº�_を追加ã�™ã‚‹ã�“ã�¨ã�§ã€�応力を軽減ã�§ã��ã�¾ã�™ã€‚", + "block.create.stressometer.tooltip": "ストレスメーター", + "block.create.stressometer.tooltip.summary": "接続された動力ネットワークの全体的な応力を測定して表示します。 レッドストーンコンパレータをサポートします。", + "block.create.stressometer.tooltip.condition1": "回転したとき", + "block.create.stressometer.tooltip.behaviour1": "応力のレベルに対応する色を示します。 _過度に応力がかかったネットワーク_は動きを止めます。 ネットワークに_回転源_を追加することで、応力を軽減できます。", - "tool.create.sand_paper.tooltip": "サンドペーパー", - "tool.create.sand_paper.tooltip.summary": "_ç´ æ��を磨ã�„ã�Ÿã‚Š_ã€�_é�“å…·_ã‚’ç ”ã��ã�Ÿã‚�ã�«ä½¿ç”¨ã�§ã��ã‚‹ç²—ã�„紙。", - "tool.create.sand_paper.tooltip.condition1": "使用ã�—ã�Ÿã�¨ã��", - "tool.create.sand_paper.tooltip.behaviour1": "オフãƒ�ンドã�§æŒ�ã�£ã�¦ã�„るアイテムや地é�¢ã�«è�½ã�¡ã�¦ã�„るアイテムを見るã�¨ç ”磨ã�—ã�¾ã�™", + "tool.create.sand_paper.tooltip": "サンドペーパー", + "tool.create.sand_paper.tooltip.summary": "_素材を磨いたり_、_道具_を研ぐために使用できる粗い紙。", + "tool.create.sand_paper.tooltip.condition1": "使用したとき", + "tool.create.sand_paper.tooltip.behaviour1": "オフハンドで持っているアイテムや地面に落ちているアイテムを見ると研磨します", "item.create.super_glue.tooltip": "UNLOCALIZED: SUPER GLUE", "item.create.super_glue.tooltip.summary": "UNLOCALIZED: Glue a block to another, and they will forever be inseparable.", @@ -1595,26 +1397,26 @@ "item.create.super_glue.tooltip.condition2": "UNLOCALIZED: When Held in Offhand", "item.create.super_glue.tooltip.behaviour2": "UNLOCALIZED: _Automatically_ _attaches_ blocks placed from the main hand to the _side_ they were _placed_ _against._", - "item.create.refined_radiance.tooltip": "æ´—ç·´ã�•ã‚Œã�Ÿæ”¾å°„", - "item.create.refined_radiance.tooltip.summary": "_å�¸å�Žã�•ã‚Œã�Ÿå…‰_ã�‹ã‚‰é�›é€ ã�•ã‚Œã�Ÿã‚¯ãƒ­ãƒžãƒ�ックマテリアル。", + "item.create.refined_radiance.tooltip": "洗練された放射", + "item.create.refined_radiance.tooltip.summary": "_吸収された光_から鍛造されたクロマチックマテリアル。", - "item.create.shadow_steel.tooltip": "シャドウスãƒ�ール", - "item.create.shadow_steel.tooltip.summary": "_虚無_ã�‹ã‚‰é�›é€ ã�•ã‚Œã�Ÿã‚¯ãƒ­ãƒžãƒ†ã‚£ãƒƒã‚¯ãƒžãƒ†ãƒªã‚¢ãƒ«ã€‚", + "item.create.shadow_steel.tooltip": "シャドウスチール", + "item.create.shadow_steel.tooltip.summary": "_虚無_から鍛造されたクロマティックマテリアル。", - "item.create.crafter_slot_cover.tooltip": "スロットカãƒ�ー", - "item.create.crafter_slot_cover.tooltip.summary": "_メカニカルクラフター_ã�§ãƒ¬ã‚·ãƒ”ã�®ç©ºã�®ã‚¹ãƒ­ãƒƒãƒˆã�¨ã�—ã�¦ãƒžãƒ¼ã‚¯ã�™ã‚‹ã�Ÿã‚�ã�«ä½¿ç”¨ã�•ã‚Œã�¾ã�™ã€‚ クラフターã�¯å¿…ã�šã�—も完全ã�ªæ­£æ–¹æ ¼å­�ã‚’å½¢æˆ�ã�™ã‚‹å¿…è¦�ã�¯ã�‚ã‚Šã�¾ã�›ã‚“。 ã�“ã‚Œã�¯ã€�_æˆ�分ã�Œäº’ã�„ã�«å¯¾è§’ç·š_ã�§ã�‚るレシピã�Œã�‚ã‚‹å ´å�ˆã�«å½¹ç«‹ã�¡ã�¾ã�™ã€‚", + "item.create.crafter_slot_cover.tooltip": "スロットカバー", + "item.create.crafter_slot_cover.tooltip.summary": "_メカニカルクラフター_でレシピの空のスロットとしてマークするために使用されます。 クラフターは必ずしも完全な正方格子を形成する必要はありません。 これは、_成分が互いに対角線_であるレシピがある場合に役立ちます。", "create.tooltip.wip": "WIP", - "create.tooltip.workInProgress": "作業中ã�§ã�™ï¼�", - "create.tooltip.randomWipDescription0": "ã�Šå­�様ã�®æ‰‹ã�®å±Šã�‹ã�ªã�„ã�¨ã�“ã‚�ã�«ä¿�管ã�—ã�¦ã��ã� ã�•ã�„。", - "create.tooltip.randomWipDescription1": "赤ã�¡ã‚ƒã‚“パンダã�¯ã€�ã�“ã�®ã‚¢ã‚¤ãƒ†ãƒ ã‚’使用ã�™ã‚‹ã�Ÿã�³ã�«æ­»ã�«ã�¾ã�™ã€‚ã��ã�†ã€�ã�™ã�¹ã�¦ã�®æ™‚間。", - "create.tooltip.randomWipDescription2": "自己責任。", - "create.tooltip.randomWipDescription3": "ã�“ã‚Œã�¯ã�‚ã�ªã�Ÿã�ŒæŽ¢ã�—ã�¦ã�„るアイテムã�§ã�¯ã�‚ã‚Šã�¾ã�›ã‚“。* finger-wiggles *を分散ã�•ã�›ã�¦ã��ã� ã�•ã�„。", - "create.tooltip.randomWipDescription4": "ã�“ã�®ã‚¢ã‚¤ãƒ†ãƒ ã�¯10秒ã�§è‡ªå·±ç ´å£Šã�—ã�¾ã�™ã€‚ 10ã€�9ã€�8 ...", - "create.tooltip.randomWipDescription5": "ç§�ã‚’ä¿¡ã�˜ã�¦ã€�ã��ã‚Œã�¯ç„¡é§„ã� ã€‚", - "create.tooltip.randomWipDescription6": "ã�“ã�®ã‚¢ã‚¤ãƒ†ãƒ ã‚’使用ã�™ã‚‹ã�“ã�¨ã�«ã‚ˆã‚Šã€�ã�Šå®¢æ§˜ã�¯ã�“ã�“ã�«å…�責事項ã�«å�Œæ„�ã�—ã€�ã��ã�®æ�¡ä»¶ã�«å�Œæ„�ã�™ã‚‹ã‚‚ã�®ã�¨ã�—ã�¾ã�™ã€‚", - "create.tooltip.randomWipDescription7": "ã�“ã‚Œã�¯ã�‚ã�ªã�Ÿã�®ã�Ÿã‚�ã�§ã�¯ã�ªã�„ã�‹ã‚‚ã�—ã‚Œã�¾ã�›ã‚“。 ã�‚ã‚Œã�¯ã�©ã�†ï¼Ÿï¼Ÿ", - "create.tooltip.randomWipDescription8": "ã��れを使ã�£ã�¦ã�™ã��ã�«æ±ºæ–­ã�—ã�Ÿã�“ã�¨ã�«å¾Œæ‚”ã�—ã�¦ã��ã� ã�•ã�„。", + "create.tooltip.workInProgress": "作業中です！", + "create.tooltip.randomWipDescription0": "お子様の手の届かないところに保管してください。", + "create.tooltip.randomWipDescription1": "赤ちゃんパンダは、このアイテムを使用するたびに死にます。そう、すべての時間。", + "create.tooltip.randomWipDescription2": "自己責任。", + "create.tooltip.randomWipDescription3": "これはあなたが探しているアイテムではありません。* finger-wiggles *を分散させてください。", + "create.tooltip.randomWipDescription4": "このアイテムは10秒で自己破壊します。 10、9、8 ...", + "create.tooltip.randomWipDescription5": "私を信じて、それは無駄だ。", + "create.tooltip.randomWipDescription6": "このアイテムを使用することにより、お客様はここに免責事項に同意し、その条件に同意するものとします。", + "create.tooltip.randomWipDescription7": "これはあなたのためではないかもしれません。 あれはどう？？", + "create.tooltip.randomWipDescription8": "それを使ってすぐに決断したことに後悔してください。", "_": "Thank you for translating Create!" diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index 30fdcc0f6..cd6cdeed1 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -5,17 +5,17 @@ "block.create.acacia_window": "UNLOCALIZED: Acacia Window", "block.create.acacia_window_pane": "UNLOCALIZED: Acacia Window Pane", - "block.create.adjustable_crate": "가변 창고", - "block.create.adjustable_pulley": "ë�®ížŒ 벨트 ë³€ì†�기", - "block.create.adjustable_pulse_repeater": "가변 펄스 리피터", - "block.create.adjustable_repeater": "가변 리피터", - "block.create.analog_lever": "아날로그 레버", + "block.create.adjustable_crate": "가변 창고", + "block.create.adjustable_pulley": "덮힌 벨트 변속기", + "block.create.adjustable_pulse_repeater": "가변 펄스 리피터", + "block.create.adjustable_repeater": "가변 리피터", + "block.create.analog_lever": "아날로그 레버", "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", - "block.create.andesite_bricks": "안산안 ë²½ë�Œ", + "block.create.andesite_bricks": "안산안 벽돌", "block.create.andesite_bricks_slab": "UNLOCALIZED: Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "UNLOCALIZED: Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "UNLOCALIZED: Andesite Bricks Wall", - "block.create.andesite_casing": "안산암 ì¼€ì�´ìŠ¤", + "block.create.andesite_casing": "안산암 케이스", "block.create.andesite_cobblestone": "UNLOCALIZED: Andesite Cobblestone", "block.create.andesite_cobblestone_slab": "UNLOCALIZED: Andesite Cobblestone Slab", "block.create.andesite_cobblestone_stairs": "UNLOCALIZED: Andesite Cobblestone Stairs", @@ -23,14 +23,8 @@ "block.create.andesite_funnel": "UNLOCALIZED: Andesite Funnel", "block.create.andesite_pillar": "UNLOCALIZED: Andesite Pillar", "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", -<<<<<<< HEAD - "block.create.basin": "대야", - "block.create.belt": "컨베ì�´ì–´ 벨트", - "block.create.belt_observer": "벨트 ê°�지기", -======= "block.create.basin": "대야", "block.create.belt": "컨베이어 벨트", ->>>>>>> mc1.15/dev "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", "block.create.black_seat": "UNLOCALIZED: Black Seat", @@ -39,17 +33,13 @@ "block.create.blue_seat": "UNLOCALIZED: Blue Seat", "block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle", "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", - "block.create.brass_block": "황ë�™ 블럭", - "block.create.brass_casing": "황ë�™ ì¼€ì�´ìŠ¤", + "block.create.brass_block": "황동 블럭", + "block.create.brass_casing": "황동 케이스", "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.brown_seat": "UNLOCALIZED: Brown Seat", -<<<<<<< HEAD - "block.create.cart_assembler": "카트 조립기", -======= "block.create.brown_valve_handle": "UNLOCALIZED: Brown Valve Handle", "block.create.cart_assembler": "카트 조립기", ->>>>>>> mc1.15/dev "block.create.chiseled_dark_scoria": "UNLOCALIZED: Chiseled Dark Scoria", "block.create.chiseled_dolomite": "UNLOCALIZED: Chiseled Dolomite", "block.create.chiseled_gabbro": "UNLOCALIZED: Chiseled Gabbro", @@ -57,19 +47,6 @@ "block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria", "block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone", "block.create.chute": "UNLOCALIZED: Chute", -<<<<<<< HEAD - "block.create.clockwork_bearing": "시계 ë² ì–´ë§�", - "block.create.clutch": "í�´ëŸ¬ì¹˜", - "block.create.cogwheel": "톱나버퀴", - "block.create.copper_block": "구리 블럭", - "block.create.copper_casing": "구리 ì¼€ì�´ìŠ¤", - "block.create.copper_ore": "구리 ê´‘ì„�", - "block.create.copper_shingles": "구리 íŒ�ìž�", - "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", - "block.create.creative_crate": "청사진 대í�¬ 지ì›�기", - "block.create.creative_motor": "모터", - "block.create.crushing_wheel": "분쇄 휠", -======= "block.create.clockwork_bearing": "시계 베어링", "block.create.clutch": "클러치", "block.create.cogwheel": "톱나버퀴", @@ -83,26 +60,25 @@ "block.create.creative_crate": "청사진 대포 지원기", "block.create.creative_motor": "모터", "block.create.crushing_wheel": "분쇄 휠", ->>>>>>> mc1.15/dev "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", - "block.create.cuckoo_clock": "ë»�꾸기 시계", + "block.create.cuckoo_clock": "뻐꾸기 시계", "block.create.cyan_seat": "UNLOCALIZED: Cyan Seat", "block.create.cyan_valve_handle": "UNLOCALIZED: Cyan Valve Handle", "block.create.dark_oak_window": "UNLOCALIZED: Dark Oak Window", "block.create.dark_oak_window_pane": "UNLOCALIZED: Dark Oak Window Pane", - "block.create.dark_scoria": "짙ì�€ 스코리아", - "block.create.dark_scoria_bricks": "짙ì�€ 스코리아 ë²½ë�Œ", - "block.create.dark_scoria_bricks_slab": "짙ì�€ 스코리아 ë²½ë�Œ ë°˜ 블ë¡�", - "block.create.dark_scoria_bricks_stairs": "짙ì�€ 스코리아 ë²½ë�Œ 계단", - "block.create.dark_scoria_bricks_wall": "짙ì�€ 스코리아 ë²½ë�Œ 담장", + "block.create.dark_scoria": "짙은 스코리아", + "block.create.dark_scoria_bricks": "짙은 스코리아 벽돌", + "block.create.dark_scoria_bricks_slab": "짙은 스코리아 벽돌 반 블록", + "block.create.dark_scoria_bricks_stairs": "짙은 스코리아 벽돌 계단", + "block.create.dark_scoria_bricks_wall": "짙은 스코리아 벽돌 담장", "block.create.dark_scoria_cobblestone": "UNLOCALIZED: Dark Scoria Cobblestone", "block.create.dark_scoria_cobblestone_slab": "UNLOCALIZED: Dark Scoria Cobblestone Slab", "block.create.dark_scoria_cobblestone_stairs": "UNLOCALIZED: Dark Scoria Cobblestone Stairs", "block.create.dark_scoria_cobblestone_wall": "UNLOCALIZED: Dark Scoria Cobblestone Wall", "block.create.dark_scoria_pillar": "UNLOCALIZED: Dark Scoria Pillar", - "block.create.deployer": "ë°°í�¬ê¸°", + "block.create.deployer": "배포기", "block.create.depot": "UNLOCALIZED: Depot", - "block.create.diorite_bricks": "섬ë¡�ì•” ë²½ë�Œ", + "block.create.diorite_bricks": "섬록암 벽돌", "block.create.diorite_bricks_slab": "UNLOCALIZED: Diorite Bricks Slab", "block.create.diorite_bricks_stairs": "UNLOCALIZED: Diorite Bricks Stairs", "block.create.diorite_bricks_wall": "UNLOCALIZED: Diorite Bricks Wall", @@ -111,20 +87,20 @@ "block.create.diorite_cobblestone_stairs": "UNLOCALIZED: Diorite Cobblestone Stairs", "block.create.diorite_cobblestone_wall": "UNLOCALIZED: Diorite Cobblestone Wall", "block.create.diorite_pillar": "UNLOCALIZED: Diorite Pillar", - "block.create.dolomite": "백운암", - "block.create.dolomite_bricks": "백운암 ë²½ë�Œ", - "block.create.dolomite_bricks_slab": "백운암 ë²½ë�Œ ë°˜ 블ë¡�", - "block.create.dolomite_bricks_stairs": "백운암 ë²½ë�Œ 계단", - "block.create.dolomite_bricks_wall": "백운암 ë²½ë�Œ 담장", + "block.create.dolomite": "백운암", + "block.create.dolomite_bricks": "백운암 벽돌", + "block.create.dolomite_bricks_slab": "백운암 벽돌 반 블록", + "block.create.dolomite_bricks_stairs": "백운암 벽돌 계단", + "block.create.dolomite_bricks_wall": "백운암 벽돌 담장", "block.create.dolomite_cobblestone": "UNLOCALIZED: Dolomite Cobblestone", "block.create.dolomite_cobblestone_slab": "UNLOCALIZED: Dolomite Cobblestone Slab", "block.create.dolomite_cobblestone_stairs": "UNLOCALIZED: Dolomite Cobblestone Stairs", "block.create.dolomite_cobblestone_wall": "UNLOCALIZED: Dolomite Cobblestone Wall", - "block.create.dolomite_pillar": "백운암 기둥", - "block.create.encased_belt": "ë�®ížŒ 벨트", - "block.create.encased_fan": "ë�®ížŒ 환í’�기", + "block.create.dolomite_pillar": "백운암 기둥", + "block.create.encased_belt": "덮힌 벨트", + "block.create.encased_fan": "덮힌 환풍기", "block.create.encased_fluid_pipe": "UNLOCALIZED: Encased Fluid Pipe", - "block.create.encased_shaft": "ë�®ížŒ 축", + "block.create.encased_shaft": "덮힌 축", "block.create.fancy_andesite_bricks": "UNLOCALIZED: Fancy Andesite Bricks", "block.create.fancy_andesite_bricks_slab": "UNLOCALIZED: Fancy Andesite Bricks Slab", "block.create.fancy_andesite_bricks_stairs": "UNLOCALIZED: Fancy Andesite Bricks Stairs", @@ -163,14 +139,6 @@ "block.create.fancy_weathered_limestone_bricks_wall": "UNLOCALIZED: Fancy Weathered Limestone Bricks Wall", "block.create.fluid_pipe": "UNLOCALIZED: Fluid Pipe", "block.create.fluid_tank": "UNLOCALIZED: Fluid Tank", -<<<<<<< HEAD - "block.create.flywheel": "플ë�¼ì�´íœ ", - "block.create.framed_glass": "í�° 유리", - "block.create.framed_glass_pane": "í�° 유리íŒ�", - "block.create.furnace_engine": "화로 엔진", - "block.create.gabbro": "반려암", - "block.create.gabbro_bricks": "반려암 ë²½ë�Œ", -======= "block.create.fluid_valve": "UNLOCALIZED: Fluid Valve", "block.create.flywheel": "플라이휠", "block.create.framed_glass": "큰 유리", @@ -178,19 +146,18 @@ "block.create.furnace_engine": "화로 엔진", "block.create.gabbro": "반려암", "block.create.gabbro_bricks": "반려암 벽돌", ->>>>>>> mc1.15/dev "block.create.gabbro_bricks_slab": "UNLOCALIZED: Gabbro Bricks Slab", - "block.create.gabbro_bricks_stairs": "반려암 ë²½ë�Œ 계단", - "block.create.gabbro_bricks_wall": "반려암 ë²½ë�Œ 담장", + "block.create.gabbro_bricks_stairs": "반려암 벽돌 계단", + "block.create.gabbro_bricks_wall": "반려암 벽돌 담장", "block.create.gabbro_cobblestone": "UNLOCALIZED: Gabbro Cobblestone", "block.create.gabbro_cobblestone_slab": "UNLOCALIZED: Gabbro Cobblestone Slab", "block.create.gabbro_cobblestone_stairs": "UNLOCALIZED: Gabbro Cobblestone Stairs", "block.create.gabbro_cobblestone_wall": "UNLOCALIZED: Gabbro Cobblestone Wall", "block.create.gabbro_pillar": "UNLOCALIZED: Gabbro Pillar", - "block.create.gearbox": "기어박스", - "block.create.gearshift": "기어쉬프트", + "block.create.gearbox": "기어박스", + "block.create.gearshift": "기어쉬프트", "block.create.glass_fluid_pipe": "UNLOCALIZED: Glass Fluid Pipe", - "block.create.granite_bricks": "화강암 ë²½ë�Œ", + "block.create.granite_bricks": "화강암 벽돌", "block.create.granite_bricks_slab": "UNLOCALIZED: Granite Bricks Slab", "block.create.granite_bricks_stairs": "UNLOCALIZED: Granite Bricks Stairs", "block.create.granite_bricks_wall": "UNLOCALIZED: Granite Bricks Wall", @@ -202,19 +169,13 @@ "block.create.gray_seat": "UNLOCALIZED: Gray Seat", "block.create.gray_valve_handle": "UNLOCALIZED: Gray Valve Handle", "block.create.green_seat": "UNLOCALIZED: Green Seat", -<<<<<<< HEAD - "block.create.hand_crank": "핸드 í�¬ëž­í�¬", - "block.create.horizontal_framed_glass": "수í�‰ 유리", - "block.create.horizontal_framed_glass_pane": "수í�‰ 유리íŒ�", -======= "block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle", "block.create.hand_crank": "핸드 크랭크", "block.create.horizontal_framed_glass": "수평 유리", "block.create.horizontal_framed_glass_pane": "수평 유리판", ->>>>>>> mc1.15/dev "block.create.jungle_window": "UNLOCALIZED: Jungle Window", "block.create.jungle_window_pane": "UNLOCALIZED: Jungle Window Pane", - "block.create.large_cogwheel": "í�° 톱니바퀴", + "block.create.large_cogwheel": "큰 톱니바퀴", "block.create.layered_andesite": "UNLOCALIZED: Layered Andesite", "block.create.layered_dark_scoria": "UNLOCALIZED: Layered Dark Scoria", "block.create.layered_diorite": "UNLOCALIZED: Layered Diorite", @@ -229,14 +190,6 @@ "block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat", "block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle", "block.create.lime_seat": "UNLOCALIZED: Lime Seat", -<<<<<<< HEAD - "block.create.limesand": "ì„�회모래", - "block.create.limestone": "ì„�회암", - "block.create.limestone_bricks": "ì„�회암 ë²½ë�Œ", - "block.create.limestone_bricks_slab": "ì„�회암 ë²½ë�Œ ë°˜ 블ë¡�", - "block.create.limestone_bricks_stairs": "ì„�회암 ë²½ë�Œ 계단", - "block.create.limestone_bricks_wall": "ì„�회암 ë²½ë�Œ 담장", -======= "block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle", "block.create.limesand": "석회모래", "block.create.limestone": "석회암", @@ -244,28 +197,27 @@ "block.create.limestone_bricks_slab": "석회암 벽돌 반 블록", "block.create.limestone_bricks_stairs": "석회암 벽돌 계단", "block.create.limestone_bricks_wall": "석회암 벽돌 담장", ->>>>>>> mc1.15/dev "block.create.limestone_cobblestone": "UNLOCALIZED: Limestone Cobblestone", "block.create.limestone_cobblestone_slab": "UNLOCALIZED: Limestone Cobblestone Slab", "block.create.limestone_cobblestone_stairs": "UNLOCALIZED: Limestone Cobblestone Stairs", "block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall", - "block.create.limestone_pillar": "ì„�회암 기둥", - "block.create.linear_chassis": "ì§�ì„  섀시", + "block.create.limestone_pillar": "석회암 기둥", + "block.create.linear_chassis": "직선 섀시", "block.create.magenta_seat": "UNLOCALIZED: Magenta Seat", "block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle", "block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm", - "block.create.mechanical_bearing": "ë² ì–´ë§�", - "block.create.mechanical_crafter": "기계ì‹� 조합기", - "block.create.mechanical_drill": "드릴", - "block.create.mechanical_harvester": "수확기", - "block.create.mechanical_mixer": "믹서", - "block.create.mechanical_piston": "기계ì‹� 피스톤", - "block.create.mechanical_piston_head": "기계ì‹� 피스톤 머리", + "block.create.mechanical_bearing": "베어링", + "block.create.mechanical_crafter": "기계식 조합기", + "block.create.mechanical_drill": "드릴", + "block.create.mechanical_harvester": "수확기", + "block.create.mechanical_mixer": "믹서", + "block.create.mechanical_piston": "기계식 피스톤", + "block.create.mechanical_piston_head": "기계식 피스톤 머리", "block.create.mechanical_plough": "UNLOCALIZED: Mechanical Plough", - "block.create.mechanical_press": "압착기", + "block.create.mechanical_press": "압착기", "block.create.mechanical_pump": "UNLOCALIZED: Mechanical Pump", - "block.create.mechanical_saw": "톱", - "block.create.millstone": "맷ë�Œ", + "block.create.mechanical_saw": "톱", + "block.create.millstone": "맷돌", "block.create.minecart_anchor": "UNLOCALIZED: Minecart Anchor", "block.create.mossy_andesite": "UNLOCALIZED: Mossy Andesite", "block.create.mossy_dark_scoria": "UNLOCALIZED: Mossy Dark Scoria", @@ -277,9 +229,9 @@ "block.create.mossy_scoria": "UNLOCALIZED: Mossy Scoria", "block.create.mossy_weathered_limestone": "UNLOCALIZED: Mossy Weathered Limestone", "block.create.mysterious_cuckoo_clock": "UNLOCALIZED: Cuckoo Clock", - "block.create.natural_scoria": "ìž�ì—° 스코리아", + "block.create.natural_scoria": "자연 스코리아", "block.create.nixie_tube": "UNLOCALIZED: Nixie Tube", - "block.create.nozzle": "ë…¸ì¦�", + "block.create.nozzle": "노즐", "block.create.oak_window": "UNLOCALIZED: Oak Window", "block.create.oak_window_pane": "UNLOCALIZED: Oak Window Pane", "block.create.orange_seat": "UNLOCALIZED: Orange Seat", @@ -332,65 +284,53 @@ "block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs", "block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall", "block.create.pink_seat": "UNLOCALIZED: Pink Seat", -<<<<<<< HEAD - "block.create.piston_extension_pole": "피스톤 연장 축", - "block.create.polished_dark_scoria": "윤나는 짙ì�€ 스코리아", -======= "block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle", "block.create.piston_extension_pole": "피스톤 연장 축", "block.create.polished_dark_scoria": "윤나는 짙은 스코리아", ->>>>>>> mc1.15/dev "block.create.polished_dark_scoria_slab": "UNLOCALIZED: Polished Dark Scoria Slab", "block.create.polished_dark_scoria_stairs": "UNLOCALIZED: Polished Dark Scoria Stairs", "block.create.polished_dark_scoria_wall": "UNLOCALIZED: Polished Dark Scoria Wall", - "block.create.polished_dolomite": "윤나는 백운암", + "block.create.polished_dolomite": "윤나는 백운암", "block.create.polished_dolomite_slab": "UNLOCALIZED: Polished Dolomite Slab", "block.create.polished_dolomite_stairs": "UNLOCALIZED: Polished Dolomite Stairs", "block.create.polished_dolomite_wall": "UNLOCALIZED: Polished Dolomite Wall", - "block.create.polished_gabbro": "윤나는 반려암", + "block.create.polished_gabbro": "윤나는 반려암", "block.create.polished_gabbro_slab": "UNLOCALIZED: Polished Gabbro Slab", "block.create.polished_gabbro_stairs": "UNLOCALIZED: Polished Gabbro Stairs", "block.create.polished_gabbro_wall": "UNLOCALIZED: Polished Gabbro Wall", - "block.create.polished_limestone": "윤나는 ì„�회암", - "block.create.polished_limestone_slab": "윤나는 ì„�회암 ë°˜ 블ë¡�", + "block.create.polished_limestone": "윤나는 석회암", + "block.create.polished_limestone_slab": "윤나는 석회암 반 블록", "block.create.polished_limestone_stairs": "UNLOCALIZED: Polished Limestone Stairs", "block.create.polished_limestone_wall": "UNLOCALIZED: Polished Limestone Wall", - "block.create.polished_scoria": "윤나는 스코리아", - "block.create.polished_scoria_slab": "윤나는 스코리아 ë°˜ 블ë¡�", + "block.create.polished_scoria": "윤나는 스코리아", + "block.create.polished_scoria_slab": "윤나는 스코리아 반 블록", "block.create.polished_scoria_stairs": "UNLOCALIZED: Polished Scoria Stairs", "block.create.polished_scoria_wall": "UNLOCALIZED: Polished Scoria Wall", - "block.create.polished_weathered_limestone": "윤나는 í’�í™”ë�œ ì„�회암", - "block.create.polished_weathered_limestone_slab": "윤나는 í’�í™”ë�œ ì„�회암 ë°˜ 블ë¡�", + "block.create.polished_weathered_limestone": "윤나는 풍화된 석회암", + "block.create.polished_weathered_limestone_slab": "윤나는 풍화된 석회암 반 블록", "block.create.polished_weathered_limestone_stairs": "UNLOCALIZED: Polished Weathered Limestone Stairs", "block.create.polished_weathered_limestone_wall": "UNLOCALIZED: Polished Weathered Limestone Wall", - "block.create.portable_storage_interface": "ì�´ë�™ì‹� 저장소 ì�¸í„°íŽ˜ì�´ìŠ¤", - "block.create.powered_latch": "레드스톤 걸쇠", - "block.create.powered_toggle_latch": "레드스톤 토글 걸쇠", - "block.create.pulley_magnet": "ë�„르래 ìž�ì„�", - "block.create.pulse_repeater": "펄스 리피터", + "block.create.portable_storage_interface": "이동식 저장소 인터페이스", + "block.create.powered_latch": "레드스톤 걸쇠", + "block.create.powered_toggle_latch": "레드스톤 토글 걸쇠", + "block.create.pulley_magnet": "도르래 자석", + "block.create.pulse_repeater": "펄스 리피터", "block.create.purple_seat": "UNLOCALIZED: Purple Seat", -<<<<<<< HEAD - "block.create.radial_chassis": "ì›�형 섀시", - "block.create.red_seat": "UNLOCALIZED: Red Seat", - "block.create.redstone_contact": "ë�™í˜• ê°�지기", - "block.create.redstone_link": "레드스톤 ë§�í�¬", -======= "block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle", "block.create.radial_chassis": "원형 섀시", "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle", "block.create.redstone_contact": "동형 감지기", "block.create.redstone_link": "레드스톤 링크", ->>>>>>> mc1.15/dev "block.create.refined_radiance_casing": "UNLOCALIZED: Radiant Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", - "block.create.rope": "밧줄", - "block.create.rope_pulley": "밧줄 ë�„르래", - "block.create.rotation_speed_controller": "회전 ì†�ë�„ 컨트롤러", - "block.create.schematic_table": "청사진 í…Œì�´ë¸”", - "block.create.schematicannon": "청사진 대í�¬", - "block.create.scoria": "스코리아", - "block.create.scoria_bricks": "스코리아 ë²½ë�Œ", + "block.create.rope": "밧줄", + "block.create.rope_pulley": "밧줄 도르래", + "block.create.rotation_speed_controller": "회전 속도 컨트롤러", + "block.create.schematic_table": "청사진 테이블", + "block.create.schematicannon": "청사진 대포", + "block.create.scoria": "스코리아", + "block.create.scoria_bricks": "스코리아 벽돌", "block.create.scoria_bricks_slab": "UNLOCALIZED: Scoria Bricks Slab", "block.create.scoria_bricks_stairs": "UNLOCALIZED: Scoria Bricks Stairs", "block.create.scoria_bricks_wall": "UNLOCALIZED: Scoria Bricks Wall", @@ -398,105 +338,100 @@ "block.create.scoria_cobblestone_slab": "UNLOCALIZED: Scoria Cobblestone Slab", "block.create.scoria_cobblestone_stairs": "UNLOCALIZED: Scoria Cobblestone Stairs", "block.create.scoria_cobblestone_wall": "UNLOCALIZED: Scoria Cobblestone Wall", - "block.create.scoria_pillar": "스코리아 기둥", + "block.create.scoria_pillar": "스코리아 기둥", "block.create.secondary_linear_chassis": "UNLOCALIZED: Secondary Linear Chassis", - "block.create.sequenced_gearshift": "순서 기어쉬프트", + "block.create.sequenced_gearshift": "순서 기어쉬프트", "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Casing", - "block.create.shaft": "축", - "block.create.speedometer": "ì†�ë�„ 계측기", + "block.create.shaft": "축", + "block.create.speedometer": "속도 계측기", "block.create.spout": "UNLOCALIZED: Spout", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", "block.create.spruce_window_pane": "UNLOCALIZED: Spruce Window Pane", - "block.create.sticky_mechanical_piston": "ë�ˆë�ˆì�´ 기계ì‹� 피스톤", - "block.create.stockpile_switch": "수량 스위치", - "block.create.stressometer": "피로ë�„ 계측기", - "block.create.tiled_glass": "타ì�¼ 유리", - "block.create.tiled_glass_pane": "타ì�¼ 유리íŒ�", - "block.create.turntable": "ë�Œë¦¼íŒ�", - "block.create.vertical_framed_glass": "수ì§� 유리", - "block.create.vertical_framed_glass_pane": "수ì§� 유리íŒ�", - "block.create.water_wheel": "물레방아", - "block.create.weathered_limestone": "í’�í™”ë�œ ì„�회암", - "block.create.weathered_limestone_bricks": "í’�í™”ë�œ ì„�회암 ë²½ë�Œ", - "block.create.weathered_limestone_bricks_slab": "í’�í™”ë�œ ì„�회암 ë²½ë�Œ ë°˜ 블ë¡�", - "block.create.weathered_limestone_bricks_stairs": "í’�í™”ë�œ ì„�회암 ë²½ë�Œ 계단", - "block.create.weathered_limestone_bricks_wall": "í’�í™”ë�œ ì„�회암 ë²½ë�Œ 담장", + "block.create.sticky_mechanical_piston": "끈끈이 기계식 피스톤", + "block.create.stockpile_switch": "수량 스위치", + "block.create.stressometer": "피로도 계측기", + "block.create.tiled_glass": "타일 유리", + "block.create.tiled_glass_pane": "타일 유리판", + "block.create.turntable": "돌림판", + "block.create.vertical_framed_glass": "수직 유리", + "block.create.vertical_framed_glass_pane": "수직 유리판", + "block.create.water_wheel": "물레방아", + "block.create.weathered_limestone": "풍화된 석회암", + "block.create.weathered_limestone_bricks": "풍화된 석회암 벽돌", + "block.create.weathered_limestone_bricks_slab": "풍화된 석회암 벽돌 반 블록", + "block.create.weathered_limestone_bricks_stairs": "풍화된 석회암 벽돌 계단", + "block.create.weathered_limestone_bricks_wall": "풍화된 석회암 벽돌 담장", "block.create.weathered_limestone_cobblestone": "UNLOCALIZED: Weathered Limestone Cobblestone", "block.create.weathered_limestone_cobblestone_slab": "UNLOCALIZED: Weathered Limestone Cobblestone Slab", "block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs", "block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall", - "block.create.weathered_limestone_pillar": "í’�í™”ë�œ ì„�회암 기둥", + "block.create.weathered_limestone_pillar": "풍화된 석회암 기둥", "block.create.white_seat": "UNLOCALIZED: White Seat", "block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle", "block.create.yellow_seat": "UNLOCALIZED: Yellow Seat", -<<<<<<< HEAD - "block.create.zinc_block": "ì•„ì—° 블럭", - "block.create.zinc_ore": "ì•„ì—° ê´‘ì„�", -======= "block.create.yellow_valve_handle": "UNLOCALIZED: Yellow Valve Handle", "block.create.zinc_block": "아연 블럭", "block.create.zinc_ore": "아연 광석", ->>>>>>> mc1.15/dev "entity.create.contraption": "UNLOCALIZED: Contraption", "entity.create.seat": "UNLOCALIZED: Seat", "entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption", "entity.create.super_glue": "UNLOCALIZED: Super Glue", - "item.create.andesite_alloy": "안산암 합금", - "item.create.attribute_filter": "ì†�성 í•„í„° í‹€", - "item.create.belt_connector": "기계ì‹� 벨트", - "item.create.brass_hand": "황ë�™ ì†�", - "item.create.brass_ingot": "황ë�™ 주괴", - "item.create.brass_nugget": "황ë�™ ì¡°ê°�", - "item.create.brass_sheet": "황ë�™ íŒ�", - "item.create.chromatic_compound": "색채 혼합물", - "item.create.copper_ingot": "구리 주괴", - "item.create.copper_nugget": "구리 ì¡°ê°�", - "item.create.copper_sheet": "구리 íŒ�", - "item.create.crafter_slot_cover": "작업대 슬롯 ë�®ê°œ", - "item.create.crushed_brass": "분쇄ë�œ 황ë�™", + "item.create.andesite_alloy": "안산암 합금", + "item.create.attribute_filter": "속성 필터 틀", + "item.create.belt_connector": "기계식 벨트", + "item.create.brass_hand": "황동 손", + "item.create.brass_ingot": "황동 주괴", + "item.create.brass_nugget": "황동 조각", + "item.create.brass_sheet": "황동 판", + "item.create.chromatic_compound": "색채 혼합물", + "item.create.copper_ingot": "구리 주괴", + "item.create.copper_nugget": "구리 조각", + "item.create.copper_sheet": "구리 판", + "item.create.crafter_slot_cover": "작업대 슬롯 덮개", + "item.create.crushed_brass": "분쇄된 황동", "item.create.crushed_copper_ore": "UNLOCALIZED: Crushed Copper Ore", "item.create.crushed_gold_ore": "UNLOCALIZED: Crushed Gold Ore", "item.create.crushed_iron_ore": "UNLOCALIZED: Crushed Iron Ore", "item.create.crushed_zinc_ore": "UNLOCALIZED: Crushed Zinc Ore", - "item.create.deforester": "산림파괴ìž�", - "item.create.dough": "반죽", - "item.create.electron_tube": "전지 튜브", + "item.create.deforester": "산림파괴자", + "item.create.dough": "반죽", + "item.create.electron_tube": "전지 튜브", "item.create.empty_blaze_burner": "UNLOCALIZED: Empty Blaze Burner", - "item.create.empty_schematic": "빈 청사진", + "item.create.empty_schematic": "빈 청사진", "item.create.extendo_grip": "UNLOCALIZED: Extendo Grip", - "item.create.filter": "í•„í„° í‹€", + "item.create.filter": "필터 틀", "item.create.fuel_pellet": "UNLOCALIZED: Fuel Pellet", "item.create.furnace_minecart_contraption": "UNLOCALIZED: Furnace Minecart Contraption", - "item.create.goggles": "엔지니어ì�˜ 고글", + "item.create.goggles": "엔지니어의 고글", "item.create.golden_sheet": "UNLOCALIZED: Golden Sheet", - "item.create.handheld_blockzapper": "휴대용 블럭발사기", - "item.create.handheld_worldshaper": "휴대용 세계편집기", - "item.create.integrated_circuit": "집ì � 회로", - "item.create.iron_sheet": "ì²  íŒ�", + "item.create.handheld_blockzapper": "휴대용 블럭발사기", + "item.create.handheld_worldshaper": "휴대용 세계편집기", + "item.create.integrated_circuit": "집적 회로", + "item.create.iron_sheet": "철 판", "item.create.lapis_sheet": "UNLOCALIZED: Lapis Sheet", "item.create.minecart_contraption": "UNLOCALIZED: Minecart Contraption", "item.create.minecart_coupling": "UNLOCALIZED: Minecart Coupling", - "item.create.polished_rose_quartz": "윤나는 장밋빛 ì„�ì˜�", + "item.create.polished_rose_quartz": "윤나는 장밋빛 석영", "item.create.powdered_obsidian": "UNLOCALIZED: Powdered Obsidian", - "item.create.propeller": "프로펠러", - "item.create.red_sand_paper": "붉ì�€ 사í�¬", - "item.create.refined_radiance": "ì •ì œë�œ 광채", - "item.create.rose_quartz": "장밋빛 ì„�ì˜�", - "item.create.sand_paper": "사í�¬", - "item.create.schematic": "청사진", - "item.create.schematic_and_quill": "청사진과 깃펜", - "item.create.shadow_steel": "그림ìž� ê°•ì² ", + "item.create.propeller": "프로펠러", + "item.create.red_sand_paper": "붉은 사포", + "item.create.refined_radiance": "정제된 광채", + "item.create.rose_quartz": "장밋빛 석영", + "item.create.sand_paper": "사포", + "item.create.schematic": "청사진", + "item.create.schematic_and_quill": "청사진과 깃펜", + "item.create.shadow_steel": "그림자 강철", "item.create.super_glue": "UNLOCALIZED: Super Glue", - "item.create.tree_fertilizer": "나무 비료", + "item.create.tree_fertilizer": "나무 비료", "item.create.vertical_gearbox": "UNLOCALIZED: Vertical Gearbox", - "item.create.wand_of_symmetry": "대칭ì�˜ 지팡ì�´", + "item.create.wand_of_symmetry": "대칭의 지팡이", "item.create.wheat_flour": "UNLOCALIZED: Wheat Flour", - "item.create.whisk": "혼합기", - "item.create.wrench": "렌치", - "item.create.zinc_ingot": "ì•„ì—° 주괴", - "item.create.zinc_nugget": "ì•„ì—° ì¡°ê°�", + "item.create.whisk": "혼합기", + "item.create.wrench": "렌치", + "item.create.zinc_ingot": "아연 주괴", + "item.create.zinc_nugget": "아연 조각", "_": "->------------------------] Advancements [------------------------<-", @@ -592,213 +527,140 @@ "itemGroup.create.base": "UNLOCALIZED: Create", "itemGroup.create.palettes": "UNLOCALIZED: Create Palettes", - "death.attack.create.crush": "%1$sì�´(ê°€) 분쇄 휠ì—� ì�˜í•´ 가공ë�˜ì—ˆìŠµë‹ˆë‹¤", - "death.attack.create.fan_fire": "%1$sì�´(ê°€) 뜨거운 바람으로 타버렸습니다", - "death.attack.create.fan_lava": "%1$sì�´(ê°€) ìš©ì•” 바람으로 타버렸습니다", - "death.attack.create.mechanical_drill": "%1$sì�´(ê°€) 드릴ì—� 관통당했습니다", - "death.attack.create.mechanical_saw": "%1$sì�´(ê°€) 톱날ì—� 반으로 ê°ˆë�¼ì ¸ 죽었습니다", - "death.attack.create.cuckoo_clock_explosion": "%1$sì�´(ê°€) ì¡°ìž‘ë�œ ë»�꾸기 시계ì—� ì�˜í•´ í�­íŒŒë‹¹í–ˆìŠµë‹ˆë‹¤", + "death.attack.create.crush": "%1$s이(가) 분쇄 휠에 의해 가공되었습니다", + "death.attack.create.fan_fire": "%1$s이(가) 뜨거운 바람으로 타버렸습니다", + "death.attack.create.fan_lava": "%1$s이(가) 용암 바람으로 타버렸습니다", + "death.attack.create.mechanical_drill": "%1$s이(가) 드릴에 관통당했습니다", + "death.attack.create.mechanical_saw": "%1$s이(가) 톱날에 반으로 갈라져 죽었습니다", + "death.attack.create.cuckoo_clock_explosion": "%1$s이(가) 조작된 뻐꾸기 시계에 의해 폭파당했습니다", - "create.block.deployer.damage_source_name": "순수한 ë°°í�¬ê¸°", + "create.block.deployer.damage_source_name": "순수한 배포기", "create.block.cart_assembler.invalid": "UNLOCALIZED: Place your Cart Assembler on a rail block", - "create.recipe.crushing": "분쇄", - "create.recipe.milling": "맷ë�Œì§ˆ", - "create.recipe.splashing": "세척", - "create.recipe.splashing.fan": "물과 환í’�기", + "create.recipe.crushing": "분쇄", + "create.recipe.milling": "맷돌질", + "create.recipe.splashing": "세척", + "create.recipe.splashing.fan": "물과 환풍기", "create.recipe.smoking_via_fan": "UNLOCALIZED: Bulk Smoking", "create.recipe.smoking_via_fan.fan": "UNLOCALIZED: Fan behind Fire", "create.recipe.blasting_via_fan": "UNLOCALIZED: Bulk Smelting", "create.recipe.blasting_via_fan.fan": "UNLOCALIZED: Fan behind Lava", - "create.recipe.pressing": "ì••ì°©", - "create.recipe.mixing": "혼합", - "create.recipe.packing": "압축", - "create.recipe.mechanical_sawing": "제재", - "create.recipe.mechanical_crafting": "기계 ì¡°í•©", - "create.recipe.block_cutting": "블럭 절단", + "create.recipe.pressing": "압착", + "create.recipe.mixing": "혼합", + "create.recipe.packing": "압축", + "create.recipe.mechanical_sawing": "제재", + "create.recipe.mechanical_crafting": "기계 조합", + "create.recipe.block_cutting": "블럭 절단", "create.recipe.blockzapper_upgrade": "UNLOCALIZED: Handheld Blockzapper", - "create.recipe.sandpaper_polishing": "사í�¬ 연마", + "create.recipe.sandpaper_polishing": "사포 연마", "create.recipe.mystery_conversion": "?", - "create.recipe.processing.catalyst": "촉매", - "create.recipe.processing.chance": "%1$s%% 확률", - "create.recipe.processing.chanceToReturn": "%1$s%% 확률로 반환", + "create.recipe.processing.catalyst": "촉매", + "create.recipe.processing.chance": "%1$s%% 확률", + "create.recipe.processing.chanceToReturn": "%1$s%% 확률로 반환", - "create.generic.range": "범위", - "create.generic.radius": "반지름", - "create.generic.width": "í�­", - "create.generic.height": "높ì�´", - "create.generic.length": "길ì�´", - "create.generic.speed": "ì†�ë�„", - "create.generic.delay": "딜레ì�´", - "create.generic.unit.ticks": "틱", - "create.generic.unit.seconds": "ì´ˆ", - "create.generic.unit.minutes": "분", + "create.generic.range": "범위", + "create.generic.radius": "반지름", + "create.generic.width": "폭", + "create.generic.height": "높이", + "create.generic.length": "길이", + "create.generic.speed": "속도", + "create.generic.delay": "딜레이", + "create.generic.unit.ticks": "틱", + "create.generic.unit.seconds": "초", + "create.generic.unit.minutes": "분", "create.generic.unit.rpm": "RPM", "create.generic.unit.stress": "su", - "create.generic.unit.degrees": "°", + "create.generic.unit.degrees": "°", - "create.action.scroll": "스í�¬ë¡¤í•˜ì„¸ìš”", - "create.action.confirm": "확ì�¸", - "create.action.abort": "중단", - "create.action.saveToFile": "저장", - "create.action.discard": "ì‚­ì œ", + "create.action.scroll": "스크롤하세요", + "create.action.confirm": "확인", + "create.action.abort": "중단", + "create.action.saveToFile": "저장", + "create.action.discard": "삭제", - "create.keyinfo.toolmenu": "메뉴 세부정보 보기", + "create.keyinfo.toolmenu": "메뉴 세부정보 보기", "create.keyinfo.scrollup": "Simulate Mousewheel Up (inworld)", "create.keyinfo.scrolldown": "Simulate Mousewheel Down (inworld)", - "create.gui.scrollInput.defaultTitle": "옵션ì�„ ì„ íƒ�하세요:", - "create.gui.scrollInput.scrollToModify": "스í�¬ë¡¤ë¡œ 수정하기", - "create.gui.scrollInput.scrollToAdjustAmount": "스í�¬ë¡¤ë¡œ 수량 조절하기", - "create.gui.scrollInput.scrollToSelect": "스í�¬ë¡¤ë¡œ ì„ íƒ�", - "create.gui.scrollInput.shiftScrollsFaster": "쉬프트-스í�¬ë¡¤ë¡œ 빨리 수정하기", - "create.gui.toolmenu.focusKey": "[%1$s]를 눌러 세부정보 보기", - "create.gui.toolmenu.cycle": "스í�¬ë¡¤ë¡œ 순환", - "create.gui.symmetryWand.mirrorType": "반사", - "create.gui.symmetryWand.orientation": "방위", + "create.gui.scrollInput.defaultTitle": "옵션을 선택하세요:", + "create.gui.scrollInput.scrollToModify": "스크롤로 수정하기", + "create.gui.scrollInput.scrollToAdjustAmount": "스크롤로 수량 조절하기", + "create.gui.scrollInput.scrollToSelect": "스크롤로 선택", + "create.gui.scrollInput.shiftScrollsFaster": "쉬프트-스크롤로 빨리 수정하기", + "create.gui.toolmenu.focusKey": "[%1$s]를 눌러 세부정보 보기", + "create.gui.toolmenu.cycle": "스크롤로 순환", + "create.gui.symmetryWand.mirrorType": "반사", + "create.gui.symmetryWand.orientation": "방위", - "create.symmetry.mirror.plane": "거울 모드", - "create.symmetry.mirror.doublePlane": "사ê°�형 모드", - "create.symmetry.mirror.triplePlane": "팔ê°�형 모드", + "create.symmetry.mirror.plane": "거울 모드", + "create.symmetry.mirror.doublePlane": "사각형 모드", + "create.symmetry.mirror.triplePlane": "팔각형 모드", - "create.orientation.orthogonal": "수ì§�으로", - "create.orientation.diagonal": "대ê°�선으로", - "create.orientation.horizontal": "수í�‰ìœ¼ë¡œ", - "create.orientation.alongZ": "Z좌표를 ë”°ë�¼", - "create.orientation.alongX": "X좌표를 ë”°ë�¼", + "create.orientation.orthogonal": "수직으로", + "create.orientation.diagonal": "대각선으로", + "create.orientation.horizontal": "수평으로", + "create.orientation.alongZ": "Z좌표를 따라", + "create.orientation.alongX": "X좌표를 따라", - "create.gui.blockzapper.title": "휴대용 블럭발사기", - "create.gui.blockzapper.replaceMode": "대체 모드", - "create.gui.blockzapper.searchDiagonal": "대ê°�ì„ ì�„ ë”°ë�¼", - "create.gui.blockzapper.searchFuzzy": "물질 경계 무시", - "create.gui.blockzapper.range": "범위", - "create.gui.blockzapper.needsUpgradedAmplifier": "업그레ì�´ë“œê°€ 필요합니다", - "create.gui.blockzapper.patternSection": "패턴 설정", - "create.gui.blockzapper.pattern.solid": "ì›�형", - "create.gui.blockzapper.pattern.checkered": "체스íŒ�", - "create.gui.blockzapper.pattern.inversecheckered": "반전ë�œ 체스íŒ�", - "create.gui.blockzapper.pattern.chance25": "램ë�¤ìœ¼ë¡œ 25% 채우기", - "create.gui.blockzapper.pattern.chance50": "램ë�¤ìœ¼ë¡œ 50% 채우기", - "create.gui.blockzapper.pattern.chance75": "ëžœë�¤ìœ¼ë¡œ 75% 채우기", - "create.gui.terrainzapper.title": "휴대용 세계편집기", - "create.gui.terrainzapper.placement": "설치방ì‹�", - "create.gui.terrainzapper.placement.merged": "ì„ íƒ�í•œ 블럭ì—�", - "create.gui.terrainzapper.placement.attached": "ì„ íƒ�í•œ 블럭 옆ì—�", - "create.gui.terrainzapper.placement.inserted": "ì„ íƒ�í•œ 블럭 안ì—�", - "create.gui.terrainzapper.brush": "브러쉬", - "create.gui.terrainzapper.brush.cuboid": "정육면체", - "create.gui.terrainzapper.brush.sphere": "구", - "create.gui.terrainzapper.brush.cylinder": "ì›�통", - "create.gui.terrainzapper.tool": "ë�„구", - "create.gui.terrainzapper.tool.fill": "채우기", - "create.gui.terrainzapper.tool.place": "설치", - "create.gui.terrainzapper.tool.replace": "대체", - "create.gui.terrainzapper.tool.clear": "지우기", - "create.gui.terrainzapper.tool.overlay": "ë�®ì–´ì”Œìš°ê¸°", - "create.gui.terrainzapper.tool.flatten": "í�‰íƒ„í™”", + "create.gui.blockzapper.title": "휴대용 블럭발사기", + "create.gui.blockzapper.replaceMode": "대체 모드", + "create.gui.blockzapper.searchDiagonal": "대각선을 따라", + "create.gui.blockzapper.searchFuzzy": "물질 경계 무시", + "create.gui.blockzapper.range": "범위", + "create.gui.blockzapper.needsUpgradedAmplifier": "업그레이드가 필요합니다", + "create.gui.blockzapper.patternSection": "패턴 설정", + "create.gui.blockzapper.pattern.solid": "원형", + "create.gui.blockzapper.pattern.checkered": "체스판", + "create.gui.blockzapper.pattern.inversecheckered": "반전된 체스판", + "create.gui.blockzapper.pattern.chance25": "램덤으로 25% 채우기", + "create.gui.blockzapper.pattern.chance50": "램덤으로 50% 채우기", + "create.gui.blockzapper.pattern.chance75": "랜덤으로 75% 채우기", + "create.gui.terrainzapper.title": "휴대용 세계편집기", + "create.gui.terrainzapper.placement": "설치방식", + "create.gui.terrainzapper.placement.merged": "선택한 블럭에", + "create.gui.terrainzapper.placement.attached": "선택한 블럭 옆에", + "create.gui.terrainzapper.placement.inserted": "선택한 블럭 안에", + "create.gui.terrainzapper.brush": "브러쉬", + "create.gui.terrainzapper.brush.cuboid": "정육면체", + "create.gui.terrainzapper.brush.sphere": "구", + "create.gui.terrainzapper.brush.cylinder": "원통", + "create.gui.terrainzapper.tool": "도구", + "create.gui.terrainzapper.tool.fill": "채우기", + "create.gui.terrainzapper.tool.place": "설치", + "create.gui.terrainzapper.tool.replace": "대체", + "create.gui.terrainzapper.tool.clear": "지우기", + "create.gui.terrainzapper.tool.overlay": "덮어씌우기", + "create.gui.terrainzapper.tool.flatten": "평탄화", - "create.terrainzapper.shiftRightClickToSet": "쉬프트-ìš°í�´ë¦­ìœ¼ë¡œ 모양 설정하기", + "create.terrainzapper.shiftRightClickToSet": "쉬프트-우클릭으로 모양 설정하기", - "create.blockzapper.usingBlock": "현재 블럭: %1$s", - "create.blockzapper.componentUpgrades": "부품 업그레ì�´ë“œ:", - "create.blockzapper.component.body": "몸통", - "create.blockzapper.component.amplifier": "ì¦�í�­ê¸°", - "create.blockzapper.component.accelerator": "ê°€ì†�기", - "create.blockzapper.component.retriever": "회수기", - "create.blockzapper.component.scope": "스코프", - "create.blockzapper.componentTier.none": "ì—†ì�Œ", - "create.blockzapper.componentTier.brass": "황ë�™", - "create.blockzapper.componentTier.chromatic": "혼ë�ˆì�˜ ê²°ì •ì²´", - "create.blockzapper.leftClickToSet": "좌í�´ë¦­ìœ¼ë¡œ 블럭 설정하기", - "create.blockzapper.empty": "블럭ì�´ 없습니다!", + "create.blockzapper.usingBlock": "현재 블럭: %1$s", + "create.blockzapper.componentUpgrades": "부품 업그레이드:", + "create.blockzapper.component.body": "몸통", + "create.blockzapper.component.amplifier": "증폭기", + "create.blockzapper.component.accelerator": "가속기", + "create.blockzapper.component.retriever": "회수기", + "create.blockzapper.component.scope": "스코프", + "create.blockzapper.componentTier.none": "없음", + "create.blockzapper.componentTier.brass": "황동", + "create.blockzapper.componentTier.chromatic": "혼돈의 결정체", + "create.blockzapper.leftClickToSet": "좌클릭으로 블럭 설정하기", + "create.blockzapper.empty": "블럭이 없습니다!", - "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.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": "UNLOCALIZED: Cart Movement Mode", "create.contraptions.cart_movement_mode.rotate": "UNLOCALIZED: Always face toward motion", "create.contraptions.cart_movement_mode.rotate_paused": "UNLOCALIZED: Pause actors while rotating", "create.contraptions.cart_movement_mode.rotation_locked": "UNLOCALIZED: Lock rotation", - "create.logistics.filter": "í•„í„°", + "create.logistics.filter": "필터", "create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter", -<<<<<<< HEAD - "create.logistics.firstFrequency": "주파수. #1", - "create.logistics.secondFrequency": "주파수. #2", - - "create.gui.goggles.generator_stats": "발전 ìƒ�태:", - "create.gui.goggles.kinetic_stats": "ê°€ë�™ ìƒ�태:", - "create.gui.goggles.at_current_speed": "현재 ì†�ë�„", - "create.gui.goggles.base_value": "기본 수치", - "create.gui.gauge.info_header": "게ì�´ì§€ ì •ë³´:", - "create.gui.speedometer.title": "회전 ì†�ë�„", - "create.gui.stressometer.title": "네트워í�¬ 부하", - "create.gui.stressometer.capacity": "용량", - "create.gui.stressometer.overstressed": "과부하ë�¨", - "create.gui.stressometer.no_rotation": "회전없ì�Œ", - "create.gui.contraptions.not_fast_enough": "ì�´ %1$sì�€(는) ìž‘ë�™í•˜ê¸°ì—� _회전 ì†�ë�„_ê°€ _부족합니다_", - "create.gui.contraptions.network_overstressed": "ì�´ 장치는 _과부하_ë�˜ì—ˆìŠµë‹ˆë‹¤. _높ì�€ 피로ë�„_ 용량ì�„ 가진 발전기를 추가로 설치하거나 장치 _ì†�ë�„_를 _늦추세요_.", - "create.gui.adjustable_crate.title": "가변 창고 ", - "create.gui.adjustable_crate.storageSpace": "저장 공간", - "create.gui.stockpile_switch.title": "수량 스위치", - "create.gui.stockpile_switch.lowerLimit": "최소 신호 유지수량", - "create.gui.stockpile_switch.upperLimit": "최초 신호 ë°œë�™ìˆ˜ëŸ‰", - "create.gui.stockpile_switch.startAt": "다ì�Œ 수량ì—� 신호 주기", - "create.gui.stockpile_switch.startAbove": "다ì�Œ 수량ì�´ìƒ�ì�¼ë–„ 신호 주기", - "create.gui.stockpile_switch.stopAt": "다ì�Œ 수량ì—� 신호 멈추기", - "create.gui.stockpile_switch.stopBelow": "다ì�Œ 수량ì�´í•˜ì�¼ë•Œ 신호 멈추기", - "create.gui.sequenced_gearshift.title": "순서 기어쉬프트", - "create.gui.sequenced_gearshift.instruction": "설명", - "create.gui.sequenced_gearshift.instruction.turn_angle": "회전", - "create.gui.sequenced_gearshift.instruction.turn_angle.angle": "ê°�ë�„", - "create.gui.sequenced_gearshift.instruction.turn_distance": "피스톤", - "create.gui.sequenced_gearshift.instruction.turn_distance.distance": "거리", - "create.gui.sequenced_gearshift.instruction.wait": "정지", - "create.gui.sequenced_gearshift.instruction.wait.duration": "지ì†�시간", - "create.gui.sequenced_gearshift.instruction.end": "마침", - "create.gui.sequenced_gearshift.speed": "ì†�ë�„, ë°©í–¥", - "create.gui.sequenced_gearshift.speed.forward": "ìž…ë ¥ë�œ ì†�ë�„, 그대로 회전", - "create.gui.sequenced_gearshift.speed.forward_fast": "ìž…ë ¥ë�œ ì†�ë�„ì�˜ 2ë°°, 그대로 회전", - "create.gui.sequenced_gearshift.speed.back": "ìž…ë ¥ë�œ ì†�ë�„, 반대로 회전", - "create.gui.sequenced_gearshift.speed.back_fast": "ìž…ë ¥ë�œ ì†�ë�„ì�˜ 2ë°°, 반대로 회전", - - "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.saved": "%1$së¡œ 저장ë�¨", - - "create.schematic.invalid": "[!] 없는 ì•„ì�´í…œ - 청사진 í…Œì�´ë¸”ì�„ ì�´ìš©í•˜ì„¸ìš”", - "create.schematic.position": "위치", - "create.schematic.rotation": "회전", - "create.schematic.rotation.none": "ì—†ì�Œ", - "create.schematic.rotation.cw90": "90ë�„ 시계방향 회전", - "create.schematic.rotation.cw180": "180ë�„ 시계방향 회전", - "create.schematic.rotation.cw270": "270ë�„ 시계방향 회전", - "create.schematic.mirror": "거울", - "create.schematic.mirror.none": "ì—†ì�Œ", - "create.schematic.mirror.frontBack": "ì „-후", - "create.schematic.mirror.leftRight": "좌-ìš°", - "create.schematic.tool.deploy": "ì „ê°œ", - "create.schematic.tool.move": "X/Z좌표 ì�´ë�™", - "create.schematic.tool.movey": "Y좌표 ì�´ë�™", - "create.schematic.tool.rotate": "회전", - "create.schematic.tool.print": "설치", - "create.schematic.tool.flip": "뒤집기", - "create.schematic.tool.deploy.description.0": "구조물ì�„ 해당 위치로 고정합니다.", - "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.logistics.firstFrequency": "주파수. #1", "create.logistics.secondFrequency": "주파수. #2", @@ -868,113 +730,25 @@ "create.schematic.tool.deploy.description.3": "[Ctrl]-스크롤로 거리를 조정합니다.", "create.schematic.tool.move.description.0": "청사진을 수평 이동시킵니다.", "create.schematic.tool.move.description.1": "청사진을 보고 [CTRL]-스크롤로 밉니다.", ->>>>>>> mc1.15/dev "create.schematic.tool.move.description.2": "", "create.schematic.tool.move.description.3": "", - "create.schematic.tool.movey.description.0": "청사진ì�„ 수ì§� ì�´ë�™ì‹œí‚µë‹ˆë‹¤.", - "create.schematic.tool.movey.description.1": "청사진ì�„ ë³´ê³  [CTRL]-스í�¬ë¡¤ë¡œ 밉니다.", + "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.1": "[CTRL]-스í�¬ë¡¤ë¡œ 90ë�„ ë�Œë¦½ë‹ˆë‹¤.", + "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": "", - "create.schematic.tool.print.description.0": "구조물ì�„ 즉시 설치합니다.", - "create.schematic.tool.print.description.1": "[ìš°í�´ë¦­]으로 현재 지ì �ì—� 설치를 허가합니다.", - "create.schematic.tool.print.description.2": "ì�´ ë�„구는 í�¬ë¦¬ì—�ì�´í‹°ë¸Œ 모드 전용입니다.", + "create.schematic.tool.print.description.0": "구조물을 즉시 설치합니다.", + "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": "", -<<<<<<< HEAD - "create.schematics.synchronizing": "ë�™ê¸°í™” 중...", - "create.schematics.uploadTooLarge": "청사진ì�´ 너무 í�½ë‹ˆë‹¤!.", - "create.schematics.maxAllowedSize": "최대 청사진 파ì�¼ í�¬ê¸°ëŠ”:", - - "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.settingsTitle": "설치 설정", - "create.gui.schematicannon.listPrinter": "재료 목ë¡� 프린터", - "create.gui.schematicannon.gunpowderLevel": "화약 용량 %1$s%%", - "create.gui.schematicannon.shotsRemaining": "남ì�€ ë°œí�¬ 수 : %1$s", - "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.skipMissing": "부족한 블럭ì�„ 무시하고 진행", - "create.gui.schematicannon.option.skipTileEntities": "타ì�¼ 엔티티를 보호", - "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.replaceWithEmpty.description": "대í�¬ê°€ 작업구역ì�˜ 블럭들ì�„ 제거하고 공기로 채ì›�니다.", - - "create.schematicannon.status.idle": "휴ì‹�", - "create.schematicannon.status.ready": "준비ë�¨", - "create.schematicannon.status.running": "ê°€ë�™ 중", - "create.schematicannon.status.finished": "완료", - "create.schematicannon.status.paused": "멈춤", - "create.schematicannon.status.stopped": "중단ë�¨", - "create.schematicannon.status.noGunpowder": "화약ì�´ 부족함", - "create.schematicannon.status.targetNotLoaded": "블럭ì�´ 준비ë�˜ì§€ ì•Šì�Œ", - "create.schematicannon.status.targetOutsideRange": "목표가 너무 멀리 떨어져 있습니다.", - "create.schematicannon.status.searching": "검색 중", - "create.schematicannon.status.skipping": "건너뛰는 중", - "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.filter.blacklist": "블랙리스트", - "create.gui.filter.blacklist.description": "위 목ë¡�ì—� 맞지않는 ì•„ì�´í…œì�´ë©´ 통과합니다. 빈 블랙리스트는 모ë‘� 통과시킵니다.", - "create.gui.filter.whitelist": "í™”ì�´íŠ¸ë¦¬ìŠ¤íŠ¸", - "create.gui.filter.whitelist.description": "위 목ë¡�ì—� 맞는 ì•„ì�´í…œì�´ë©´ 통과합니다. 빈 í™”ì�´íŠ¸ë¦¬ìŠ¤íŠ¸ëŠ” 모ë‘� 통과시키지 않습니다.", - "create.gui.filter.respect_data": "ìƒ�세정보 ì�¼ì¹˜", - "create.gui.filter.respect_data.description": "위 목ë¡� ì•„ì�´í…œì�˜ 내구ë�„, 마법부여, 그리고 다른 NBT와 ì�¼ì¹˜í•  ë•Œ 통과시킵니다.", - "create.gui.filter.ignore_data": "ìƒ�세정보 무시", - "create.gui.filter.ignore_data.description": "ìƒ�세정보와 ìƒ�관없ì�´ ì•„ì�´í…œ 종류만 ì�¼ì¹˜í•œë‹¤ë©´ 통과시킵니다.", - - "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": "심ê°�하게 내구ë�„ê°€ ë‹®", - "create.item_attributes.not_stackable": "ê²¹ì³�질 수 ì—†ì�Œ", - "create.item_attributes.equipable": "장착할 수 있ì�Œ", - "create.item_attributes.furnace_fuel": "화로 연료로 쓸 수 있ì�Œ", - "create.item_attributes.in_tag": "%1$së¡œ 등ë¡�ë�¨", - "create.item_attributes.in_item_group": "%1$s탭ì—� ì†�함", - "create.item_attributes.added_by": "%1$sê°€ 추가함", - - "create.gui.attribute_filter.no_selected_attributes": "ì†�성ì�´ ì„ íƒ�ë�˜ì§€ ì•Šì�Œ", - "create.gui.attribute_filter.selected_attributes": "ì„ íƒ�ë�œ ì†�성:", - "create.gui.attribute_filter.whitelist_disjunctive": "í™”ì�´íŠ¸ë¦¬ìŠ¤íŠ¸ (최소)", - "create.gui.attribute_filter.whitelist_disjunctive.description": "ì•„ì�´í…œì�´ ì„ íƒ�ë�œ ì†�성 중 하나ë�¼ë�„ 가지고 있다면 통과시킵니다.", - "create.gui.attribute_filter.whitelist_conjunctive": "í™”ì�´íŠ¸ë¦¬ìŠ¤íŠ¸ (모ë‘�)", - "create.gui.attribute_filter.whitelist_conjunctive.description": "ì•„ì�´í…œì�´ ì„ íƒ�ë�œ ì†�성 모ë‘�를 가지고 있어야 통과시킵니다.", - "create.gui.attribute_filter.blacklist": "블랙리스트", - "create.gui.attribute_filter.blacklist.description": "ì•„ì�´í…œì�´ ì„ íƒ�ë�œ ì†�성ì�´ 없다면 통과시킵니다.", - "create.gui.attribute_filter.add_reference_item": "참고할 ì•„ì�´í…œì�„ 추가하기", - - "create.tooltip.holdKey": "[%1$s]를 눌러 설명보기", - "create.tooltip.holdKeyOrKey": "[%1$s] ë˜�는 [%2$s]를 눌러 설명보기", -======= "create.schematics.synchronizing": "동기화 중...", "create.schematics.uploadTooLarge": "청사진이 너무 큽니다!.", "create.schematics.maxAllowedSize": "최대 청사진 파일 크기는:", @@ -1084,25 +858,24 @@ "create.tooltip.holdKey": "[%1$s]를 눌러 설명보기", "create.tooltip.holdKeyOrKey": "[%1$s] 또는 [%2$s]를 눌러 설명보기", ->>>>>>> mc1.15/dev "create.tooltip.keyShift": "Shift", "create.tooltip.keyCtrl": "Ctrl", - "create.tooltip.speedRequirement": "회전ì†�ë�„ 요구: %1$s", - "create.tooltip.speedRequirement.none": "ì—†ì�Œ", - "create.tooltip.speedRequirement.medium": "보통", - "create.tooltip.speedRequirement.high": "빠름", - "create.tooltip.stressImpact": "피로ë�„ 부하: %1$s", - "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": "(발전기로ì�¨)", - "create.tooltip.generationSpeed": "%1$s %2$s만í�¼ 발전함", - "create.tooltip.analogStrength": "레드스톤 출력: %1$s/15", + "create.tooltip.speedRequirement": "회전속도 요구: %1$s", + "create.tooltip.speedRequirement.none": "없음", + "create.tooltip.speedRequirement.medium": "보통", + "create.tooltip.speedRequirement.high": "빠름", + "create.tooltip.stressImpact": "피로도 부하: %1$s", + "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": "(발전기로써)", + "create.tooltip.generationSpeed": "%1$s %2$s만큼 발전함", + "create.tooltip.analogStrength": "레드스톤 출력: %1$s/15", "create.mechanical_arm.extract_from": "UNLOCALIZED: Take items from %1$s", "create.mechanical_arm.deposit_to": "UNLOCALIZED: Deposit items to %1$s", @@ -1139,15 +912,15 @@ "create.command.killTPSCommand.status.usage.1": "[Create]: use /killtps start to artificially slow down the server tick", "create.command.killTPSCommand.argument.tickTime": "tickTime", - "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": "깔때기가 í�¡ìž…함", + "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": "깔때기가 흡입함", "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily", @@ -1163,41 +936,41 @@ "item.create.example_item.tooltip.action1": "These controls are displayed.", "item.create.wand_of_symmetry.tooltip": "SYMMETRY WAND", - "item.create.wand_of_symmetry.tooltip.summary": "설정ë�œ 반사 모드ì—� ë”°ë�¼ 블럭 설치를 똑같ì�´ 재현합니다.", - "item.create.wand_of_symmetry.tooltip.condition1": "단축바ì—� 있ì�„ ë•Œ", - "item.create.wand_of_symmetry.tooltip.behaviour1": "활성화 유지", - "item.create.wand_of_symmetry.tooltip.control1": "ë•…ì—�다 ìš°í�´ë¦­", - "item.create.wand_of_symmetry.tooltip.action1": "거울ì�„ _ìƒ�성하거나_ _옮ê¹�니다_.", - "item.create.wand_of_symmetry.tooltip.control2": "공중ì—� ìš°í�´ë¦­", - "item.create.wand_of_symmetry.tooltip.action2": "활성화ë�œ ê±°ì�„ì�„ _제거합니다_.", - "item.create.wand_of_symmetry.tooltip.control3": "ì›…í�¬ë¦° ìƒ�태ì—�ì„œ ìš°í�´ë¦­", - "item.create.wand_of_symmetry.tooltip.action3": "_설정_ _ì°½_ì�„ 엽니다.", + "item.create.wand_of_symmetry.tooltip.summary": "설정된 반사 모드에 따라 블럭 설치를 똑같이 재현합니다.", + "item.create.wand_of_symmetry.tooltip.condition1": "단축바에 있을 때", + "item.create.wand_of_symmetry.tooltip.behaviour1": "활성화 유지", + "item.create.wand_of_symmetry.tooltip.control1": "땅에다 우클릭", + "item.create.wand_of_symmetry.tooltip.action1": "거울을 _생성하거나_ _옮깁니다_.", + "item.create.wand_of_symmetry.tooltip.control2": "공중에 우클릭", + "item.create.wand_of_symmetry.tooltip.action2": "활성화된 거을을 _제거합니다_.", + "item.create.wand_of_symmetry.tooltip.control3": "웅크린 상태에서 우클릭", + "item.create.wand_of_symmetry.tooltip.action3": "_설정_ _창_을 엽니다.", "item.create.handheld_blockzapper.tooltip": "BLOCKZAPPER", - "item.create.handheld_blockzapper.tooltip.summary": "멀리있는 블럭ì�„ êµ�ì²´, 설치하는 놀ë�¼ìš´ ë�„구입니다.", - "item.create.handheld_blockzapper.tooltip.control1": "블럭ì�„ ë³´ê³  좌í�´ë¦­", - "item.create.handheld_blockzapper.tooltip.action1": "ì�´ ë�„구로 설치할 블럭ì�„ 설정합니다.", - "item.create.handheld_blockzapper.tooltip.control2": "블럭ì�„ ë³´ê³  ìš°í�´ë¦­", - "item.create.handheld_blockzapper.tooltip.action2": "해당 위치ì—� 설정ë�œ 블럭으로 설치하거나 êµ�체합니다.", - "item.create.handheld_blockzapper.tooltip.control3": "ì›…í�¬ë¦° ìƒ�태ì—�ì„œ ìš°í�´ë¦­", - "item.create.handheld_blockzapper.tooltip.action3": "_설정_ _ì°½_ì�„ 엽니다.", + "item.create.handheld_blockzapper.tooltip.summary": "멀리있는 블럭을 교체, 설치하는 놀라운 도구입니다.", + "item.create.handheld_blockzapper.tooltip.control1": "블럭을 보고 좌클릭", + "item.create.handheld_blockzapper.tooltip.action1": "이 도구로 설치할 블럭을 설정합니다.", + "item.create.handheld_blockzapper.tooltip.control2": "블럭을 보고 우클릭", + "item.create.handheld_blockzapper.tooltip.action2": "해당 위치에 설정된 블럭으로 설치하거나 교체합니다.", + "item.create.handheld_blockzapper.tooltip.control3": "웅크린 상태에서 우클릭", + "item.create.handheld_blockzapper.tooltip.action3": "_설정_ _창_을 엽니다.", "item.create.handheld_worldshaper.tooltip": "HANDHELD WORLDSHAPER", - "item.create.handheld_worldshaper.tooltip.summary": "_지형경관_ì�„ 만들 ë•Œ 좋ì�€ 간편한 ë�„구입니다.", - "item.create.handheld_worldshaper.tooltip.control1": "블럭ì�„ ë³´ê³  좌í�´ë¦­", - "item.create.handheld_worldshaper.tooltip.action1": "ì�´ ë�„구로 설치할 블럭ì�„ 설정합니다.", - "item.create.handheld_worldshaper.tooltip.control2": "블럭ì�„ ë³´ê³  ìš°í�´ë¦­", - "item.create.handheld_worldshaper.tooltip.action2": "해당 위치ì—� 설정ë�œ _브러쉬_ 와 _ë�„구_를 ì �용합니다.", - "item.create.handheld_worldshaper.tooltip.control3": "ì›…í�¬ë¦° ìƒ�태ì—�ì„œ ìš°í�´ë¦­", - "item.create.handheld_worldshaper.tooltip.action3": "_설정_ _ì°½_ì�„ 엽니다.", + "item.create.handheld_worldshaper.tooltip.summary": "_지형경관_을 만들 때 좋은 간편한 도구입니다.", + "item.create.handheld_worldshaper.tooltip.control1": "블럭을 보고 좌클릭", + "item.create.handheld_worldshaper.tooltip.action1": "이 도구로 설치할 블럭을 설정합니다.", + "item.create.handheld_worldshaper.tooltip.control2": "블럭을 보고 우클릭", + "item.create.handheld_worldshaper.tooltip.action2": "해당 위치에 설정된 _브러쉬_ 와 _도구_를 적용합니다.", + "item.create.handheld_worldshaper.tooltip.control3": "웅크린 상태에서 우클릭", + "item.create.handheld_worldshaper.tooltip.action3": "_설정_ _창_을 엽니다.", "item.create.tree_fertilizer.tooltip": "TREE FERTILIZER", - "item.create.tree_fertilizer.tooltip.summary": "ì�¼ë°˜ì �ì�¸ 나무 종류들ì�˜ 성장ì�„ 촉진시킬 강력한 미네랄ì�˜ 혼합물입니다.", - "item.create.tree_fertilizer.tooltip.condition1": "묘목ì—� 사용했ì�„ ë•Œ", - "item.create.tree_fertilizer.tooltip.behaviour1": "묘목ì�„ 주위 공간과 _ìƒ�관없ì�´_ 성장시킵니다.", + "item.create.tree_fertilizer.tooltip.summary": "일반적인 나무 종류들의 성장을 촉진시킬 강력한 미네랄의 혼합물입니다.", + "item.create.tree_fertilizer.tooltip.condition1": "묘목에 사용했을 때", + "item.create.tree_fertilizer.tooltip.behaviour1": "묘목을 주위 공간과 _상관없이_ 성장시킵니다.", "item.create.deforester.tooltip": "DEFORESTER", - "item.create.deforester.tooltip.summary": "수 ì´ˆ 만ì—� 나무를 쓰러뜨리는 _ê²½ì�´ë¡œìš´_ _ë�„ë�¼_입니다.", + "item.create.deforester.tooltip.summary": "수 초 만에 나무를 쓰러뜨리는 _경이로운_ _도끼_입니다.", "item.create.extendo_grip.tooltip": "UNLOCALIZED: EXTENDO GRIP", "item.create.extendo_grip.tooltip.summary": "UNLOCALIZED: Boioioing! Greatly _increases_ _reach_ _distance_ of the wielder.", @@ -1205,165 +978,165 @@ "item.create.extendo_grip.tooltip.behaviour1": "UNLOCALIZED: Increases _reach_ _distance_ of items used in the _Main-Hand_.", "item.create.filter.tooltip": "FILTER", - "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.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.attribute_filter.tooltip": "ATTRIBUTE FILTER", - "item.create.attribute_filter.tooltip.summary": "장치ì�˜ _ìž…ë ¥_ê³¼ _출력_ì�„ í•„í„° _ì†�성_ 목ë¡�ì—� ë”°ë�¼ 정확하게 _ì¡°ì •_합니다.", - "item.create.attribute_filter.tooltip.condition1": "í•„í„° 슬롯ì—� 있ì�„ ë•Œ", - "item.create.attribute_filter.tooltip.behaviour1": "í•„í„° _설정_ì—� ë”°ë�¼ ì•„ì�´í…œ í��름ì�„ _ì¡°ì •_합니다.", - "item.create.attribute_filter.tooltip.condition2": "ìš°í�´ë¦­", - "item.create.attribute_filter.tooltip.behaviour2": "_설정_ _ì°½_ì�„ 엽니다.", + "item.create.attribute_filter.tooltip.summary": "장치의 _입력_과 _출력_을 필터 _속성_ 목록에 따라 정확하게 _조정_합니다.", + "item.create.attribute_filter.tooltip.condition1": "필터 슬롯에 있을 때", + "item.create.attribute_filter.tooltip.behaviour1": "필터 _설정_에 따라 아이템 흐름을 _조정_합니다.", + "item.create.attribute_filter.tooltip.condition2": "우클릭", + "item.create.attribute_filter.tooltip.behaviour2": "_설정_ _창_을 엽니다.", "item.create.empty_schematic.tooltip": "EMPTY SCHEMATIC", - "item.create.empty_schematic.tooltip.summary": "ì¡°í•© 재료로 ì“°ì�´ê±°ë‚˜ 청사진 í…Œì�´ë¸”ì—�ì„œ 청사진ì�„ 불러올 ë•Œ 쓰입니다.", + "item.create.empty_schematic.tooltip.summary": "조합 재료로 쓰이거나 청사진 테이블에서 청사진을 불러올 때 쓰입니다.", "item.create.schematic.tooltip": "SCHEMATIC", - "item.create.schematic.tooltip.summary": "세계ì—� 구조물ì�„ 홀로그램으로 불러와 지정하고 설치합니다. 지정ë�œ 홀로그램ì�€ 청사진 대í�¬ì�˜ ìž‘ì—… ì˜�ì—­ì�´ ë�©ë‹ˆë‹¤.", - "item.create.schematic.tooltip.condition1": "들고 있ì�„ ë–„", - "item.create.schematic.tooltip.behaviour1": "UIì�˜ ë�„구로 변경/설치 í•  수 있습니다.", - "item.create.schematic.tooltip.control1": "ì›…í�¬ë¦° ìƒ�태ì—�ì„œ ìš°í�´ë¦­", - "item.create.schematic.tooltip.action1": "정확한 _좌표_ ìž…ë ¥ì�„ 위한 ì°½ì�„ 엽니다.", + "item.create.schematic.tooltip.summary": "세계에 구조물을 홀로그램으로 불러와 지정하고 설치합니다. 지정된 홀로그램은 청사진 대포의 작업 영역이 됩니다.", + "item.create.schematic.tooltip.condition1": "들고 있을 떄", + "item.create.schematic.tooltip.behaviour1": "UI의 도구로 변경/설치 할 수 있습니다.", + "item.create.schematic.tooltip.control1": "웅크린 상태에서 우클릭", + "item.create.schematic.tooltip.action1": "정확한 _좌표_ 입력을 위한 창을 엽니다.", "item.create.schematic_and_quill.tooltip": "SCHEMATIC AND QUILL", - "item.create.schematic_and_quill.tooltip.summary": "세계ì—� 있는 구조물ì�„ .nbt 파ì�¼ë¡œ 저장할 ë•Œ 쓰입니다.", - "item.create.schematic_and_quill.tooltip.condition1": "1단계", - "item.create.schematic_and_quill.tooltip.behaviour1": "ë‘� 모서리를 ìš°í�´ë¦­ìœ¼ë¡œ ì„ íƒ�하세요.", - "item.create.schematic_and_quill.tooltip.condition2": "2단계", - "item.create.schematic_and_quill.tooltip.behaviour2": "ë©´ì�„ ë°”ë�¼ë³´ê³  _Ctrl-스í�¬ë¡¤_하여 í�¬ê¸°ë¥¼ 조정하세요. ìš°í�´ë¦­ì�„ 다시 하면 저장ë�©ë‹ˆë‹¤.", - "item.create.schematic_and_quill.tooltip.control1": "ìš°í�´ë¦­", - "item.create.schematic_and_quill.tooltip.action1": "모서리 ì„ íƒ� / 저장 확ì�¸", - "item.create.schematic_and_quill.tooltip.control2": "Ctrl를 누르고 있ì�„ ë•Œ", - "item.create.schematic_and_quill.tooltip.action2": "_Scroll_를 ì�´ìš©í•˜ì—¬ 거리를 조정합니다.", - "item.create.schematic_and_quill.tooltip.control3": "ì›…í�¬ë¦° ìƒ�태ì—�ì„œ ìš°í�´ë¦­", - "item.create.schematic_and_quill.tooltip.action3": "ì„ íƒ� ì˜�ì—­ì�„ 리셋하고 _ì‚­ì œ_합니다.", + "item.create.schematic_and_quill.tooltip.summary": "세계에 있는 구조물을 .nbt 파일로 저장할 때 쓰입니다.", + "item.create.schematic_and_quill.tooltip.condition1": "1단계", + "item.create.schematic_and_quill.tooltip.behaviour1": "두 모서리를 우클릭으로 선택하세요.", + "item.create.schematic_and_quill.tooltip.condition2": "2단계", + "item.create.schematic_and_quill.tooltip.behaviour2": "면을 바라보고 _Ctrl-스크롤_하여 크기를 조정하세요. 우클릭을 다시 하면 저장됩니다.", + "item.create.schematic_and_quill.tooltip.control1": "우클릭", + "item.create.schematic_and_quill.tooltip.action1": "모서리 선택 / 저장 확인", + "item.create.schematic_and_quill.tooltip.control2": "Ctrl를 누르고 있을 때", + "item.create.schematic_and_quill.tooltip.action2": "_Scroll_를 이용하여 거리를 조정합니다.", + "item.create.schematic_and_quill.tooltip.control3": "웅크린 상태에서 우클릭", + "item.create.schematic_and_quill.tooltip.action3": "선택 영역을 리셋하고 _삭제_합니다.", "block.create.schematicannon.tooltip": "SCHEMATICANNON", - "block.create.schematicannon.tooltip.summary": "장착ë�œ 청사진ì�„ 바탕으로 블럭들ì�„ ë°œí�¬í•©ë‹ˆë‹¤. 화약ì�„ 연료로 사용하고 주변 ì�¸ë²¤í† ë¦¬ 공간ì—�ì„œ ì•„ì�´í…œì�„ 사용합니다.", - "block.create.schematicannon.tooltip.control1": "ìš°í�´ë¦­", - "block.create.schematicannon.tooltip.action1": "ì°½ì�„ 엽니다.", + "block.create.schematicannon.tooltip.summary": "장착된 청사진을 바탕으로 블럭들을 발포합니다. 화약을 연료로 사용하고 주변 인벤토리 공간에서 아이템을 사용합니다.", + "block.create.schematicannon.tooltip.control1": "우클릭", + "block.create.schematicannon.tooltip.action1": "창을 엽니다.", "block.create.schematic_table.tooltip": "SCHEMATIC TABLE", - "block.create.schematic_table.tooltip.summary": "_빈_ _청사진_ì—� 저장ë�œ 청사진ì�„ 불러옵니다.", - "block.create.schematic_table.tooltip.condition1": "빈 청사진ì�„ ë„£ì�„ ë•Œ", - "block.create.schematic_table.tooltip.behaviour1": "Schematics í�´ë�”ì—�ì„œ ì„ íƒ�í•œ 파ì�¼ì�„ 업로드합니다.", + "block.create.schematic_table.tooltip.summary": "_빈_ _청사진_에 저장된 청사진을 불러옵니다.", + "block.create.schematic_table.tooltip.condition1": "빈 청사진을 넣을 때", + "block.create.schematic_table.tooltip.behaviour1": "Schematics 폴더에서 선택한 파일을 업로드합니다.", "block.create.shaft.tooltip": "SHAFT", - "block.create.shaft.tooltip.summary": "_ì�¼ì§�ì„ _으로 _회전_ì�„ 전달합니다.", + "block.create.shaft.tooltip.summary": "_일직선_으로 _회전_을 전달합니다.", "block.create.cogwheel.tooltip": "COGWHEEL", - "block.create.cogwheel.tooltip.summary": " _ì�¼ì§�ì„ _ì�´ë‚˜ _옆_ _톱니바퀴_ë¡œ _회전_ì�„ _전달_합니다.", + "block.create.cogwheel.tooltip.summary": " _일직선_이나 _옆_ _톱니바퀴_로 _회전_을 _전달_합니다.", "block.create.large_cogwheel.tooltip": "LARGE COGWHEEL", - "block.create.large_cogwheel.tooltip.summary": "í�° 톱니바퀴입니다. ìž‘ì�€ 톱니바퀴와 맞물렸ì�„ë•Œ, _회전 ì†�ë�„_ê°€ _변합니다_.", + "block.create.large_cogwheel.tooltip.summary": "큰 톱니바퀴입니다. 작은 톱니바퀴와 맞물렸을때, _회전 속도_가 _변합니다_.", "block.create.encased_shaft.tooltip": "ENCASED SHAFT", - "block.create.encased_shaft.tooltip.summary": "_ì�¼ì§�ì„ _으로 _회전_ì�„ 전달합니다. _ë²½ì�„_ _넘어_ 회전ì�„ 보낼 ë•Œ 유용합니다.", + "block.create.encased_shaft.tooltip.summary": "_일직선_으로 _회전_을 전달합니다. _벽을_ _넘어_ 회전을 보낼 때 유용합니다.", "block.create.gearbox.tooltip": "GEARBOX", - "block.create.gearbox.tooltip.summary": "_전후좌우_ / _ìƒ�하전후_ë¡œ 회전ì�„ 보냅니다. 한번 ë�” ì¡°í•©í•´ì„œ 설정ì�„ 바꿀 수 있습니다.", + "block.create.gearbox.tooltip.summary": "_전후좌우_ / _상하전후_로 회전을 보냅니다. 한번 더 조합해서 설정을 바꿀 수 있습니다.", "item.create.vertical_gearbox.tooltip": "UNLOCALIZED: VERTICAL GEARBOX", "item.create.vertical_gearbox.tooltip.summary": "UNLOCALIZED: _Relays_ _Rotation_ in _four_ _directions_ Reverses straight connections.", "block.create.gearshift.tooltip": "GEARSHIFT", - "block.create.gearshift.tooltip.summary": "ì—°ê²°ë�œ 축ì�˜ 회전 ë°©í–¥ì�„ _변경_합니다.", - "block.create.gearshift.tooltip.condition1": "레드스톤 신호를 받았ì�„ ë•Œ", - "block.create.gearshift.tooltip.behaviour1": "_출력_ 회전 ë°©í–¥ì�„ _반전_시킵니다.", + "block.create.gearshift.tooltip.summary": "연결된 축의 회전 방향을 _변경_합니다.", + "block.create.gearshift.tooltip.condition1": "레드스톤 신호를 받았을 때", + "block.create.gearshift.tooltip.behaviour1": "_출력_ 회전 방향을 _반전_시킵니다.", "block.create.clutch.tooltip": "CLUTCH", - "block.create.clutch.tooltip.summary": "ì—°ê²°ë�œ 축ì�˜ 회전ì�„ ë�„ê³  킬 수 있습니다.", - "block.create.clutch.tooltip.condition1": "레드스톤 신호를 받았ì�„ ë•Œ", - "block.create.clutch.tooltip.behaviour1": "출력 ë°©í–¥ 회전ì�„ 멈춥니다.", + "block.create.clutch.tooltip.summary": "연결된 축의 회전을 끄고 킬 수 있습니다.", + "block.create.clutch.tooltip.condition1": "레드스톤 신호를 받았을 때", + "block.create.clutch.tooltip.behaviour1": "출력 방향 회전을 멈춥니다.", "block.create.encased_belt.tooltip": "ENCASED_BELT", - "block.create.encased_belt.tooltip.summary": "ì—°ê²°ë�œ 다른 _ë�®ížŒ 벨트_ì—� 회전ì�„ _ì—°ê²°_합니다.", - "block.create.encased_belt.tooltip.condition1": "축ì—� ì—°ê²° ë�˜ì—ˆì�„ ë•Œ", - "block.create.encased_belt.tooltip.behaviour1": "ì—°ê²°ë�œ 축, 기어, 장치들ì�€ _ê°™ì�€_ _회전_ _ì†�ë�„_와 _ë°©í–¥_ì�„ 가집니다. ê°™ì�€ 방향으로 _맞대지_ _ì•Šì•„ë�„_ _ë�©ë‹ˆë‹¤_.", + "block.create.encased_belt.tooltip.summary": "연결된 다른 _덮힌 벨트_에 회전을 _연결_합니다.", + "block.create.encased_belt.tooltip.condition1": "축에 연결 되었을 때", + "block.create.encased_belt.tooltip.behaviour1": "연결된 축, 기어, 장치들은 _같은_ _회전_ _속도_와 _방향_을 가집니다. 같은 방향으로 _맞대지_ _않아도_ _됩니다_.", "block.create.adjustable_pulley.tooltip": "ANALOG BELT PULLEY", - "block.create.adjustable_pulley.tooltip.summary": "ë�®ížŒ 벨트와 ê°™ì�€ ì—­í• ì�„ 가집니다. ë˜�í•œ ìž…/출력 부분ì—� 설치하고 레드스톤 신호 세기ì—� ë”°ë�¼ _회전_ _ì†�ë�„_를 _ì¡°ì •_í•  수 있습니다.", - "block.create.adjustable_pulley.tooltip.condition1": "레드스톤 신호 설정", - "block.create.adjustable_pulley.tooltip.behaviour1": "_ìž…ë ¥_ 부분ì—� 설치하면 출력 회전 ì†�ë�„를 _낮추고_ (최대 0.5ë°°), _출력_ 부분ì—� 설치하면 출력 회전 ì†�ë�„를 _ì¦�가시킵니다_ (최대 2ë°°).", + "block.create.adjustable_pulley.tooltip.summary": "덮힌 벨트와 같은 역할을 가집니다. 또한 입/출력 부분에 설치하고 레드스톤 신호 세기에 따라 _회전_ _속도_를 _조정_할 수 있습니다.", + "block.create.adjustable_pulley.tooltip.condition1": "레드스톤 신호 설정", + "block.create.adjustable_pulley.tooltip.behaviour1": "_입력_ 부분에 설치하면 출력 회전 속도를 _낮추고_ (최대 0.5배), _출력_ 부분에 설치하면 출력 회전 속도를 _증가시킵니다_ (최대 2배).", "item.create.belt_connector.tooltip": "BELT CONNECTOR", - "item.create.belt_connector.tooltip.summary": "ë‘� ê°œ ì�´ìƒ�ì�˜ _축_ì�„ 벨트로 ì—°ê²°í•  수 있습니다. ì—°ê²°ë�œ 축들ì�€ _모ë‘�_ _ê°™ì�€_ _ì†�ë�„_와 _ë°©í–¥_ì�„ 가집니다. 벨트는 _ì•„ì�´í…œ_ì�´ë‚˜ _엔티티_를 _옮길_ _수_ _있습니다_.", - "item.create.belt_connector.tooltip.control1": "축ì—�다 ìš°í�´ë¦­", - "item.create.belt_connector.tooltip.action1": "첫번째 벨트 ë��부분ì�„ 설정합니다. ë‘�번째 축ì�€ 반드시 _수í�‰_ì�´ë‚˜ _수ì§�_, _대ê°�ì„ _ ë°©í–¥ì—� 있는 축ì—� 연결해야합니다.", - "item.create.belt_connector.tooltip.control2": "ì›…í�¬ë¦° ìƒ�태ì—�ì„œ ìš°í�´ë¦­", - "item.create.belt_connector.tooltip.action2": "첫번째 벨트 설정ì�„ 초기화합니다.", + "item.create.belt_connector.tooltip.summary": "두 개 이상의 _축_을 벨트로 연결할 수 있습니다. 연결된 축들은 _모두_ _같은_ _속도_와 _방향_을 가집니다. 벨트는 _아이템_이나 _엔티티_를 _옮길_ _수_ _있습니다_.", + "item.create.belt_connector.tooltip.control1": "축에다 우클릭", + "item.create.belt_connector.tooltip.action1": "첫번째 벨트 끝부분을 설정합니다. 두번째 축은 반드시 _수평_이나 _수직_, _대각선_ 방향에 있는 축에 연결해야합니다.", + "item.create.belt_connector.tooltip.control2": "웅크린 상태에서 우클릭", + "item.create.belt_connector.tooltip.action2": "첫번째 벨트 설정을 초기화합니다.", "item.create.goggles.tooltip": "GOGGLES", - "item.create.goggles.tooltip.summary": "장치 정보를 ì°©ìš©ìž�ì�˜ 시야ì—� ë�„어주는 안경입니다.", - "item.create.goggles.tooltip.condition1": "장착했ì�„ ë•Œ", - "item.create.goggles.tooltip.behaviour1": "해당 장치ì�˜ _ì†�ë�„_, _피로ë�„_, _용량_ì�„ 레벨ì—� ë”°ë�¼ ì—� ë”°ë�¼ 색ìƒ� UI를 ë³´ì—¬ì¤�니다.", - "item.create.goggles.tooltip.condition2": "계측기를 ë°”ë�¼ë³¼ ë•Œ", - "item.create.goggles.tooltip.behaviour2": "계측기가 ì—°ê²°ë�œ 네트워í�¬ì�˜ _ì†�ë�„_나 _스트레스_ì�˜ ìž�세한 정보를 ë³´ì—¬ì¤�니다.", + "item.create.goggles.tooltip.summary": "장치 정보를 착용자의 시야에 띄어주는 안경입니다.", + "item.create.goggles.tooltip.condition1": "장착했을 때", + "item.create.goggles.tooltip.behaviour1": "해당 장치의 _속도_, _피로도_, _용량_을 레벨에 따라 에 따라 색상 UI를 보여줍니다.", + "item.create.goggles.tooltip.condition2": "계측기를 바라볼 때", + "item.create.goggles.tooltip.behaviour2": "계측기가 연결된 네트워크의 _속도_나 _스트레스_의 자세한 정보를 보여줍니다.", "item.create.wrench.tooltip": "WRENCH", - "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": "_장치_를 _í•´ì²´_하고 _즉시_ _ì�¸ë²¤í† ë¦¬_ë¡œ 넣습니다.", + "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": "_장치_를 _해체_하고 _즉시_ _인벤토리_로 넣습니다.", "block.create.creative_motor.tooltip": "CREATIVE MOTOR", - "block.create.creative_motor.tooltip.summary": "회전 ì†�ë�„를 _ì¡°ì •_í•  수 있는 장치입니다.", + "block.create.creative_motor.tooltip.summary": "회전 속도를 _조정_할 수 있는 장치입니다.", "block.create.water_wheel.tooltip": "WATER WHEEL", - "block.create.water_wheel.tooltip.summary": "ì�¸ì ‘í•œ _물ì�˜_ _í��름_ì—�ì„œ ì–»ì�€ 회전ì�„ 제공합니다.", + "block.create.water_wheel.tooltip.summary": "인접한 _물의_ _흐름_에서 얻은 회전을 제공합니다.", "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.condition2": "ë�Œë ¤ì§ˆ ë•Œ", - "block.create.encased_fan.tooltip.behaviour2": "들어오는 회ì � ì†�ë�„ì—� ë”°ë�¼ 엔티티를 밀거나 당ê¹�니다.", - "block.create.encased_fan.tooltip.condition3": "특정 블럭ì�„ 통해 바람ì�„ 보낼 ë•Œ", - "block.create.encased_fan.tooltip.behaviour3": "공기 í��름ì—� _ì•¡ì²´_ 혹ì�€ _불꽃_ 효과가 _추가_ë�©ë‹ˆë‹¤. ì�´ëŠ” ì•„ì�´í…œì�„ _공정_하는ë�° ì“°ì�¼ 수 있습니다.", + "block.create.encased_fan.tooltip.summary": "회전력을 바람으로 전환합니다. 다양한 용도로 사용 가능합니다.", + "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": "특정 블럭을 통해 바람을 보낼 때", + "block.create.encased_fan.tooltip.behaviour3": "공기 흐름에 _액체_ 혹은 _불꽃_ 효과가 _추가_됩니다. 이는 아이템을 _공정_하는데 쓰일 수 있습니다.", "block.create.nozzle.tooltip": "NOZZLE", - "block.create.nozzle.tooltip.summary": "ë�®ížŒ 환í’�기 _ì•ž_ì—� 붙여 환í’�기ì�˜ 효과를 _ì „ë°©_으로 _확대_합니다.", + "block.create.nozzle.tooltip.summary": "덮힌 환풍기 _앞_에 붙여 환풍기의 효과를 _전방_으로 _확대_합니다.", "block.create.hand_crank.tooltip": "HAND CRANK", - "block.create.hand_crank.tooltip.summary": "간단한 회전력ì�˜ ì›�천입니다. 플레ì�´ì–´ì�˜ _ìƒ�호작용_ì�´ 필요합니다.", - "block.create.hand_crank.tooltip.condition1": "사용ë�  ë•Œ", - "block.create.hand_crank.tooltip.behaviour1": "ì—°ê²°ë�œ 장치ì—� _회전력_ì�„ _제공_합니다. ì›…í�¬ë¦¬ë©´ _반대로_ 회전시킵니다.", + "block.create.hand_crank.tooltip.summary": "간단한 회전력의 원천입니다. 플레이어의 _상호작용_이 필요합니다.", + "block.create.hand_crank.tooltip.condition1": "사용될 때", + "block.create.hand_crank.tooltip.behaviour1": "연결된 장치에 _회전력_을 _제공_합니다. 웅크리면 _반대로_ 회전시킵니다.", "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.summary": "_시간의_ _흐름_을 알고 공간을 _꾸미는_ 데 좋은 공예품입니다.", + "block.create.cuckoo_clock.tooltip.condition1": "회전할 때", + "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.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": "모든 것ì�„ _부숴버리는_ í�° 바퀴입니다.", - "block.create.crushing_wheel.tooltip.condition1": "다른 분쇄 휠과 붙어있ì�„ ë•Œ", - "block.create.crushing_wheel.tooltip.behaviour1": "다양한 것ì�„ _분쇄_하는 분쇄 기계를 형성합니다. 휠ì�˜ ì�´ë¹¨ì�´ _ê°™ì�€_ _ì†�ë ¥_으로, _반대_ _ë°©í–¥_으로 맞물려야합니다.", + "block.create.crushing_wheel.tooltip.summary": "모든 것을 _부숴버리는_ 큰 바퀴입니다.", + "block.create.crushing_wheel.tooltip.condition1": "다른 분쇄 휠과 붙어있을 때", + "block.create.crushing_wheel.tooltip.behaviour1": "다양한 것을 _분쇄_하는 분쇄 기계를 형성합니다. 휠의 이빨이 _같은_ _속력_으로, _반대_ _방향_으로 맞물려야합니다.", "block.create.mechanical_press.tooltip": "MECHANICAL PRESS", - "block.create.mechanical_press.tooltip.summary": "아래있는 ì•„ì�´í…œì�„ _눌러버리는_ 힘센 피스톤입니다. _지ì†�ì �ì�¸_ _회전력_ì�´ 필요합니다.", - "block.create.mechanical_press.tooltip.condition1": "레드스톤 신호를 받았ì�„ ë•Œ", - "block.create.mechanical_press.tooltip.behaviour1": "_아래 있는_ ì•„ì�´í…œì�„ 누르기 시작합니다.", - "block.create.mechanical_press.tooltip.condition2": "컨베ì�´ì–´ 벨트 위ì—� 있ì�„ ë•Œ", - "block.create.mechanical_press.tooltip.behaviour2": "_ìž�ë�™ìœ¼ë¡œ_ 벨트 위를 지나가는 ì•„ì�´í…œì�„ 누릅니다.", + "block.create.mechanical_press.tooltip.summary": "아래있는 아이템을 _눌러버리는_ 힘센 피스톤입니다. _지속적인_ _회전력_이 필요합니다.", + "block.create.mechanical_press.tooltip.condition1": "레드스톤 신호를 받았을 때", + "block.create.mechanical_press.tooltip.behaviour1": "_아래 있는_ 아이템을 누르기 시작합니다.", + "block.create.mechanical_press.tooltip.condition2": "컨베이어 벨트 위에 있을 때", + "block.create.mechanical_press.tooltip.behaviour2": "_자동으로_ 벨트 위를 지나가는 아이템을 누릅니다.", "block.create.mechanical_press.tooltip.condition3": "UNLOCALIZED: When above Basin", "block.create.mechanical_press.tooltip.behaviour3": "UNLOCALIZED: Starts to _compact_ _items_ in the basin whenever all necessary ingredients are present.", "block.create.basin.tooltip": "BASIN", - "block.create.basin.tooltip.summary": "믹서나 압착기와 ê°™ì�´ ì“°ì�´ëŠ” 간편한 _ì•„ì�´í…œ_ _저장소_입니다. 레드스톤 비êµ�기와 호환ë�©ë‹ˆë‹¤.", + "block.create.basin.tooltip.summary": "믹서나 압착기와 같이 쓰이는 간편한 _아이템_ _저장소_입니다. 레드스톤 비교기와 호환됩니다.", "block.create.blaze_heater.tooltip": "UNLOCALIZED: BLAZE HEATER", "block.create.blaze_heater.tooltip.summary": "UNLOCALIZED: A block to heat a basin when housing a tamed blaze.", @@ -1378,81 +1151,81 @@ "block.create.reinforced_rail.tooltip.summary": "UNLOCALIZED: A timber stabilized rail, _does_ _not_ _need_ _supports_.", "block.create.mechanical_mixer.tooltip": "MECHANICAL MIXER", - "block.create.mechanical_mixer.tooltip.summary": "아래있는 ì•„ì�´í…œì�„ ì¡°í•©í•  혼합기입니다. _지ì†�ì �ì�¸_ _회전력_ê³¼ í•œ 칸 아래ì—� _대야_ê°€ 필요합니다.", - "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.summary": "아래있는 아이템을 조합할 혼합기입니다. _지속적인_ _회전력_과 한 칸 아래에 _대야_가 필요합니다.", + "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_crafter.tooltip": "MECHANICAL CRAFTER", - "block.create.mechanical_crafter.tooltip.summary": "모든 조합법ì�„ _ìž�ë�™í™”_í•  장치입니다. 조합법대로 여러개를 _격ìž�_ë¡œ 설치하고, 화살표를 ë�Œë ¤ _í•œ_ _곳으로_ _모ì�´ê²Œ_ 설정해야합니다.", - "block.create.mechanical_crafter.tooltip.condition1": "회전할 ë•Œ", - "block.create.mechanical_crafter.tooltip.behaviour1": "모든 조합칸ì—� 있는 ì•„ì�´í…œë“¤ì�„ 조합하기 시작합니다.", + "block.create.mechanical_crafter.tooltip.summary": "모든 조합법을 _자동화_할 장치입니다. 조합법대로 여러개를 _격자_로 설치하고, 화살표를 돌려 _한_ _곳으로_ _모이게_ 설정해야합니다.", + "block.create.mechanical_crafter.tooltip.condition1": "회전할 때", + "block.create.mechanical_crafter.tooltip.behaviour1": "모든 조합칸에 있는 아이템들을 조합하기 시작합니다.", "block.create.mechanical_crafter.tooltip.condition2": "UNLOCALIZED: On Redstone Pulse", "block.create.mechanical_crafter.tooltip.behaviour2": "UNLOCALIZED: _Forces_ the start of the _crafting_ _process_ with all currently given _items_ in the grid.", - "block.create.mechanical_crafter.tooltip.control1": "ì „ë©´ì�„ 렌치로 ì¡°ì •í•  ë•Œ", - "block.create.mechanical_crafter.tooltip.action1": "ê°� 기계ì‹� 조합기ì�˜ ì•„ì�´í…œ ì�´ë�™ ë°©í–¥ì�„ 설정합니다. 모든 조합기ì�˜ ë°©í–¥ì�€ _하나ì�˜_ _최종_ _조합기_ë¡œ ì�´ë�™í•´ì•¼í•˜ë©°, 최종 조합기는 조합기 _바깥으로_ ì•„ì�´í…œì�„ 운송해야합니다.", - "block.create.mechanical_crafter.tooltip.control2": "측면/후면ì—�ì„œ 렌치로 ì¡°ì •í•  ë•Œ", - "block.create.mechanical_crafter.tooltip.action2": "ì�¸ì ‘í•œ 조합기와 ìž…ë ¥ 공간ì�„ _ì—°ê²°_합니다. ì�´ë¥¼ 통해 ì�¼ì�¼ížˆ ì•„ì�´í…œì�„ 넣는 노력ì�„ 줄ì�¼ 수 있습니다.", + "block.create.mechanical_crafter.tooltip.control1": "전면을 렌치로 조정할 때", + "block.create.mechanical_crafter.tooltip.action1": "각 기계식 조합기의 아이템 이동 방향을 설정합니다. 모든 조합기의 방향은 _하나의_ _최종_ _조합기_로 이동해야하며, 최종 조합기는 조합기 _바깥으로_ 아이템을 운송해야합니다.", + "block.create.mechanical_crafter.tooltip.control2": "측면/후면에서 렌치로 조정할 때", + "block.create.mechanical_crafter.tooltip.action2": "인접한 조합기와 입력 공간을 _연결_합니다. 이를 통해 일일히 아이템을 넣는 노력을 줄일 수 있습니다.", "block.create.furnace_engine.tooltip": "FURNACE ENGINE", - "block.create.furnace_engine.tooltip.summary": "_화로ì�˜_ _ìž‘ë�™_ì�„ 필요로 하는 강력한 회전 ë�™ë ¥ì›�입니다.", - "block.create.furnace_engine.tooltip.condition1": "ìž‘ë�™í•˜ëŠ” 화로ì—� 붙였ì�„ ë•Œ", - "block.create.furnace_engine.tooltip.behaviour1": "붙어있는(한칸 ë�„어져있는) _플ë�¼ì�´íœ _ì—� ë�™ë ¥ì�„ 공급합니다. _ìš©ê´‘ë¡œ_는 _ë‘�_ _ë°°_ì�˜ 화력ì�„ 냅니다.", + "block.create.furnace_engine.tooltip.summary": "_화로의_ _작동_을 필요로 하는 강력한 회전 동력원입니다.", + "block.create.furnace_engine.tooltip.condition1": "작동하는 화로에 붙였을 때", + "block.create.furnace_engine.tooltip.behaviour1": "붙어있는(한칸 띄어져있는) _플라이휠_에 동력을 공급합니다. _용광로_는 _두_ _배_의 화력을 냅니다.", "block.create.flywheel.tooltip": "FLYWHEEL", - "block.create.flywheel.tooltip.summary": "붙어있는 _화로_ _엔진_ì—�ì„œ ìƒ�ì‚°ë�œ 힘ì�„ 안정시키고 _ë�™ë ¥í™”_하는 거대한 금ì†� 바퀴입니다. 화로 엔진으로부터 _í•œ_ _칸_ _떨어져_ 설치해야 합니다.", - "block.create.flywheel.tooltip.condition1": "ìž‘ë�™í•˜ëŠ” 엔진ì—� 붙었ì�„ ë•Œ", - "block.create.flywheel.tooltip.behaviour1": "엔진ì�˜ 힘ì—� ë”°ë�¼ ì—°ê²°ë�œ 장치ì—� _회전력_ì�„ 제공합니다.", + "block.create.flywheel.tooltip.summary": "붙어있는 _화로_ _엔진_에서 생산된 힘을 안정시키고 _동력화_하는 거대한 금속 바퀴입니다. 화로 엔진으로부터 _한_ _칸_ _떨어져_ 설치해야 합니다.", + "block.create.flywheel.tooltip.condition1": "작동하는 엔진에 붙었을 때", + "block.create.flywheel.tooltip.behaviour1": "엔진의 힘에 따라 연결된 장치에 _회전력_을 제공합니다.", "block.create.portable_storage_interface.tooltip": "PORTABLE STORAGE INTERFACE", - "block.create.portable_storage_interface.tooltip.summary": "움ì§�ì�´ëŠ” 피스톤, ë² ì–´ë§�, 수레, 밧줄 ë�„르래ì�˜ ì�¸ë²¤í† ë¦¬ì—�ì„œ _ì•„ì�´í…œì�„_ _êµ�환하는_ 휴대용 장치입니다.", - "block.create.portable_storage_interface.tooltip.condition1": "움ì§�ì�¼ ë•Œ", - "block.create.portable_storage_interface.tooltip.behaviour1": "ê³ ì •ë�œ 트랜스í�¬ì €ì�˜ _ë°©í–¥ì—�_ _ë”°ë�¼_ ì•„ì�´í…œì�„ _주거나_ _받습니다_. ì•„ì�´í…œì�´ ì�´ë�™í•˜ëŠ” ë�™ì•ˆ 움ì§�ì�´ëŠ” 기기는 _멈춥니다_.", + "block.create.portable_storage_interface.tooltip.summary": "움직이는 피스톤, 베어링, 수레, 밧줄 도르래의 인벤토리에서 _아이템을_ _교환하는_ 휴대용 장치입니다.", + "block.create.portable_storage_interface.tooltip.condition1": "움직일 때", + "block.create.portable_storage_interface.tooltip.behaviour1": "고정된 트랜스포저의 _방향에_ _따라_ 아이템을 _주거나_ _받습니다_. 아이템이 이동하는 동안 움직이는 기기는 _멈춥니다_.", "block.create.rotation_speed_controller.tooltip": "ROTATION SPEED CONTROLLER", - "block.create.rotation_speed_controller.tooltip.summary": "해당 톱니바퀴ì�˜ ì†�ë�„를 _변경_í•  수 있는 컨트롤러입니다.", - "block.create.rotation_speed_controller.tooltip.condition1": "í�° 톱니바퀴와 ì—°ê²°ë�˜ì—ˆì�„ ë•Œ", - "block.create.rotation_speed_controller.tooltip.behaviour1": "들어오는 회전력ì�„ 받아, 대ìƒ�ì�˜ ì†�ë�„를 변경합니다. _í�°_ _톱니바퀴_ê°€ 컨트롤러 위ì—� 있어야합니다.", + "block.create.rotation_speed_controller.tooltip.summary": "해당 톱니바퀴의 속도를 _변경_할 수 있는 컨트롤러입니다.", + "block.create.rotation_speed_controller.tooltip.condition1": "큰 톱니바퀴와 연결되었을 때", + "block.create.rotation_speed_controller.tooltip.behaviour1": "들어오는 회전력을 받아, 대상의 속도를 변경합니다. _큰_ _톱니바퀴_가 컨트롤러 위에 있어야합니다.", "block.create.mechanical_piston.tooltip": "MECHANICAL PISTON", - "block.create.mechanical_piston.tooltip.summary": "피스톤ì�˜ 업그레ì�´ë“œ 버전입니다. 회전력ì�„ 사용해 ì—°ê²°ë�œ 구조물ì�„ 옮ê¹�니다. _피스톤_ _연장_ _축_ì�„ 후면ì—� 붙여 ì�´ 장치ì�˜ 사거리를 늘ì�´ê±°ë‚˜ 줄ì�¼ 수 있습니다. 축ì�´ 없다면 움ì§�ì�´ì§€ 않습니다. _섀시_나 _슬ë�¼ìž„_ _블럭_ì�„ 붙여 ì�¼ì§�ì„ ì�˜ 블럭들ì�„ 움ì§�ì�¼ 수 있습니다.", - "block.create.mechanical_piston.tooltip.condition1": "회전ë�  ë•Œ", - "block.create.mechanical_piston.tooltip.behaviour1": "붙어있는 구조물ì�„ 움ì§�ì�´ê¸° 시작합니다. ì†�ë�„와 ë°©í–¥ì�€ 들어오는 회전 ì†�ë�„와 ë°©í–¥ì—� ë”°ë�¼ 달ë�¼ì§‘니다.", + "block.create.mechanical_piston.tooltip.summary": "피스톤의 업그레이드 버전입니다. 회전력을 사용해 연결된 구조물을 옮깁니다. _피스톤_ _연장_ _축_을 후면에 붙여 이 장치의 사거리를 늘이거나 줄일 수 있습니다. 축이 없다면 움직이지 않습니다. _섀시_나 _슬라임_ _블럭_을 붙여 일직선의 블럭들을 움직일 수 있습니다.", + "block.create.mechanical_piston.tooltip.condition1": "회전될 때", + "block.create.mechanical_piston.tooltip.behaviour1": "붙어있는 구조물을 움직이기 시작합니다. 속도와 방향은 들어오는 회전 속도와 방향에 따라 달라집니다.", "block.create.sticky_mechanical_piston.tooltip": "STICKY MECHANICAL PISTON", - "block.create.sticky_mechanical_piston.tooltip.summary": "ë�ˆë�ˆì�´ 피스톤ì�˜ 업그레ì�´ë“œ 버전입니다. 회전력ì�„ 사용해 ì—°ê²°ë�œ 구조물ì�„ 옮ê¹�니다. _피스톤_ _연장_ _축_ì�„ 후면ì—� 붙여 ì�´ 장치ì�˜ 사거리를 늘ì�´ê±°ë‚˜ 줄ì�¼ 수 있습니다. 축ì�´ 없다면 움ì§�ì�´ì§€ 않습니다. _섀시_나 _슬ë�¼ìž„_ _블럭_ì�„ 붙여 ì�¼ì§�ì„ ì�˜ 블럭들ì�„ 움ì§�ì�¼ 수 있습니다.", - "block.create.sticky_mechanical_piston.tooltip.condition1": "회전ë�  ë•Œ", - "block.create.sticky_mechanical_piston.tooltip.behaviour1": "붙어있는 구조물ì�„ 움ì§�ì�´ê¸° 시작합니다. ì†�ë�„와 ë°©í–¥ì�€ 들어오는 회전 ì†�ë�„와 ë°©í–¥ì—� ë”°ë�¼ 달ë�¼ì§‘니다.", + "block.create.sticky_mechanical_piston.tooltip.summary": "끈끈이 피스톤의 업그레이드 버전입니다. 회전력을 사용해 연결된 구조물을 옮깁니다. _피스톤_ _연장_ _축_을 후면에 붙여 이 장치의 사거리를 늘이거나 줄일 수 있습니다. 축이 없다면 움직이지 않습니다. _섀시_나 _슬라임_ _블럭_을 붙여 일직선의 블럭들을 움직일 수 있습니다.", + "block.create.sticky_mechanical_piston.tooltip.condition1": "회전될 때", + "block.create.sticky_mechanical_piston.tooltip.behaviour1": "붙어있는 구조물을 움직이기 시작합니다. 속도와 방향은 들어오는 회전 속도와 방향에 따라 달라집니다.", "block.create.piston_extension_pole.tooltip": "PISTON POLE", - "block.create.piston_extension_pole.tooltip.summary": "기계ì‹� 피스톤ì�˜ _사거리_를 늘려ì¤�니다.", - "block.create.piston_extension_pole.tooltip.condition1": "기계ì‹� 피스톤ì—� ì—°ê²°í–ˆì�„ ë•Œ", - "block.create.piston_extension_pole.tooltip.behaviour1": "피스톤ì�˜ 사거리를 í•œ 블럭 늘립니다.", + "block.create.piston_extension_pole.tooltip.summary": "기계식 피스톤의 _사거리_를 늘려줍니다.", + "block.create.piston_extension_pole.tooltip.condition1": "기계식 피스톤에 연결했을 때", + "block.create.piston_extension_pole.tooltip.behaviour1": "피스톤의 사거리를 한 블럭 늘립니다.", "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.condition2": "레드스톤 신호를 ë°›ì�„ ë•Œ", - "block.create.mechanical_bearing.tooltip.behaviour2": "붙어있는 구조물ì�˜ 회전ì�„ ì�´ìš©í•˜ì—¬ 회전력ì�„ 제공합니다. 구조물ì�€ _ë‚ ê°œ_ì—� ì �í•©í•œ 블럭ì�´ í�¬í•¨ë�˜ì–´ì•¼í•©ë‹ˆë‹¤. (현재는 _아무_ _양털_ì�´ë‚˜ 가능합니다).", + "block.create.mechanical_bearing.tooltip.summary": "큰 구조물을 _회전_시키거나 _바람으로부터_ 회전력을 얻습니다.", + "block.create.mechanical_bearing.tooltip.condition1": "회전될 때", + "block.create.mechanical_bearing.tooltip.behaviour1": "연결된 블럭들을 돌리기 시작합니다. _섀시_나 _슬라임_ _블럭_을 이용해 더 많은 블럭을 움직이세요.", + "block.create.mechanical_bearing.tooltip.condition2": "레드스톤 신호를 받을 때", + "block.create.mechanical_bearing.tooltip.behaviour2": "붙어있는 구조물의 회전을 이용하여 회전력을 제공합니다. 구조물은 _날개_에 적합한 블럭이 포함되어야합니다. (현재는 _아무_ _양털_이나 가능합니다).", "block.create.clockwork_bearing.tooltip": "CLOCKWORK BEARING", - "block.create.clockwork_bearing.tooltip.summary": "현재 _ì�¸ê²Œìž„_ _시간_ì�„ 알려주는 _시침_, _분침_ì�„ ë�Œë¦¬ëŠ” 업그레ì�´ë“œë�œ ë² ì–´ë§�입니다.", - "block.create.clockwork_bearing.tooltip.condition1": "회전ë�  ë•Œ", - "block.create.clockwork_bearing.tooltip.behaviour1": "현재 시간ì—� 맞춰 ì—°ê²°ë�œ 구조물ì�„ _시침_으로ì�¨ ë�Œë¦¬ê¸° 시작합니다. _다른_ _종류ì�˜_ _섀시_ê°€ 있다면, _분침_처럼 ë�Œë¦½ë‹ˆë‹¤.", + "block.create.clockwork_bearing.tooltip.summary": "현재 _인게임_ _시간_을 알려주는 _시침_, _분침_을 돌리는 업그레이드된 베어링입니다.", + "block.create.clockwork_bearing.tooltip.condition1": "회전될 때", + "block.create.clockwork_bearing.tooltip.behaviour1": "현재 시간에 맞춰 연결된 구조물을 _시침_으로써 돌리기 시작합니다. _다른_ _종류의_ _섀시_가 있다면, _분침_처럼 돌립니다.", "block.create.sequenced_gearshift.tooltip": "SEQUENCED GEARSHIFT", - "block.create.sequenced_gearshift.tooltip.summary": "ì—°ì†�으로 5ê°œì�˜ 회전 명령ì�„ 내릴 수 있는 _프로그램ì�´_ _가능한_ 장치입니다. ì�´ê²ƒìœ¼ë¡œ ë² ì–´ë§�, 피스톤, ë�„르래ì�˜ 움ì§�ìž„ê³¼ 타ì�´ë°�ì�„ ì •í•  수 있습니다. 빠른 ì†�ë ¥ì—�는 부정확해질 수 있습니다.", - "block.create.sequenced_gearshift.tooltip.condition1": "레드스톤 신호를 ë°›ì�„ ë•Œ", - "block.create.sequenced_gearshift.tooltip.behaviour1": "ìž…ë ¥ ì†�ë�„ì—� 따른 프로그램ë�œ 명령들ì�„ 수행하기 시작합니다.", - "block.create.sequenced_gearshift.tooltip.condition2": "ìš°í�´ë¦­í–ˆì�„ ë•Œ", - "block.create.sequenced_gearshift.tooltip.behaviour2": "설정 ì°½ì�„ 엽니다.", + "block.create.sequenced_gearshift.tooltip.summary": "연속으로 5개의 회전 명령을 내릴 수 있는 _프로그램이_ _가능한_ 장치입니다. 이것으로 베어링, 피스톤, 도르래의 움직임과 타이밍을 정할 수 있습니다. 빠른 속력에는 부정확해질 수 있습니다.", + "block.create.sequenced_gearshift.tooltip.condition1": "레드스톤 신호를 받을 때", + "block.create.sequenced_gearshift.tooltip.behaviour1": "입력 속도에 따른 프로그램된 명령들을 수행하기 시작합니다.", + "block.create.sequenced_gearshift.tooltip.condition2": "우클릭했을 때", + "block.create.sequenced_gearshift.tooltip.behaviour2": "설정 창을 엽니다.", "block.create.cart_assembler.tooltip": "CART ASSEMBLER", - "block.create.cart_assembler.tooltip.summary": "지나가는 _ê´‘ì‚°_ _수레_ì—� ì—°ê²°ë�œ 구조물ì�„ 붙입니다.", - "block.create.cart_assembler.tooltip.condition1": "레드스톤 신호를 ë°›ì�„ ë•Œ", - "block.create.cart_assembler.tooltip.behaviour1": "지나가는 ê´‘ì‚° 수레ì—� 장착ë�œ 구조물ì�„ 분리시키고 조립기ì—� 다시 설치합니다.", + "block.create.cart_assembler.tooltip.summary": "지나가는 _광산_ _수레_에 연결된 구조물을 붙입니다.", + "block.create.cart_assembler.tooltip.condition1": "레드스톤 신호를 받을 때", + "block.create.cart_assembler.tooltip.behaviour1": "지나가는 광산 수레에 장착된 구조물을 분리시키고 조립기에 다시 설치합니다.", "block.create.cart_assembler.tooltip.condition2": "UNLOCALIZED: When placed above Powered Rail", "block.create.cart_assembler.tooltip.behaviour2": "UNLOCALIZED: _Assembles_ and _accelerates_ _carts_ _when_ _powered_, _disassembles_ and _holds_ them _otherwise_.", "block.create.cart_assembler.tooltip.condition3": "UNLOCALIZED: When placed above Detector Rail", @@ -1461,39 +1234,39 @@ "block.create.cart_assembler.tooltip.behaviour4": "UNLOCALIZED: _Disassembles_ _carts_ when _powered_.", "block.create.rope_pulley.tooltip": "ROPE PULLEY", - "block.create.rope_pulley.tooltip.summary": "_수ì§�으로_ 붙ì�€ 구조물ì�„ 움ì§�입니다. _섀시_나 _슬ë�¼ìž„_ _블럭_ì�„ 붙여 ì�¼ì§�ì„ ì�˜ 블럭들ì�„ 움ì§�ì�¼ 수 있습니다.", - "block.create.rope_pulley.tooltip.condition1": "회전ë�  ë•Œ", - "block.create.rope_pulley.tooltip.behaviour1": "ì—°ê²°ë�œ 구조물ì�„ 움ì§�ì�´ê¸° 시작합니다. ì†�ë�„와 ë°©í–¥ì�€ 들어오는 회전 ì†�ë�„, ë°©í–¥ì—� ë”°ë�¼ 다릅니다.", + "block.create.rope_pulley.tooltip.summary": "_수직으로_ 붙은 구조물을 움직입니다. _섀시_나 _슬라임_ _블럭_을 붙여 일직선의 블럭들을 움직일 수 있습니다.", + "block.create.rope_pulley.tooltip.condition1": "회전될 때", + "block.create.rope_pulley.tooltip.behaviour1": "연결된 구조물을 움직이기 시작합니다. 속도와 방향은 들어오는 회전 속도, 방향에 따라 다릅니다.", "block.create.linear_chassis.tooltip": "TRANSLATION CHASSIS", - "block.create.linear_chassis.tooltip.summary": "ì—°ê²°ë�œ 구조물ì�˜ ì�´ë�™ì�„ 위한 ë² ì�´ìŠ¤ 블럭입니다.", - "block.create.linear_chassis.tooltip.condition1": "움ì§�ì�¼ ë•Œ", - "block.create.linear_chassis.tooltip.behaviour1": "섀시ì�˜ _기둥_ _ë°©í–¥_으로 붙어있는 모든 블럭들ì�„ ê°™ì�€ 방향으로 옮ê¹�니다. 블럭들ì�€ 섀시가 ë�ˆë�ˆí•  때만 당겨집니다 ([Ctrl]를 누르세요).", - "block.create.linear_chassis.tooltip.condition2": "렌치로 ì¡°ì •í•  ë•Œ", - "block.create.linear_chassis.tooltip.behaviour2": "대ìƒ� 섀시ì�˜ 사거리를 조정합니다. ë˜�는 CTRLì�„ 눌러 ì�¸ì ‘í•œ 모든 섀시ì�˜ 사거리를 조정합니다.", - "block.create.linear_chassis.tooltip.control1": "슬ë�¼ìž„ 볼로 ìš°í�´ë¦­", - "block.create.linear_chassis.tooltip.action1": "대ìƒ� ë©´ì�„ ë�ˆë�ˆí•˜ê²Œ 만듭니다. 당겨질 ë•Œ, 섀시는 ì—°ê²°ë�œ _모든_ _블럭_ì�„ 움ì§�ì�´ëŠ” ë°©í–¥ì—� ìƒ�관없ì�´ 당ê¹�니다.", + "block.create.linear_chassis.tooltip.summary": "연결된 구조물의 이동을 위한 베이스 블럭입니다.", + "block.create.linear_chassis.tooltip.condition1": "움직일 때", + "block.create.linear_chassis.tooltip.behaviour1": "섀시의 _기둥_ _방향_으로 붙어있는 모든 블럭들을 같은 방향으로 옮깁니다. 블럭들은 섀시가 끈끈할 때만 당겨집니다 ([Ctrl]를 누르세요).", + "block.create.linear_chassis.tooltip.condition2": "렌치로 조정할 때", + "block.create.linear_chassis.tooltip.behaviour2": "대상 섀시의 사거리를 조정합니다. 또는 CTRL을 눌러 인접한 모든 섀시의 사거리를 조정합니다.", + "block.create.linear_chassis.tooltip.control1": "슬라임 볼로 우클릭", + "block.create.linear_chassis.tooltip.action1": "대상 면을 끈끈하게 만듭니다. 당겨질 때, 섀시는 연결된 _모든_ _블럭_을 움직이는 방향에 상관없이 당깁니다.", "block.create.radial_chassis.tooltip": "ROTATION CHASSIS", - "block.create.radial_chassis.tooltip.summary": "ì—°ê²°ë�œ 구조물ì�˜ ì�´ë�™ì�„ 위한 ë² ì�´ìŠ¤ 블럭입니다.", - "block.create.radial_chassis.tooltip.condition1": "움ì§�ì�¼ ë•Œ", - "block.create.radial_chassis.tooltip.behaviour1": "섀시ì�˜ _ì›�_ _ë°©í–¥_으로 붙어있는 모든 블럭들ì�„ ê°™ì�€ 방향으로 옮ê¹�니다. 블럭들ì�´ 섀시가 ë�ˆë�ˆí•œ ë©´ì—� 붙어있ì�„ 때만 움ì§�입니다 ([Ctrl]를 누르세요).", - "block.create.radial_chassis.tooltip.condition2": "렌치로 ì¡°ì •í•  ë•Œ", - "block.create.radial_chassis.tooltip.behaviour2": "대ìƒ� 섀시ì�˜ 사거리를 조정합니다. ë˜�는 CTRLì�„ 눌러 ì�¸ì ‘í•œ 모든 섀시ì�˜ 사거리를 조정합니다.", - "block.create.radial_chassis.tooltip.control1": "슬ë�¼ìž„ 볼로 ìš°í�´ë¦­", - "block.create.radial_chassis.tooltip.action1": "대ìƒ� ë©´ì�„ ë�ˆë�ˆí•˜ê²Œ 만듭니다. 당겨질 ë•Œ, ë�ˆë�ˆí•œ ë©´ì—� 붙ì�€ _모든_ _블럭_ì�„ 움ì§�ì�´ê²Œ 합니다", + "block.create.radial_chassis.tooltip.summary": "연결된 구조물의 이동을 위한 베이스 블럭입니다.", + "block.create.radial_chassis.tooltip.condition1": "움직일 때", + "block.create.radial_chassis.tooltip.behaviour1": "섀시의 _원_ _방향_으로 붙어있는 모든 블럭들을 같은 방향으로 옮깁니다. 블럭들이 섀시가 끈끈한 면에 붙어있을 때만 움직입니다 ([Ctrl]를 누르세요).", + "block.create.radial_chassis.tooltip.condition2": "렌치로 조정할 때", + "block.create.radial_chassis.tooltip.behaviour2": "대상 섀시의 사거리를 조정합니다. 또는 CTRL을 눌러 인접한 모든 섀시의 사거리를 조정합니다.", + "block.create.radial_chassis.tooltip.control1": "슬라임 볼로 우클릭", + "block.create.radial_chassis.tooltip.action1": "대상 면을 끈끈하게 만듭니다. 당겨질 때, 끈끈한 면에 붙은 _모든_ _블럭_을 움직이게 합니다", "block.create.mechanical_drill.tooltip": "MECHANICAL mechanical_drill", - "block.create.mechanical_drill.tooltip.summary": "블럭ì�„ _파괴하는_ ë�° ì �í•©í•œ 장치입니다. ë² ì–´ë§�ì�´ë‚˜ 기계ì‹� 피스톤으로 움ì§�여집니다.", - "block.create.mechanical_drill.tooltip.condition1": "회전ë�  ë•Œ", - "block.create.mechanical_drill.tooltip.behaviour1": "ê³ ì •ë�˜ì–´ 블럭ì�„ 부숩니다. ë˜�í•œ 해당ì˜�ì—­ì�˜ 엔티티ì—�게 피해를 ì¤�니다.", - "block.create.mechanical_drill.tooltip.condition2": "움ì§�ì�¼ ë•Œ", - "block.create.mechanical_drill.tooltip.behaviour2": "드릴ì�´ 부딫히는 모든 블럭ì�„ 부숩니다.", + "block.create.mechanical_drill.tooltip.summary": "블럭을 _파괴하는_ 데 적합한 장치입니다. 베어링이나 기계식 피스톤으로 움직여집니다.", + "block.create.mechanical_drill.tooltip.condition1": "회전될 때", + "block.create.mechanical_drill.tooltip.behaviour1": "고정되어 블럭을 부숩니다. 또한 해당영역의 엔티티에게 피해를 줍니다.", + "block.create.mechanical_drill.tooltip.condition2": "움직일 때", + "block.create.mechanical_drill.tooltip.behaviour2": "드릴이 부딫히는 모든 블럭을 부숩니다.", "block.create.mechanical_harvester.tooltip": "MECHANICAL mechanical_harvester", - "block.create.mechanical_harvester.tooltip.summary": "중간 í�¬ê¸°ì�˜ 작물 ìž�ë�™í™”ì—� ì �í•©í•œ _작물_ _수확기_입니다. ë² ì–´ë§�ì�´ë‚˜ 기계ì‹� 피스톤으로 움ì§�여집니다.", - "block.create.mechanical_harvester.tooltip.condition1": "움ì§�ì�¼ ë•Œ", - "block.create.mechanical_harvester.tooltip.behaviour1": "칼날ì—� 닿는 모ë‘� ìž�란 작물ì�„ 수확하고 최초 성장 ìƒ�태로 변경합니다.", + "block.create.mechanical_harvester.tooltip.summary": "중간 크기의 작물 자동화에 적합한 _작물_ _수확기_입니다. 베어링이나 기계식 피스톤으로 움직여집니다.", + "block.create.mechanical_harvester.tooltip.condition1": "움직일 때", + "block.create.mechanical_harvester.tooltip.behaviour1": "칼날에 닿는 모두 자란 작물을 수확하고 최초 성장 상태로 변경합니다.", "block.create.mechanical_plough.tooltip": "UNLOCALIZED: MECHANICAL PLOUGH", "block.create.mechanical_plough.tooltip.summary": "UNLOCALIZED: A mechanical plough has a variety of uses. It is movable with _Mechanical_ _Pistons_, _Bearings_ or other controllers.", @@ -1501,31 +1274,31 @@ "block.create.mechanical_plough.tooltip.behaviour1": "UNLOCALIZED: _Breaks_ _blocks_ which _cannot_ _be_ _collided_ with, such as torches, tracks or snow layers. _Applies_ its _motion_ to _entities_ without hurting them. _Tills_ _soil_ _blocks_ as though a Hoe would be used on them.", "block.create.mechanical_saw.tooltip": "MECHANICAL mechanical_saw", - "block.create.mechanical_saw.tooltip.summary": "효율ì �ì�¸ _벌목_ê³¼ 블럭ì�„ _제재_하는ë�° ì �합합니다. ë² ì–´ë§�ì�´ë‚˜ 기계ì‹� 피스톤으로 움ì§�여집니다.", - "block.create.mechanical_saw.tooltip.condition1": "위를 ë°”ë�¼ë³¼ ë•Œ", - "block.create.mechanical_saw.tooltip.behaviour1": "_제재_와 _ì„�재_ _절단_ 조합법ì�„ 떨어진/투입ë�œ ì•„ì�´í…œì—� ì �용합니다. 결과물ì�´ 여러 종류고 í•„í„°ê°€ ì �ìš©ì�´ ë�˜ì§€ 않았다면, 결과물ì�€ _목ë¡�_ _순서_대로 배출ë�©ë‹ˆë‹¤.", - "block.create.mechanical_saw.tooltip.condition2": "옆ì�„ ë°”ë�¼ë³¼ ë•Œ", - "block.create.mechanical_saw.tooltip.behaviour2": "ì•žì—� 있는 ì›�목ì�„ ìž�릅니다. 나무ì�˜ ì›�목ì�´ë�¼ë©´, 나무가 쓰러지면서 ì•„ì�´í…œì�„ 떨굽니다.", - "block.create.mechanical_saw.tooltip.condition3": "움ì§�ì�¼ ë•Œ", - "block.create.mechanical_saw.tooltip.behaviour3": "톱ì�´ 만나는 모든 나무를 벱니다.", + "block.create.mechanical_saw.tooltip.summary": "효율적인 _벌목_과 블럭을 _제재_하는데 적합합니다. 베어링이나 기계식 피스톤으로 움직여집니다.", + "block.create.mechanical_saw.tooltip.condition1": "위를 바라볼 때", + "block.create.mechanical_saw.tooltip.behaviour1": "_제재_와 _석재_ _절단_ 조합법을 떨어진/투입된 아이템에 적용합니다. 결과물이 여러 종류고 필터가 적용이 되지 않았다면, 결과물은 _목록_ _순서_대로 배출됩니다.", + "block.create.mechanical_saw.tooltip.condition2": "옆을 바라볼 때", + "block.create.mechanical_saw.tooltip.behaviour2": "앞에 있는 원목을 자릅니다. 나무의 원목이라면, 나무가 쓰러지면서 아이템을 떨굽니다.", + "block.create.mechanical_saw.tooltip.condition3": "움직일 때", + "block.create.mechanical_saw.tooltip.behaviour3": "톱이 만나는 모든 나무를 벱니다.", "block.create.stockpile_switch.tooltip": "stockpile_switch", - "block.create.stockpile_switch.tooltip.summary": "붙어있는 _저장소_ì—� _여유_ _공간_ì�„ 기반으로 레드스톤 신호를 보냅니다.", - "block.create.stockpile_switch.tooltip.condition1": "_최소_ _경계_보다 ë‚®ì�„ 경우", - "block.create.stockpile_switch.tooltip.behaviour1": "레드스톤 신호를 보내지 않습니다.", - "block.create.stockpile_switch.tooltip.condition2": "_최초_ _경계_보다 높ì�„ 경우", - "block.create.stockpile_switch.tooltip.behaviour2": "최소 경계ì—� 다시 ë�„달할 때까지 레드스톤 신호를 보냅니다.", - "block.create.stockpile_switch.tooltip.control1": "ìš°í�´ë¦­í–ˆì�„ ë•Œ", - "block.create.stockpile_switch.tooltip.action1": "설정 ì°½ì�„ 엽니다.", + "block.create.stockpile_switch.tooltip.summary": "붙어있는 _저장소_에 _여유_ _공간_을 기반으로 레드스톤 신호를 보냅니다.", + "block.create.stockpile_switch.tooltip.condition1": "_최소_ _경계_보다 낮을 경우", + "block.create.stockpile_switch.tooltip.behaviour1": "레드스톤 신호를 보내지 않습니다.", + "block.create.stockpile_switch.tooltip.condition2": "_최초_ _경계_보다 높을 경우", + "block.create.stockpile_switch.tooltip.behaviour2": "최소 경계에 다시 도달할 때까지 레드스톤 신호를 보냅니다.", + "block.create.stockpile_switch.tooltip.control1": "우클릭했을 때", + "block.create.stockpile_switch.tooltip.action1": "설정 창을 엽니다.", "block.create.redstone_link.tooltip": "REDSTONE LINK", - "block.create.redstone_link.tooltip.summary": "_무선_ 레드스톤 단ë§�기입니다. 아무 ì•„ì�´í…œìœ¼ë¡œ ë‘� ê°œì�˜ _주파수_를 설정할 수 있습니다. 통신거리는 제한ë�˜ì–´ 있지만, 그래ë�„ 충분히 넓습니다.", - "block.create.redstone_link.tooltip.condition1": "신호를 줄 ë•Œ", - "block.create.redstone_link.tooltip.behaviour1": "ê°™ì�€ 주파주ì�˜ 다른 단ë§�기ì—�ì„œ 레드스톤 신호를 받습니다.", - "block.create.redstone_link.tooltip.control1": "ì•„ì�´í…œì�„ 들고 ìš°í�´ë¦­", - "block.create.redstone_link.tooltip.action1": "ê·¸ ì•„ì�´í…œìœ¼ë¡œ 주파수를 설정합니다. 주파수는 최대 ë‘�가지 ì•„ì�´í…œ 조합으로 ì�´ë£° 수 있습니다.", - "block.create.redstone_link.tooltip.control2": "ì›…í�¬ë¦° ìƒ�태ì—�ì„œ ìš°í�´ë¦­", - "block.create.redstone_link.tooltip.action2": "수신/발신 모드로 바꿉니다.", + "block.create.redstone_link.tooltip.summary": "_무선_ 레드스톤 단말기입니다. 아무 아이템으로 두 개의 _주파수_를 설정할 수 있습니다. 통신거리는 제한되어 있지만, 그래도 충분히 넓습니다.", + "block.create.redstone_link.tooltip.condition1": "신호를 줄 때", + "block.create.redstone_link.tooltip.behaviour1": "같은 주파주의 다른 단말기에서 레드스톤 신호를 받습니다.", + "block.create.redstone_link.tooltip.control1": "아이템을 들고 우클릭", + "block.create.redstone_link.tooltip.action1": "그 아이템으로 주파수를 설정합니다. 주파수는 최대 두가지 아이템 조합으로 이룰 수 있습니다.", + "block.create.redstone_link.tooltip.control2": "웅크린 상태에서 우클릭", + "block.create.redstone_link.tooltip.action2": "수신/발신 모드로 바꿉니다.", "block.create.nixie_tube.tooltip": "UNLOCALIZED: NIXIE TUBE", "block.create.nixie_tube.tooltip.summary": "UNLOCALIZED: A fancy redstone-powered _Number_ _Display_ ranging from 0 to 15.", @@ -1533,89 +1306,89 @@ "block.create.nixie_tube.tooltip.behaviour1": "UNLOCALIZED: Shows the current redstone _Signal_ _Strength_ as its displayed value.", "block.create.redstone_contact.tooltip": "REDSTONE redstone_contact", - "block.create.redstone_contact.tooltip.summary": "_í•œ_ _ìŒ�_ì�´ _서로_ _ë°”ë�¼ë³´ê³ _ 있ì�„ ë•Œ 레드스톤 신호를 보냅니다. ë² ì–´ë§�ì�´ë‚˜ 기계ì‹� 피스톤으로 움ì§�여집니다.", - "block.create.redstone_contact.tooltip.condition1": "다른 ë�™í˜• ê°�지기를 맞댈 ë•Œ", - "block.create.redstone_contact.tooltip.behaviour1": "레드스톤 신호를 보냅니다.", - "block.create.redstone_contact.tooltip.condition2": "움ì§�ì�¼ ë•Œ", - "block.create.redstone_contact.tooltip.behaviour2": "지나가는 모든 ê³ ì •ë�œ ë�™í˜• ê°�지기를 ìž‘ë�™ì‹œí‚µë‹ˆë‹¤.", + "block.create.redstone_contact.tooltip.summary": "_한_ _쌍_이 _서로_ _바라보고_ 있을 때 레드스톤 신호를 보냅니다. 베어링이나 기계식 피스톤으로 움직여집니다.", + "block.create.redstone_contact.tooltip.condition1": "다른 동형 감지기를 맞댈 때", + "block.create.redstone_contact.tooltip.behaviour1": "레드스톤 신호를 보냅니다.", + "block.create.redstone_contact.tooltip.condition2": "움직일 때", + "block.create.redstone_contact.tooltip.behaviour2": "지나가는 모든 고정된 동형 감지기를 작동시킵니다.", "block.create.adjustable_crate.tooltip": "ADJUSTABLE CRATE", - "block.create.adjustable_crate.tooltip.summary": "ì�´ 저장소는 용량ì�„ _ì§�ì ‘_ _ì •í• _ 수 있습니다. 아무아ì�´í…œì�´ë‚˜ 최대 16스íƒ�씩 ë‹´ì�„ 수 있습니다. 레드스톤 비êµ�기와 호환ë�©ë‹ˆë‹¤.", - "block.create.adjustable_crate.tooltip.control1": "ìš°í�´ë¦­ í–ˆì�„ ë•Œ", - "block.create.adjustable_crate.tooltip.action1": "ì°½ì�„ 엽니다.", + "block.create.adjustable_crate.tooltip.summary": "이 저장소는 용량을 _직접_ _정할_ 수 있습니다. 아무아이템이나 최대 16스택씩 담을 수 있습니다. 레드스톤 비교기와 호환됩니다.", + "block.create.adjustable_crate.tooltip.control1": "우클릭 했을 때", + "block.create.adjustable_crate.tooltip.action1": "창을 엽니다.", "block.create.creative_crate.tooltip": "CREATIVE CRATE", - "block.create.creative_crate.tooltip.summary": "옆 _청사진 대í�¬_ì—� _무한한_ 재료를 공급합니다.", + "block.create.creative_crate.tooltip.summary": "옆 _청사진 대포_에 _무한한_ 재료를 공급합니다.", "block.create.creative_crate.tooltip.condition1": "UNLOCALIZED: When Item in Filter Slot", "block.create.creative_crate.tooltip.behaviour1": "UNLOCALIZED: Anything _extracting_ from this container will provide an _endless_ _supply_ of the item specified. Items _inserted_ into this crate will be _voided._", "block.create.deployer.tooltip": "DEPLOYER", - "block.create.deployer.tooltip.summary": " _때리고_, _사용하고_ _ìž‘ë�™ì‹œí‚µë‹ˆë‹¤_. ì�´ 장치는 _플레ì�´ì–´_를 가능한 í•œ _í�‰ë‚´ë‚´ë ¤í• _ _것입니다_. 주변 ì�¸ë²¤í† ë¦¬ì—�ì„œ ì•„ì�´í…œì�„ 쓰거나 ë„£ì�„ 수 있습니다. í•„í„°ë¡œ 사용하는 ì•„ì�´í…œì�„ 설정할 수 있습니다.", - "block.create.deployer.tooltip.condition1": "회전ë�  ë•Œ", - "block.create.deployer.tooltip.behaviour1": "팔ì�„ 늘려 í•œ 칸앞ì—� 있는 공간ì—�ì„œ í–‰ë�™í•©ë‹ˆë‹¤.", - "block.create.deployer.tooltip.condition2": "렌치로 ìš°í�´ë¦­", - "block.create.deployer.tooltip.behaviour2": "_펀치_ _모드_ë¡œ 바꿉니다. ì�´ ìƒ�태ì—�서는 ë°°í�¬ê¸°ê°€ ì•„ì�´í…œì�„ 가지고 _부수거나_ _때리려고_ í•  것입니다.", + "block.create.deployer.tooltip.summary": " _때리고_, _사용하고_ _작동시킵니다_. 이 장치는 _플레이어_를 가능한 한 _흉내내려할_ _것입니다_. 주변 인벤토리에서 아이템을 쓰거나 넣을 수 있습니다. 필터로 사용하는 아이템을 설정할 수 있습니다.", + "block.create.deployer.tooltip.condition1": "회전될 때", + "block.create.deployer.tooltip.behaviour1": "팔을 늘려 한 칸앞에 있는 공간에서 행동합니다.", + "block.create.deployer.tooltip.condition2": "렌치로 우클릭", + "block.create.deployer.tooltip.behaviour2": "_펀치_ _모드_로 바꿉니다. 이 상태에서는 배포기가 아이템을 가지고 _부수거나_ _때리려고_ 할 것입니다.", "block.create.funnel.tooltip": "FUNNEL", - "block.create.funnel.tooltip.summary": "들어오는 ì•„ì�´í…œì�„ 가능하면 _ì—°ê²°ë�œ_ _ì�¸ë²¤í† ë¦¬_ì—� 넣습니다. _벨트_ _위_ì�˜ ì•„ì�´í…œë�„ ë�Œì–´ì˜¬ 수 있습니다.", - "block.create.funnel.tooltip.condition1": "움ì§�ì�´ëŠ” 벨트위ì—� 있ì�„ ë•Œ", - "block.create.funnel.tooltip.behaviour1": "_벨트_ì�˜ _중간_, _ë��부분_ì—�ì„œ ì•„ì�´í…œì�„ ë�Œì–´ì˜¬ 수 있습니다. 중간ì—� 설치ë�œ 깔때기가 _ì •ì²´_ë�˜ì—ˆì�„ ë•�, 벨트가 _멈춥니다_.", + "block.create.funnel.tooltip.summary": "들어오는 아이템을 가능하면 _연결된_ _인벤토리_에 넣습니다. _벨트_ _위_의 아이템도 끌어올 수 있습니다.", + "block.create.funnel.tooltip.condition1": "움직이는 벨트위에 있을 때", + "block.create.funnel.tooltip.behaviour1": "_벨트_의 _중간_, _끝부분_에서 아이템을 끌어올 수 있습니다. 중간에 설치된 깔때기가 _정체_되었을 땐, 벨트가 _멈춥니다_.", "block.create.belt_tunnel.tooltip": "BELT TUNNEL", - "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": "륵면ì�„ ìš°í�´ë¦­", - "block.create.belt_tunnel.tooltip.action2": "í„°ë„� 측면ì—� 창문ì�´ 있다면 창문 셔터를 조절합니다.", + "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": "륵면을 우클릭", + "block.create.belt_tunnel.tooltip.action2": "터널 측면에 창문이 있다면 창문 셔터를 조절합니다.", "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.summary": "다양한 용도가 있는 단단한 기계 케이스입니다. 꾸미는 용도로도 사용 가능합니다.", + "block.create.brass_casing.tooltip.condition1": "컨베이어 벨트에 사용할 때", + "block.create.brass_casing.tooltip.behaviour1": "벨트 밑 부분에 황동 케이스를 씌웁니다. 이 상태에선 _벨트_ _터널_, _추출기_, _깔대기_, _트랜스포저_를 벨트 _측면_, _바닥면_에 연결할 수 있습니다.", "block.create.belt_observer.tooltip": "BELT OBSERVER", - "block.create.belt_observer.tooltip.summary": "컨베ì�´ì–´ 벨트위를 _지나가는_ _엔티티_나 _ì•„ì�´í…œ_ì�„ ê°�지합니다. 렌치를 ì�´ìš©í•´ _ê°�지시_ _í–‰ë�™_ì�„ 바꿉니다. 필터를 설정할 수 있습니다.", - "block.create.belt_observer.tooltip.condition1": "ê°�지 모드", - "block.create.belt_observer.tooltip.behaviour1": "ê°�지기 ì•žì—� ì•„ì�´í…œì�´ _지나가는_ _ë�™ì•ˆ_ 레드스톤 신호를 ì¤�니다.", - "block.create.belt_observer.tooltip.condition2": "펄스 모드", - "block.create.belt_observer.tooltip.behaviour2": "ê°�지기 ì•žì—� ì•„ì�´í…œì�´ _지나갈_ _ë•Œ_ 레드스톤 신호를 _1틱_ ì¤�니다.", - "block.create.belt_observer.tooltip.condition3": "사출 모드", - "block.create.belt_observer.tooltip.behaviour3": "옆으로 ì•„ì�´í…œì�„ _밀어냅니다_. 벨트나 밀어내는 공간ì�´ _ì •ì²´_ë�˜ì–´ 있다면, ì•„ì�´í…œì�€ ê°�지기 ì•žì—�ì„œ _멈춥니다_.", - "block.create.belt_observer.tooltip.condition4": "분리 모드", - "block.create.belt_observer.tooltip.behaviour4": "ì•„ì�´í…œì�˜ _수_를 _반으로_ _나누어_ ë°˜ì�€ 벨트 옆으로 내보냅니다.", + "block.create.belt_observer.tooltip.summary": "컨베이어 벨트위를 _지나가는_ _엔티티_나 _아이템_을 감지합니다. 렌치를 이용해 _감지시_ _행동_을 바꿉니다. 필터를 설정할 수 있습니다.", + "block.create.belt_observer.tooltip.condition1": "감지 모드", + "block.create.belt_observer.tooltip.behaviour1": "감지기 앞에 아이템이 _지나가는_ _동안_ 레드스톤 신호를 줍니다.", + "block.create.belt_observer.tooltip.condition2": "펄스 모드", + "block.create.belt_observer.tooltip.behaviour2": "감지기 앞에 아이템이 _지나갈_ _때_ 레드스톤 신호를 _1틱_ 줍니다.", + "block.create.belt_observer.tooltip.condition3": "사출 모드", + "block.create.belt_observer.tooltip.behaviour3": "옆으로 아이템을 _밀어냅니다_. 벨트나 밀어내는 공간이 _정체_되어 있다면, 아이템은 감지기 앞에서 _멈춥니다_.", + "block.create.belt_observer.tooltip.condition4": "분리 모드", + "block.create.belt_observer.tooltip.behaviour4": "아이템의 _수_를 _반으로_ _나누어_ 반은 벨트 옆으로 내보냅니다.", "block.create.pulse_repeater.tooltip": "PULSE REPEATER", - "block.create.pulse_repeater.tooltip.summary": "_1틱_ì�˜ 레드스톤 신호를 보내는 간단한 리피터입니다.", + "block.create.pulse_repeater.tooltip.summary": "_1틱_의 레드스톤 신호를 보내는 간단한 리피터입니다.", "block.create.adjustable_repeater.tooltip": "FLEX REPEATER", - "block.create.adjustable_repeater.tooltip.summary": "최대 30분까지 _딜레ì�´_를 설정할 수 있는 업그레ì�´ë“œë�œ _레드스톤_ _리피터_입니다.", + "block.create.adjustable_repeater.tooltip.summary": "최대 30분까지 _딜레이_를 설정할 수 있는 업그레이드된 _레드스톤_ _리피터_입니다.", "block.create.adjustable_pulse_repeater.tooltip": "FLEX PULSE REPEATER", - "block.create.adjustable_pulse_repeater.tooltip.summary": "최대 30분까지 _딜레ì�´_를 설정할 수 있는 _펄스_ _리피터_입니다.", + "block.create.adjustable_pulse_repeater.tooltip.summary": "최대 30분까지 _딜레이_를 설정할 수 있는 _펄스_ _리피터_입니다.", "block.create.analog_lever.tooltip": "ANALOG LEVER", - "block.create.analog_lever.tooltip.summary": "레드스톤 _신호_ _세기_를 ìž�세히 _ì¡°ì •_í•  수 있는 레버입니다.", + "block.create.analog_lever.tooltip.summary": "레드스톤 _신호_ _세기_를 자세히 _조정_할 수 있는 레버입니다.", "block.create.powered_toggle_latch.tooltip": "POWERED TOGGLE LATCH", - "block.create.powered_toggle_latch.tooltip.summary": "레드스톤 신호로 ë�„ê³  켤 수 있는 _레버_입니다.", + "block.create.powered_toggle_latch.tooltip.summary": "레드스톤 신호로 끄고 켤 수 있는 _레버_입니다.", "block.create.powered_latch.tooltip": "POWERED LATCH", - "block.create.powered_latch.tooltip.summary": "레드스톤 신호로 컨트롤 í•  수 있는 _레버_입니다. 후면ì—�ì„œ 들어오는 신호는 레버를 키고, 측면ì—�ì„œ 들어오는 신호는 레버를 초기화합니다.", + "block.create.powered_latch.tooltip.summary": "레드스톤 신호로 컨트롤 할 수 있는 _레버_입니다. 후면에서 들어오는 신호는 레버를 키고, 측면에서 들어오는 신호는 레버를 초기화합니다.", "block.create.speedometer.tooltip": "SPEEDOMETER", - "block.create.speedometer.tooltip.summary": "ì—°ê²°ë�œ 장치ì�˜ _회전_ _ì†�ë�„_를 _계측_하고 _나타냅니다_. 레드스톤 비êµ�기와 호환ë�©ë‹ˆë‹¤.", - "block.create.speedometer.tooltip.condition1": "회전ë�  ë•Œ", - "block.create.speedometer.tooltip.behaviour1": "ì†�ë�„ì—� ë”°ë�¼ 색깔ì�„ 나타냅니다. _ì´ˆë¡�색_ì�€ _ëŠ�림_ì�„, _파랑색_ì�€ _보통_, _ë³´ë�¼ìƒ‰_ì�€ _빠른_ _ì†�ë�„_를 나타냅니다. 몇몇 장치들ì�€ ìž‘ë�™í•˜ê¸° 위해 ì�¼ì •ìˆ˜ì¤€ ì�´ìƒ�ì�˜ ì†�ë�„ê°€ 필요합니다.", + "block.create.speedometer.tooltip.summary": "연결된 장치의 _회전_ _속도_를 _계측_하고 _나타냅니다_. 레드스톤 비교기와 호환됩니다.", + "block.create.speedometer.tooltip.condition1": "회전될 때", + "block.create.speedometer.tooltip.behaviour1": "속도에 따라 색깔을 나타냅니다. _초록색_은 _느림_을, _파랑색_은 _보통_, _보라색_은 _빠른_ _속도_를 나타냅니다. 몇몇 장치들은 작동하기 위해 일정수준 이상의 속도가 필요합니다.", "block.create.stressometer.tooltip": "STRESSOMETER", - "block.create.stressometer.tooltip.summary": "ì—°ê²°ë�œ 네트워í�¬ì�˜ _ì „ì²´_ _피로ë�„_ _수치_를 _계측_하고 _나타냅니다_. 레드스톤 비êµ�기와 호환ë�©ë‹ˆë‹¤.", - "block.create.stressometer.tooltip.condition1": "회전ë�  ë•Œ", - "block.create.stressometer.tooltip.behaviour1": "피로ë�„ì—� ë”°ë�¼ 색깔ì�„ 나타냅니다. _과부화ë�œ_ _네트워í�¬_는 움ì§�ì�´ëŠ” 것ì�„ 멈춥니다. 과부하는 네트워í�¬ì—� _추가_ _피로ë�„_ _용량_ì�„ 가진 장치를 설치하면 í•´ê²°ë�©ë‹ˆë‹¤. ", + "block.create.stressometer.tooltip.summary": "연결된 네트워크의 _전체_ _피로도_ _수치_를 _계측_하고 _나타냅니다_. 레드스톤 비교기와 호환됩니다.", + "block.create.stressometer.tooltip.condition1": "회전될 때", + "block.create.stressometer.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": "_반대_ _ì†�_ì—� 있는, 혹ì�€ _바닥ì—�_ _있는_ ì•„ì�´í…œì�„ 사í�¬ì§ˆ 합니다.", + "tool.create.sand_paper.tooltip.summary": "재료를 _사포질_ 하기위한 거친 종이입니다. 배포기를 통해 자동으로 쓰일 수 있습니다.", + "tool.create.sand_paper.tooltip.condition1": "사용할 때", + "tool.create.sand_paper.tooltip.behaviour1": "_반대_ _손_에 있는, 혹은 _바닥에_ _있는_ 아이템을 사포질 합니다.", "item.create.super_glue.tooltip": "UNLOCALIZED: SUPER GLUE", "item.create.super_glue.tooltip.summary": "UNLOCALIZED: Glue a block to another, and they will forever be inseparable.", @@ -1625,13 +1398,13 @@ "item.create.super_glue.tooltip.behaviour2": "UNLOCALIZED: _Automatically_ _attaches_ blocks placed from the main hand to the _side_ they were _placed_ _against._", "item.create.refined_radiance.tooltip": "REFINED RADIANCE", - "item.create.refined_radiance.tooltip.summary": "_í�¡ìˆ˜ë�œ_ _ë¹›_으로 제련ë�œ 색채 혼합물입니다.", + "item.create.refined_radiance.tooltip.summary": "_흡수된_ _빛_으로 제련된 색채 혼합물입니다.", "item.create.shadow_steel.tooltip": "SHADOW STEEL", - "item.create.shadow_steel.tooltip.summary": "_공허_ì—�ì„œ 제련ë�œ 색채 혼합물입니다.", + "item.create.shadow_steel.tooltip.summary": "_공허_에서 제련된 색채 혼합물입니다.", "item.create.crafter_slot_cover.tooltip": "SLOT COVER", - "item.create.crafter_slot_cover.tooltip.summary": "기계 조합기ì—�ì„œ _빈_ _슬롯_ì�„ 표시하기 위해 쓰입니다. 조합기들ì�€ 정사ê°�형 모양ì�„ 형성할 필요는 없습니다. 재료가 서로 대ê°�ì„ ì�¸ 조합법ì�´ìžˆì�„ ë•Œ 유용합니다.", + "item.create.crafter_slot_cover.tooltip.summary": "기계 조합기에서 _빈_ _슬롯_을 표시하기 위해 쓰입니다. 조합기들은 정사각형 모양을 형성할 필요는 없습니다. 재료가 서로 대각선인 조합법이있을 때 유용합니다.", "create.tooltip.wip": "WIP", "create.tooltip.workInProgress": "Work in progress!", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index c75bb4555..4f50be3b3 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -588,11 +588,11 @@ "create.gui.scrollInput.scrollToSelect": "Scroll om te selecteren", "create.gui.scrollInput.shiftScrollsFaster": "Shift om sneller te Scrollen", "create.gui.toolmenu.focusKey": "Hou [%1$s] ingedrukt om te Focusen", - "create.gui.toolmenu.cycle": "[SCROLL] om te Cycleën", + "create.gui.toolmenu.cycle": "[SCROLL] om te Cycleën", "create.gui.symmetryWand.mirrorType": "Spiegelen", "create.gui.symmetryWand.orientation": "Orientatie", - "create.symmetry.mirror.plane": "Spiegel één keer", + "create.symmetry.mirror.plane": "Spiegel één keer", "create.symmetry.mirror.doublePlane": "Rechthoekig", "create.symmetry.mirror.triplePlane": "Achthoekig", @@ -940,7 +940,7 @@ "item.create.wand_of_symmetry.tooltip.condition1": "Waneer in de Actiebalk", "item.create.wand_of_symmetry.tooltip.behaviour1": "Blijft actief", "item.create.wand_of_symmetry.tooltip.control1": "R-Klik op de Grond", - "item.create.wand_of_symmetry.tooltip.action1": "_Creëerd_ of _Beweegt_ de Spiegel", + "item.create.wand_of_symmetry.tooltip.action1": "_Creëerd_ of _Beweegt_ de Spiegel", "item.create.wand_of_symmetry.tooltip.control2": "R-Klik in de Lucht", "item.create.wand_of_symmetry.tooltip.action2": "_Verwijderd_ de actieve Spiegel", "item.create.wand_of_symmetry.tooltip.control3": "R-Klik terwijl je Sluipt", @@ -1015,7 +1015,7 @@ "item.create.schematic_and_quill.tooltip.action3": "_Resets_ en verwijderd de selectie.", "block.create.schematicannon.tooltip": "BOUWTEKENINGKANNON", - "block.create.schematicannon.tooltip.summary": "Schiet blokken om een gepostioneerde _Bouwtekening_ in de Wereld te creëeren. Gebruikt blokken uit naastgelegen inventarissen en _Buskruit_ als brandstof.", + "block.create.schematicannon.tooltip.summary": "Schiet blokken om een gepostioneerde _Bouwtekening_ in de Wereld te creëeren. Gebruikt blokken uit naastgelegen inventarissen en _Buskruit_ als brandstof.", "block.create.schematicannon.tooltip.control1": "Wanneer R-Geklikt", "block.create.schematicannon.tooltip.action1": "Opent de _Interface_", @@ -1065,7 +1065,7 @@ "item.create.belt_connector.tooltip": "TRANSPORTBAND CONNECTOR", "item.create.belt_connector.tooltip.summary": "Verbind twee _Drijfassen_ met een _Mechanische_ _Transportband._ Verbonden drijfassen zullen dezelfde rotatiesneheid en richting hebben. De Transportband kan ook Entiteiten transporteren", "item.create.belt_connector.tooltip.control1": "R-Klikken op drijfas", - "item.create.belt_connector.tooltip.action1": "Selecteer de Drijfas als een katrol van de transportband. Beide geselecteerde drijfassen moeten _verticaal_, _horizontaal_ of _diagonaal_ in _één_ _lijn_ staan in de richting van de Transportbanden.", + "item.create.belt_connector.tooltip.action1": "Selecteer de Drijfas als een katrol van de transportband. Beide geselecteerde drijfassen moeten _verticaal_, _horizontaal_ of _diagonaal_ in _één_ _lijn_ staan in de richting van de Transportbanden.", "item.create.belt_connector.tooltip.control2": "R-Klikken terwijl je sluipt", "item.create.belt_connector.tooltip.action2": "_Reset_ de eerste geselecteerde positie van de Transportband", @@ -1124,7 +1124,7 @@ "block.create.crushing_wheel.tooltip": "VERPULVERAAR", "block.create.crushing_wheel.tooltip.summary": "Grote draaibare wielen die alles _verpulveren_ wat hun tegen houdt.", "block.create.crushing_wheel.tooltip.condition1": "Wanneer aangesloten op een andere Verpulveraar", - "block.create.crushing_wheel.tooltip.behaviour1": "Creëert een verpulverende installatie voor het verwerken van verschillende dingen. De tanden van de wielen moeten met elkaar in redstone_contact staan en beweken met _dezelfde_ _snelheid_ in _tegenovergestelde_ _richting._", + "block.create.crushing_wheel.tooltip.behaviour1": "Creëert een verpulverende installatie voor het verwerken van verschillende dingen. De tanden van de wielen moeten met elkaar in redstone_contact staan en beweken met _dezelfde_ _snelheid_ in _tegenovergestelde_ _richting._", "block.create.mechanical_press.tooltip": "MECHANISCHE PERS", "block.create.mechanical_press.tooltip.summary": "Een krachtige zuiger voor het samenpersen van objecten onder zich. Heeft een constante _Rotatiekracht_ nodig.", @@ -1153,9 +1153,9 @@ "block.create.mechanical_mixer.tooltip": "MECHANISCHE MIXER", "block.create.mechanical_mixer.tooltip.summary": "Een kinetische garde voor het toepassen van vormloze recepten op objecten eronder. Vereist constante _Rotatiekracht_ en een _Bekken_ hieronder geplaatst (met een tussenruimte).", "block.create.mechanical_mixer.tooltip.condition1": "Wanneer boven een Bekken", - "block.create.mechanical_mixer.tooltip.behaviour1": "Begint objecten in het bekken te mengen wanneer alle benodigde ingrediënten aanwezig zijn.", + "block.create.mechanical_mixer.tooltip.behaviour1": "Begint objecten in het bekken te mengen wanneer alle benodigde ingrediënten aanwezig zijn.", "block.create.mechanical_mixer.tooltip.condition2": "Wanneer gebruikt met een Sleutel", - "block.create.mechanical_mixer.tooltip.behaviour2": "_Configureert_ de minimale hoeveelheid _totale_ _ingredienten_ voor toegepaste recepten. Gebruik deze optie om _ongewenste_ _recepten_ met vergelijkbare maar minder ingrediënten _te_ _vermijden._", + "block.create.mechanical_mixer.tooltip.behaviour2": "_Configureert_ de minimale hoeveelheid _totale_ _ingredienten_ voor toegepaste recepten. Gebruik deze optie om _ongewenste_ _recepten_ met vergelijkbare maar minder ingrediënten _te_ _vermijden._", "block.create.mechanical_crafter.tooltip": "UNLOCALIZED: MECHANICAL CRAFTER", "block.create.mechanical_crafter.tooltip.summary": "UNLOCALIZED: A kinetic assembler for _automating_ any _shaped_ _crafting_ recipe. Place _multiple_ _in_ _a_ _grid_ corresponding to your recipe, and _arrange_ _their_ _belts_ to create a _flow_ that exits the grid on one of the crafters.", @@ -1189,12 +1189,12 @@ "block.create.rotation_speed_controller.tooltip.behaviour1": "UNLOCALIZED: Relays incoming rotational force to the wheel, trying to _match_ the _speed_ it is configured to target. The _cogwheel_ has to be _attached_ _on_ _top_ of the controller.", "block.create.mechanical_piston.tooltip": "MECHANISCHE ZUIGER", - "block.create.mechanical_piston.tooltip.summary": "Een meer geavanceerde versie van de _Zuiger,_ die _Rotatiekracht_ gebruikt om gekoppelde constructies nauwkeurig te verplaatsen. _Zuiger_ _Verlgenpaalen_ aan de achterzijde definiëren het _Bereik_ van dit apparaat. Zonder verlengingen zal de zuiger niet bewegen. Gebruik _Lineaar_ _Frame_ om meer dan een enkele rij blokken te verplaatsen.", + "block.create.mechanical_piston.tooltip.summary": "Een meer geavanceerde versie van de _Zuiger,_ die _Rotatiekracht_ gebruikt om gekoppelde constructies nauwkeurig te verplaatsen. _Zuiger_ _Verlgenpaalen_ aan de achterzijde definiëren het _Bereik_ van dit apparaat. Zonder verlengingen zal de zuiger niet bewegen. Gebruik _Lineaar_ _Frame_ om meer dan een enkele rij blokken te verplaatsen.", "block.create.mechanical_piston.tooltip.condition1": "Wanneer gedraaid", "block.create.mechanical_piston.tooltip.behaviour1": "Begint de bijgevoegde structuur te verplaatsen. Snelheid en richting correleren met de inkomende rotatiesnelheid.", "block.create.sticky_mechanical_piston.tooltip": "MECHANISCHE KLEEFZUIGER", - "block.create.sticky_mechanical_piston.tooltip.summary": "Een meer geavanceerde versie van de _Kleefzuiger,_ die _Rotatiekracht_ gebruikt om gekoppelde constructies nauwkeurig te verplaatsen. _Zuiger_ _Verlgenpaalen_ aan de achterzijde definiëren het _Bereik_ van dit apparaat. Zonder verlengingen zal de zuiger niet bewegen. Gebruik _Lineaar_ _Frame_ om meer dan een enkele rij blokken te verplaatsen.", + "block.create.sticky_mechanical_piston.tooltip.summary": "Een meer geavanceerde versie van de _Kleefzuiger,_ die _Rotatiekracht_ gebruikt om gekoppelde constructies nauwkeurig te verplaatsen. _Zuiger_ _Verlgenpaalen_ aan de achterzijde definiëren het _Bereik_ van dit apparaat. Zonder verlengingen zal de zuiger niet bewegen. Gebruik _Lineaar_ _Frame_ om meer dan een enkele rij blokken te verplaatsen.", "block.create.sticky_mechanical_piston.tooltip.condition1": "Wanneer gedraaid", "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Begint de bijgevoegde structuur te verplaatsen. Snelheid en richting correleren met de inkomende rotatiesnelheid.", @@ -1241,7 +1241,7 @@ "block.create.linear_chassis.tooltip": "LINEAAR FRAME", "block.create.linear_chassis.tooltip.summary": "A configurable base for Structures moved by a _Mechanische_ _Zuiger._ These Blocks have to form the first Layer of blocks in front of the Zuiger.", "block.create.linear_chassis.tooltip.condition1": "Wanneer bewogen door een Mechanische Zuiger", - "block.create.linear_chassis.tooltip.behaviour1": "_Beweegt_ alle _aangesloten_ _Frames_ met dezelfde oriëntatie, en daaraan bevestigde blokken. Wanneer de Zuiger wordt ingetrokken, worden blokken alleen getrokken als het framevlak _Kleverig_ (zie [Ctrl]).", + "block.create.linear_chassis.tooltip.behaviour1": "_Beweegt_ alle _aangesloten_ _Frames_ met dezelfde oriëntatie, en daaraan bevestigde blokken. Wanneer de Zuiger wordt ingetrokken, worden blokken alleen getrokken als het framevlak _Kleverig_ (zie [Ctrl]).", "block.create.linear_chassis.tooltip.condition2": "UNLOCALIZED: With Wrench", "block.create.linear_chassis.tooltip.behaviour2": "UNLOCALIZED: Configure the _range_ for this chassis block. Hold CTRL to modify the range of all attached chassis blocks as well.", "block.create.linear_chassis.tooltip.control1": "Wanneer R-Geklikt met een slijmbal", @@ -1296,7 +1296,7 @@ "block.create.redstone_link.tooltip.condition1": "Wanneer aangestuurd", "block.create.redstone_link.tooltip.behaviour1": "Het ontvangen van verbindingen met dezelfde frequentie levert een Redstone-signaal.", "block.create.redstone_link.tooltip.control1": "Wanneer R-Geklikt met een object", - "block.create.redstone_link.tooltip.action1": "Stelt de _Frequentie_ in op dat object. Een totaal van _twee_ _verschillende_ _objecten_ kan in combinatie worden gebruikt voor het definiëren van een frequentie", + "block.create.redstone_link.tooltip.action1": "Stelt de _Frequentie_ in op dat object. Een totaal van _twee_ _verschillende_ _objecten_ kan in combinatie worden gebruikt voor het definiëren van een frequentie", "block.create.redstone_link.tooltip.control2": "Wanneer R-Geklikt terwijl je sluipt", "block.create.redstone_link.tooltip.action2": "Schakelt tussen _ontvanger_ en _zender_modus.", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index 34975b722..8b67ae7a3 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -24,12 +24,7 @@ "block.create.andesite_pillar": "UNLOCALIZED: Andesite Pillar", "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "UNLOCALIZED: Basin", -<<<<<<< HEAD - "block.create.belt": "Esteira Mecânica", - "block.create.belt_observer": "Observador de Esteira", -======= "block.create.belt": "Esteira Mecânica", ->>>>>>> mc1.15/dev "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", "block.create.black_seat": "UNLOCALIZED: Black Seat", @@ -159,8 +154,8 @@ "block.create.gabbro_cobblestone_stairs": "UNLOCALIZED: Gabbro Cobblestone Stairs", "block.create.gabbro_cobblestone_wall": "UNLOCALIZED: Gabbro Cobblestone Wall", "block.create.gabbro_pillar": "UNLOCALIZED: Gabbro Pillar", - "block.create.gearbox": "Caixa de Transmissão", - "block.create.gearshift": "Câmbio", + "block.create.gearbox": "Caixa de Transmissão", + "block.create.gearshift": "Câmbio", "block.create.glass_fluid_pipe": "UNLOCALIZED: Glass Fluid Pipe", "block.create.granite_bricks": "Tijolos de Granito", "block.create.granite_bricks_slab": "UNLOCALIZED: Granite Bricks Slab", @@ -195,14 +190,6 @@ "block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat", "block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle", "block.create.lime_seat": "UNLOCALIZED: Lime Seat", -<<<<<<< HEAD - "block.create.limesand": "Areia Calcária", - "block.create.limestone": "Calcário", - "block.create.limestone_bricks": "Tijolos de Calcário", - "block.create.limestone_bricks_slab": "Lajotas de Tijolos de Calcário", - "block.create.limestone_bricks_stairs": "Escadas de Tijolos de Calcário", - "block.create.limestone_bricks_wall": "Muro de Tijolos de Calcário", -======= "block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle", "block.create.limesand": "Areia Calcária", "block.create.limestone": "Calcário", @@ -210,25 +197,24 @@ "block.create.limestone_bricks_slab": "Lajotas de Tijolos de Calcário", "block.create.limestone_bricks_stairs": "Escadas de Tijolos de Calcário", "block.create.limestone_bricks_wall": "Muro de Tijolos de Calcário", ->>>>>>> mc1.15/dev "block.create.limestone_cobblestone": "UNLOCALIZED: Limestone Cobblestone", "block.create.limestone_cobblestone_slab": "UNLOCALIZED: Limestone Cobblestone Slab", "block.create.limestone_cobblestone_stairs": "UNLOCALIZED: Limestone Cobblestone Stairs", "block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall", - "block.create.limestone_pillar": "Pilar de Calcário", + "block.create.limestone_pillar": "Pilar de Calcário", "block.create.linear_chassis": "Chassis de Translado", "block.create.magenta_seat": "UNLOCALIZED: Magenta Seat", "block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle", "block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm", - "block.create.mechanical_bearing": "Rolamento Mecânico", + "block.create.mechanical_bearing": "Rolamento Mecânico", "block.create.mechanical_crafter": "UNLOCALIZED: Mechanical Crafter", - "block.create.mechanical_drill": "Furadeira Mecânica", - "block.create.mechanical_harvester": "Coletor Mecânico", + "block.create.mechanical_drill": "Furadeira Mecânica", + "block.create.mechanical_harvester": "Coletor Mecânico", "block.create.mechanical_mixer": "UNLOCALIZED: Mechanical Mixer", - "block.create.mechanical_piston": "Pistão Mecânico", - "block.create.mechanical_piston_head": "Cabeça do Pistão Mecânico", + "block.create.mechanical_piston": "Pistão Mecânico", + "block.create.mechanical_piston_head": "Cabeça do Pistão Mecânico", "block.create.mechanical_plough": "UNLOCALIZED: Mechanical Plough", - "block.create.mechanical_press": "Prensa Mecânico", + "block.create.mechanical_press": "Prensa Mecânico", "block.create.mechanical_pump": "UNLOCALIZED: Mechanical Pump", "block.create.mechanical_saw": "UNLOCALIZED: Mechanical Saw", "block.create.millstone": "UNLOCALIZED: Millstone", @@ -298,12 +284,8 @@ "block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs", "block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall", "block.create.pink_seat": "UNLOCALIZED: Pink Seat", -<<<<<<< HEAD - "block.create.piston_extension_pole": "Vara de Extensão do Pistão", -======= "block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle", "block.create.piston_extension_pole": "Vara de Extensão do Pistão", ->>>>>>> mc1.15/dev "block.create.polished_dark_scoria": "UNLOCALIZED: Polished Dark Scoria", "block.create.polished_dark_scoria_slab": "UNLOCALIZED: Polished Dark Scoria Slab", "block.create.polished_dark_scoria_stairs": "UNLOCALIZED: Polished Dark Scoria Stairs", @@ -316,16 +298,16 @@ "block.create.polished_gabbro_slab": "UNLOCALIZED: Polished Gabbro Slab", "block.create.polished_gabbro_stairs": "UNLOCALIZED: Polished Gabbro Stairs", "block.create.polished_gabbro_wall": "UNLOCALIZED: Polished Gabbro Wall", - "block.create.polished_limestone": "Calcário Polido", - "block.create.polished_limestone_slab": "Lajotas de Calcário Polido", + "block.create.polished_limestone": "Calcário Polido", + "block.create.polished_limestone_slab": "Lajotas de Calcário Polido", "block.create.polished_limestone_stairs": "UNLOCALIZED: Polished Limestone Stairs", "block.create.polished_limestone_wall": "UNLOCALIZED: Polished Limestone Wall", "block.create.polished_scoria": "UNLOCALIZED: Polished Scoria", "block.create.polished_scoria_slab": "UNLOCALIZED: Polished Scoria Slab", "block.create.polished_scoria_stairs": "UNLOCALIZED: Polished Scoria Stairs", "block.create.polished_scoria_wall": "UNLOCALIZED: Polished Scoria Wall", - "block.create.polished_weathered_limestone": "Calcário Polido Resistido", - "block.create.polished_weathered_limestone_slab": "Lajota de Calcário Polido Resistido", + "block.create.polished_weathered_limestone": "Calcário Polido Resistido", + "block.create.polished_weathered_limestone_slab": "Lajota de Calcário Polido Resistido", "block.create.polished_weathered_limestone_stairs": "UNLOCALIZED: Polished Weathered Limestone Stairs", "block.create.polished_weathered_limestone_wall": "UNLOCALIZED: Polished Weathered Limestone Wall", "block.create.portable_storage_interface": "UNLOCALIZED: Portable Storage Interface", @@ -334,16 +316,12 @@ "block.create.pulley_magnet": "UNLOCALIZED: Pulley Magnet", "block.create.pulse_repeater": "Repetidor de Pulso", "block.create.purple_seat": "UNLOCALIZED: Purple Seat", -<<<<<<< HEAD - "block.create.radial_chassis": "Chassis de Rotação", -======= "block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle", "block.create.radial_chassis": "Chassis de Rotação", ->>>>>>> mc1.15/dev "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle", "block.create.redstone_contact": "Contato de Redstone", - "block.create.redstone_link": "Conexão de Redstone", + "block.create.redstone_link": "Conexão de Redstone", "block.create.refined_radiance_casing": "UNLOCALIZED: Radiant Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "UNLOCALIZED: Rope", @@ -369,25 +347,25 @@ "block.create.spout": "UNLOCALIZED: Spout", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", "block.create.spruce_window_pane": "UNLOCALIZED: Spruce Window Pane", - "block.create.sticky_mechanical_piston": "Pistão Mecânico Grudento", + "block.create.sticky_mechanical_piston": "Pistão Mecânico Grudento", "block.create.stockpile_switch": "Disjuntor de Armazenamento", "block.create.stressometer": "UNLOCALIZED: Stressometer", "block.create.tiled_glass": "Vidro Entalhado", - "block.create.tiled_glass_pane": "Vidraça Entalhada", - "block.create.turntable": "Mesa giratória", + "block.create.tiled_glass_pane": "Vidraça Entalhada", + "block.create.turntable": "Mesa giratória", "block.create.vertical_framed_glass": "UNLOCALIZED: Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "UNLOCALIZED: Vertical Framed Glass Pane", - "block.create.water_wheel": "Roda de Ã�gua", - "block.create.weathered_limestone": "Calcário Resistido", - "block.create.weathered_limestone_bricks": "Tijolos de Calcário Resistido", - "block.create.weathered_limestone_bricks_slab": "Lajota de Tijolos de Calcário Resistido", - "block.create.weathered_limestone_bricks_stairs": "Escadas de Tijolos de Calcário Resistido", - "block.create.weathered_limestone_bricks_wall": "Muro de Tijolos de Calcário Resistido", + "block.create.water_wheel": "Roda de Água", + "block.create.weathered_limestone": "Calcário Resistido", + "block.create.weathered_limestone_bricks": "Tijolos de Calcário Resistido", + "block.create.weathered_limestone_bricks_slab": "Lajota de Tijolos de Calcário Resistido", + "block.create.weathered_limestone_bricks_stairs": "Escadas de Tijolos de Calcário Resistido", + "block.create.weathered_limestone_bricks_wall": "Muro de Tijolos de Calcário Resistido", "block.create.weathered_limestone_cobblestone": "UNLOCALIZED: Weathered Limestone Cobblestone", "block.create.weathered_limestone_cobblestone_slab": "UNLOCALIZED: Weathered Limestone Cobblestone Slab", "block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs", "block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall", - "block.create.weathered_limestone_pillar": "Pilar de Calcário Resistido", + "block.create.weathered_limestone_pillar": "Pilar de Calcário Resistido", "block.create.white_seat": "UNLOCALIZED: White Seat", "block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle", "block.create.yellow_seat": "UNLOCALIZED: Yellow Seat", @@ -402,7 +380,7 @@ "item.create.andesite_alloy": "UNLOCALIZED: Andesite Alloy", "item.create.attribute_filter": "UNLOCALIZED: Attribute Filter", - "item.create.belt_connector": "Esteira Mecânica", + "item.create.belt_connector": "Esteira Mecânica", "item.create.brass_hand": "UNLOCALIZED: Brass Hand", "item.create.brass_ingot": "UNLOCALIZED: Brass Ingot", "item.create.brass_nugget": "UNLOCALIZED: Brass Nugget", @@ -428,7 +406,7 @@ "item.create.furnace_minecart_contraption": "UNLOCALIZED: Furnace Minecart Contraption", "item.create.goggles": "UNLOCALIZED: Engineer's Goggles", "item.create.golden_sheet": "UNLOCALIZED: Golden Sheet", - "item.create.handheld_blockzapper": "Blockzapper Portátil", + "item.create.handheld_blockzapper": "Blockzapper Portátil", "item.create.handheld_worldshaper": "UNLOCALIZED: Handheld Worldshaper", "item.create.integrated_circuit": "UNLOCALIZED: Integrated Circuit", "item.create.iron_sheet": "Placas de Ferro", @@ -437,7 +415,7 @@ "item.create.minecart_coupling": "UNLOCALIZED: Minecart Coupling", "item.create.polished_rose_quartz": "UNLOCALIZED: Polished Rose Quartz", "item.create.powdered_obsidian": "UNLOCALIZED: Powdered Obsidian", - "item.create.propeller": "Hélice", + "item.create.propeller": "Hélice", "item.create.red_sand_paper": "UNLOCALIZED: Red Sand Paper", "item.create.refined_radiance": "UNLOCALIZED: Refined Radiance", "item.create.rose_quartz": "Quartzo Rosa", @@ -446,7 +424,7 @@ "item.create.schematic_and_quill": "Esquema e pena", "item.create.shadow_steel": "UNLOCALIZED: Shadow Steel", "item.create.super_glue": "UNLOCALIZED: Super Glue", - "item.create.tree_fertilizer": "Fertilizante de Ã�rvore", + "item.create.tree_fertilizer": "Fertilizante de Árvore", "item.create.vertical_gearbox": "UNLOCALIZED: Vertical Gearbox", "item.create.wand_of_symmetry": "Varinha de Simetria", "item.create.wheat_flour": "UNLOCALIZED: Wheat Flour", @@ -552,7 +530,7 @@ "death.attack.create.crush": "%1$s foi processado pelas Rodas de Moer", "death.attack.create.fan_fire": "%1$s foi queimado por ar quente", "death.attack.create.fan_lava": "%1$s foi queimado pelo ventilador de lava", - "death.attack.create.mechanical_drill": "%1$s foi empalado pela Furadeira Mecânica", + "death.attack.create.mechanical_drill": "%1$s foi empalado pela Furadeira Mecânica", "death.attack.create.mechanical_saw": "UNLOCALIZED: %1$s got cut in half by a Mechanical Saw", "death.attack.create.cuckoo_clock_explosion": "UNLOCALIZED: %1$s was blown up by tampered cuckoo clock", @@ -562,25 +540,25 @@ "create.recipe.crushing": "Moendo", "create.recipe.milling": "UNLOCALIZED: Milling", "create.recipe.splashing": "Lavando em Massa", - "create.recipe.splashing.fan": "Ventilador atras de Ã�gua corrente", + "create.recipe.splashing.fan": "Ventilador atras de Água corrente", "create.recipe.smoking_via_fan": "Fumaceando em Massa", "create.recipe.smoking_via_fan.fan": "Ventilador atras de Fogo", "create.recipe.blasting_via_fan": "Fundindo em Massa", "create.recipe.blasting_via_fan.fan": "Ventilador atras de Lava", - "create.recipe.pressing": "Prensa Mecânica", + "create.recipe.pressing": "Prensa Mecânica", "create.recipe.mixing": "UNLOCALIZED: Mixing", "create.recipe.packing": "UNLOCALIZED: Compacting", "create.recipe.mechanical_sawing": "UNLOCALIZED: Sawing", "create.recipe.mechanical_crafting": "UNLOCALIZED: Mechanical Crafting", "create.recipe.block_cutting": "UNLOCALIZED: Block Cutting", - "create.recipe.blockzapper_upgrade": "Blockzapper Portátil", + "create.recipe.blockzapper_upgrade": "Blockzapper Portátil", "create.recipe.sandpaper_polishing": "UNLOCALIZED: Sandpaper Polishing", "create.recipe.mystery_conversion": "UNLOCALIZED: Chromatic Metamorphosis", "create.recipe.processing.catalyst": "UNLOCALIZED: Catalyst", "create.recipe.processing.chance": "%1$s%% de chance", "create.recipe.processing.chanceToReturn": "UNLOCALIZED: %1$s%% Chance to Return", - "create.generic.range": "Ã�rea", + "create.generic.range": "Área", "create.generic.radius": "Raio", "create.generic.width": "UNLOCALIZED: Width", "create.generic.height": "UNLOCALIZED: Height", @@ -604,7 +582,7 @@ "create.keyinfo.scrollup": "UNLOCALIZED: Simulate Mousewheel Up (inworld)", "create.keyinfo.scrolldown": "UNLOCALIZED: Simulate Mousewheel Down (inworld)", - "create.gui.scrollInput.defaultTitle": "Escolha uma Opção:", + "create.gui.scrollInput.defaultTitle": "Escolha uma Opção:", "create.gui.scrollInput.scrollToModify": "Role o mouse para Modificar", "create.gui.scrollInput.scrollToAdjustAmount": "UNLOCALIZED: Scroll to Adjust Amount", "create.gui.scrollInput.scrollToSelect": "Role o mouse para Selecionar", @@ -612,7 +590,7 @@ "create.gui.toolmenu.focusKey": "Segure [%1$s] para Focar", "create.gui.toolmenu.cycle": "[SCROLL] para Circular", "create.gui.symmetryWand.mirrorType": "Espelhar", - "create.gui.symmetryWand.orientation": "Orientação", + "create.gui.symmetryWand.orientation": "Orientação", "create.symmetry.mirror.plane": "Espelhar uma vez", "create.symmetry.mirror.doublePlane": "Retangular", @@ -621,17 +599,17 @@ "create.orientation.orthogonal": "Ortogonal", "create.orientation.diagonal": "Diagonal", "create.orientation.horizontal": "Horizontal", - "create.orientation.alongZ": "Através de Z", - "create.orientation.alongX": "Através de X", + "create.orientation.alongZ": "Através de Z", + "create.orientation.alongX": "Através de X", - "create.gui.blockzapper.title": "Blockzapper Portátil", - "create.gui.blockzapper.replaceMode": "Modo de Substituição", + "create.gui.blockzapper.title": "Blockzapper Portátil", + "create.gui.blockzapper.replaceMode": "Modo de Substituição", "create.gui.blockzapper.searchDiagonal": "Seguir as Diagonais", "create.gui.blockzapper.searchFuzzy": "Ignorar Material nas Bordas", - "create.gui.blockzapper.range": "Raio de Expansão", + "create.gui.blockzapper.range": "Raio de Expansão", "create.gui.blockzapper.needsUpgradedAmplifier": "UNLOCALIZED: Requires Upgraded Amplifier", - "create.gui.blockzapper.patternSection": "Padrões", - "create.gui.blockzapper.pattern.solid": "Sólido", + "create.gui.blockzapper.patternSection": "Padrões", + "create.gui.blockzapper.pattern.solid": "Sólido", "create.gui.blockzapper.pattern.checkered": "Xadrez", "create.gui.blockzapper.pattern.inversecheckered": "Xadrez invertido", "create.gui.blockzapper.pattern.chance25": "25% de chance", @@ -666,7 +644,7 @@ "create.blockzapper.componentTier.none": "Nada", "create.blockzapper.componentTier.brass": "UNLOCALIZED: Brass", "create.blockzapper.componentTier.chromatic": "UNLOCALIZED: Chromatic", - "create.blockzapper.leftClickToSet": "Botão-Esquerdo em um Bloco para selecionar Material", + "create.blockzapper.leftClickToSet": "Botão-Esquerdo em um Bloco para selecionar Material", "create.blockzapper.empty": "Sem Blocos!", "create.contraptions.movement_mode": "UNLOCALIZED: Movement Mode", @@ -699,20 +677,11 @@ "create.gui.contraptions.not_fast_enough": "UNLOCALIZED: It appears that this %1$s is _not_ rotating with _enough_ _speed_.", "create.gui.contraptions.network_overstressed": "UNLOCALIZED: It appears that this contraption is _overstressed_. Add more sources or _slow_ _down_ the components with a high _stress_ _impact_.", "create.gui.adjustable_crate.title": "adjustable_crate", - "create.gui.adjustable_crate.storageSpace": "Espaço de Armazenamento", + "create.gui.adjustable_crate.storageSpace": "Espaço de Armazenamento", "create.gui.stockpile_switch.title": "Disjuntor de Armazenamento", -<<<<<<< HEAD - "create.gui.stockpile_switch.lowerLimit": "Limite Mínimo", - "create.gui.stockpile_switch.upperLimit": "Limite Máximo", - "create.gui.stockpile_switch.startAt": "Iniciar Sinal em", - "create.gui.stockpile_switch.startAbove": "Iniciar Sinal acima de", - "create.gui.stockpile_switch.stopAt": "Parar Sinal em", - "create.gui.stockpile_switch.stopBelow": "Parar Sinal abaixo de", -======= "create.gui.stockpile_switch.invert_signal": "UNLOCALIZED: Invert Signal", "create.gui.stockpile_switch.move_to_lower_at": "UNLOCALIZED: Move to lower lane at %1$s%%", "create.gui.stockpile_switch.move_to_upper_at": "UNLOCALIZED: Move to upper lane at %1$s%%", ->>>>>>> mc1.15/dev "create.gui.sequenced_gearshift.title": "UNLOCALIZED: Sequenced Gearshift", "create.gui.sequenced_gearshift.instruction": "UNLOCALIZED: Instruction", "create.gui.sequenced_gearshift.instruction.turn_angle": "UNLOCALIZED: Turn", @@ -729,30 +698,25 @@ "create.gui.sequenced_gearshift.speed.back_fast": "UNLOCALIZED: Double speed, Reversed", "create.schematicAndQuill.dimensions": "Tamanho Esquema: %1$sx%2$sx%3$s", - "create.schematicAndQuill.firstPos": "Primeira posição feita.", - "create.schematicAndQuill.secondPos": "Segunda posição feita.", + "create.schematicAndQuill.firstPos": "Primeira posição feita.", + "create.schematicAndQuill.secondPos": "Segunda posição feita.", "create.schematicAndQuill.noTarget": "Seguro [Ctrl] para selecionar Blocos de Ar.", -<<<<<<< HEAD - "create.schematicAndQuill.abort": "Seleção removida.", - "create.schematicAndQuill.prompt": "Informe um nome para o Esquema:", -======= "create.schematicAndQuill.abort": "Seleção removida.", "create.schematicAndQuill.title": "UNLOCALIZED: Schematic Name:", "create.schematicAndQuill.convert": "UNLOCALIZED: Save and Deploy Immediately", ->>>>>>> mc1.15/dev "create.schematicAndQuill.fallbackName": "Meu Esquema", "create.schematicAndQuill.saved": "Salvo como %1$s", - "create.schematic.invalid": "[!] Item Inválido - Use a Mesa de Desenho no lugar", - "create.schematic.position": "Posição", - "create.schematic.rotation": "Rotação", + "create.schematic.invalid": "[!] Item Inválido - Use a Mesa de Desenho no lugar", + "create.schematic.position": "Posição", + "create.schematic.rotation": "Rotação", "create.schematic.rotation.none": "Nada", - "create.schematic.rotation.cw90": "Sentido horário 90", - "create.schematic.rotation.cw180": "Sentido horário 180", - "create.schematic.rotation.cw270": "Sentido horário 270", + "create.schematic.rotation.cw90": "Sentido horário 90", + "create.schematic.rotation.cw180": "Sentido horário 180", + "create.schematic.rotation.cw270": "Sentido horário 270", "create.schematic.mirror": "Espelhar", "create.schematic.mirror.none": "Nada", - "create.schematic.mirror.frontBack": "Frente para Trás", + "create.schematic.mirror.frontBack": "Frente para Trás", "create.schematic.mirror.leftRight": "Esquerda para Direita", "create.schematic.tool.deploy": "Concluir", "create.schematic.tool.move": "Mover XZ", @@ -761,9 +725,9 @@ "create.schematic.tool.print": "Imprimir", "create.schematic.tool.flip": "Virar", "create.schematic.tool.deploy.description.0": "Move o lugar da estrutura.", - "create.schematic.tool.deploy.description.1": "Botão-direito no chão para colocar.", - "create.schematic.tool.deploy.description.2": "Segure [Ctrl] para selecionar em uma distância fixa.", - "create.schematic.tool.deploy.description.3": "[Ctrl]-Rolar para mudar a distância.", + "create.schematic.tool.deploy.description.1": "Botão-direito no chão para colocar.", + "create.schematic.tool.deploy.description.2": "Segure [Ctrl] para selecionar em uma distância fixa.", + "create.schematic.tool.deploy.description.3": "[Ctrl]-Rolar para mudar a distância.", "create.schematic.tool.move.description.0": "Vira o Esquema Horizontalmente", "create.schematic.tool.move.description.1": "Aponte ao Esquema e [CTRL]-Rolar para empurrar.", "create.schematic.tool.move.description.2": "", @@ -777,17 +741,17 @@ "create.schematic.tool.rotate.description.2": "", "create.schematic.tool.rotate.description.3": "", "create.schematic.tool.print.description.0": "Coloca estrutura no mundo instantaneamente", - "create.schematic.tool.print.description.1": "[Botão-Direito] para confirmar a posição atual.", - "create.schematic.tool.print.description.2": "Esta ferramenta é para o Modo Criativo apenas.", + "create.schematic.tool.print.description.1": "[Botão-Direito] para confirmar a posição atual.", + "create.schematic.tool.print.description.2": "Esta ferramenta é para o Modo Criativo apenas.", "create.schematic.tool.print.description.3": "", - "create.schematic.tool.flip.description.0": "Gira o Esquema ao longo da face que você selecionar.", - "create.schematic.tool.flip.description.1": "Aponte para o Esquema e [CTRL]-Rolar para virá-lo.", + "create.schematic.tool.flip.description.0": "Gira o Esquema ao longo da face que você selecionar.", + "create.schematic.tool.flip.description.1": "Aponte para o Esquema e [CTRL]-Rolar para virá-lo.", "create.schematic.tool.flip.description.2": "", "create.schematic.tool.flip.description.3": "", "create.schematics.synchronizing": "Sincronizando...", - "create.schematics.uploadTooLarge": "Seu esquema é muito grande", - "create.schematics.maxAllowedSize": "O tamanho máximo permitido para o esquema é:", + "create.schematics.uploadTooLarge": "Seu esquema é muito grande", + "create.schematics.maxAllowedSize": "O tamanho máximo permitido para o esquema é:", "create.gui.schematicTable.title": "Mesa de Desenho", "create.gui.schematicTable.refresh": "UNLOCALIZED: Refresh Files", @@ -795,32 +759,14 @@ "create.gui.schematicTable.availableSchematics": "UNLOCALIZED: Available Schematics", "create.gui.schematicTable.noSchematics": "UNLOCALIZED: No Schematics Saved", "create.gui.schematicTable.uploading": "Importando...", - "create.gui.schematicTable.finished": "Envio Concluído!", + "create.gui.schematicTable.finished": "Envio Concluído!", "create.gui.schematicannon.title": "Esquemaannon", -<<<<<<< HEAD - "create.gui.schematicannon.settingsTitle": "Parâmetros de Posicionamento", -======= ->>>>>>> mc1.15/dev "create.gui.schematicannon.listPrinter": "Impressora de Lista de Materiais", - "create.gui.schematicannon.gunpowderLevel": "Pólvora em %1$s%%", + "create.gui.schematicannon.gunpowderLevel": "Pólvora em %1$s%%", "create.gui.schematicannon.shotsRemaining": "Disparos faltantes: %1$s", "create.gui.schematicannon.shotsRemainingWithBackup": "Com backup: %1$s", "create.gui.schematicannon.optionEnabled": "Habilitado Atualmente", "create.gui.schematicannon.optionDisabled": "Desabilitado Atualmente", -<<<<<<< HEAD - "create.gui.schematicannon.option.dontReplaceSolid": "Não Substituir Blocos Sólidos", - "create.gui.schematicannon.option.replaceWithSolid": "Substituir Blocos Sólidos", - "create.gui.schematicannon.option.replaceWithAny": "Substituir Sólidos com Qualquer", - "create.gui.schematicannon.option.replaceWithEmpty": "Substituir Sólidos com Vazio", - "create.gui.schematicannon.option.skipMissing": "Pulando Blocos faltantes", - "create.gui.schematicannon.option.skipTileEntities": "Proteger Entidades Entalhadas", - "create.gui.schematicannon.option.skipMissing.description": "Se o Esquemaannon não encontrar o Bloco para colocar, ele irá continuar para a próx. Posição.", - "create.gui.schematicannon.option.skipTileEntities.description": "O Esquemaannon vai evitar substituir blocos que contêm dados como Baus.", - "create.gui.schematicannon.option.dontReplaceSolid.description": "O canhão irá nunca substituir Blocos sólidos na área em trabalho, apenas não-Sólidos e Ar.", - "create.gui.schematicannon.option.replaceWithSolid.description": "O canhão irá apenas substituir Blocos sólidos na área de trabalho, se o Esquema conter um bloco Sólido naquela posição.", - "create.gui.schematicannon.option.replaceWithAny.description": "O canhão irá substituir Blocos sólidos na área de trabalho, se o Esquema conter qualquer Bloco naquela posição.", - "create.gui.schematicannon.option.replaceWithEmpty.description": "O canhão irá limpar todos os blocos na área de trabalho, incluindo os substituídos por Ar.", -======= "create.gui.schematicannon.showOptions": "UNLOCALIZED: Show Printer Settings", "create.gui.schematicannon.option.dontReplaceSolid": "Não Substituir Blocos Sólidos", "create.gui.schematicannon.option.replaceWithSolid": "Substituir Blocos Sólidos", @@ -837,24 +783,23 @@ "create.gui.schematicannon.option.replaceWithSolid.description": "O canhão irá apenas substituir Blocos sólidos na área de trabalho, se o Esquema conter um bloco Sólido naquela posição.", "create.gui.schematicannon.option.replaceWithAny.description": "O canhão irá substituir Blocos sólidos na área de trabalho, se o Esquema conter qualquer Bloco naquela posição.", "create.gui.schematicannon.option.replaceWithEmpty.description": "O canhão irá limpar todos os blocos na área de trabalho, incluindo os substituídos por Ar.", ->>>>>>> mc1.15/dev "create.schematicannon.status.idle": "Ocioso", "create.schematicannon.status.ready": "Pronto", "create.schematicannon.status.running": "Trabalhando", - "create.schematicannon.status.finished": "Concluído", + "create.schematicannon.status.finished": "Concluído", "create.schematicannon.status.paused": "Pausado", "create.schematicannon.status.stopped": "Parada", "create.schematicannon.status.noGunpowder": "UNLOCALIZED: Out of Gunpowder", - "create.schematicannon.status.targetNotLoaded": "Bloco não carregado", - "create.schematicannon.status.targetOutsideRange": "Alvo está muito Longe", + "create.schematicannon.status.targetNotLoaded": "Bloco não carregado", + "create.schematicannon.status.targetOutsideRange": "Alvo está muito Longe", "create.schematicannon.status.searching": "Procurando", "create.schematicannon.status.skipping": "Pulando", "create.schematicannon.status.missingBlock": "Bloco Faltante:", "create.schematicannon.status.placing": "Colocando", "create.schematicannon.status.clearing": "Limpando Blocos", - "create.schematicannon.status.schematicInvalid": "Esquema Inválido", - "create.schematicannon.status.schematicNotPlaced": "Esquema não Colocado", + "create.schematicannon.status.schematicInvalid": "Esquema Inválido", + "create.schematicannon.status.schematicNotPlaced": "Esquema não Colocado", "create.schematicannon.status.schematicExpired": "Arquivo de Esquema Expirado", "create.gui.filter.blacklist": "UNLOCALIZED: Blacklist", @@ -991,24 +936,24 @@ "item.create.example_item.tooltip.action1": "These controls are displayed.", "item.create.wand_of_symmetry.tooltip": "VARINHA DE SIMETRIA", - "item.create.wand_of_symmetry.tooltip.summary": "Espelhar perfeitamente a colocação de blocos nos planos configurados.", + "item.create.wand_of_symmetry.tooltip.summary": "Espelhar perfeitamente a colocação de blocos nos planos configurados.", "item.create.wand_of_symmetry.tooltip.condition1": "Quando na Hotbar", "item.create.wand_of_symmetry.tooltip.behaviour1": "Mantem-se Ativo", - "item.create.wand_of_symmetry.tooltip.control1": "B-Direito no Chão", + "item.create.wand_of_symmetry.tooltip.control1": "B-Direito no Chão", "item.create.wand_of_symmetry.tooltip.action1": "_Cria_ ou _Move_ o Espelho", "item.create.wand_of_symmetry.tooltip.control2": "B-Direito no Ar", "item.create.wand_of_symmetry.tooltip.action2": "_Remove_ o Espelho ativo", "item.create.wand_of_symmetry.tooltip.control3": "B-Direito enquanto Abaixado", - "item.create.wand_of_symmetry.tooltip.action3": "Abre _Interface_ de _Configuração_", + "item.create.wand_of_symmetry.tooltip.action3": "Abre _Interface_ de _Configuração_", "item.create.handheld_blockzapper.tooltip": "BLOCKZAPPER", - "item.create.handheld_blockzapper.tooltip.summary": "Gadget imaginário para colocar ou substituir blocos a distância.", + "item.create.handheld_blockzapper.tooltip.summary": "Gadget imaginário para colocar ou substituir blocos a distância.", "item.create.handheld_blockzapper.tooltip.control1": "B-Esquerdo no Bloco", "item.create.handheld_blockzapper.tooltip.action1": "Define os blocos colocados pela ferramenta no bloco de destino.", "item.create.handheld_blockzapper.tooltip.control2": "B-Direito em Bloco", "item.create.handheld_blockzapper.tooltip.action2": "_Coloca_ ou _Substitui_ o bloco alvo.", "item.create.handheld_blockzapper.tooltip.control3": "B-Direito equando Abaixado", - "item.create.handheld_blockzapper.tooltip.action3": "Abre _Interface_ de _Configuração_", + "item.create.handheld_blockzapper.tooltip.action3": "Abre _Interface_ de _Configuração_", "item.create.handheld_worldshaper.tooltip": "UNLOCALIZED: HANDHELD WORLDSHAPER", "item.create.handheld_worldshaper.tooltip.summary": "UNLOCALIZED: Handy tool for creating _landscapes_ and _terrain_ _features_.", @@ -1020,9 +965,9 @@ "item.create.handheld_worldshaper.tooltip.action3": "UNLOCALIZED: Opens the _Configuration_ _Interface_", "item.create.tree_fertilizer.tooltip": "FERTILIZANTE DE ARVORE", - "item.create.tree_fertilizer.tooltip.summary": "Uma combinação poderosa de minerais para tipos comuns de arvores", + "item.create.tree_fertilizer.tooltip.summary": "Uma combinação poderosa de minerais para tipos comuns de arvores", "item.create.tree_fertilizer.tooltip.condition1": "Quando usada em Mudas", - "item.create.tree_fertilizer.tooltip.behaviour1": "Cresce Arvores independentemente das suas Regras de espaço", + "item.create.tree_fertilizer.tooltip.behaviour1": "Cresce Arvores independentemente das suas Regras de espaço", "item.create.deforester.tooltip": "UNLOCALIZED: DEFORESTER", "item.create.deforester.tooltip.summary": "UNLOCALIZED: A _radiant_ _axe_ able to chop down trees in a split second.", @@ -1050,8 +995,8 @@ "item.create.empty_schematic.tooltip.summary": "Usado como ingrediente em receitas e para escrever na _Mesa_ _de_ _Esquematizar_", "item.create.schematic.tooltip": "ESQUEMA", - "item.create.schematic.tooltip.summary": "Contem uma estrutura para ser posicionada e colocada no mundo. Posicione o Holograma como desejar e use um _Esquemaannon_ para construí-lo.", - "item.create.schematic.tooltip.condition1": "Quando Em mãos", + "item.create.schematic.tooltip.summary": "Contem uma estrutura para ser posicionada e colocada no mundo. Posicione o Holograma como desejar e use um _Esquemaannon_ para construí-lo.", + "item.create.schematic.tooltip.condition1": "Quando Em mãos", "item.create.schematic.tooltip.behaviour1": "Pode ser posicionado usando as Ferramentas em Tela", "item.create.schematic.tooltip.control1": "B-Direito enquanto Abaixado", "item.create.schematic.tooltip.action1": "Abre uma _Interface_ para informar as _Coordenadas_ exatas.", @@ -1065,12 +1010,12 @@ "item.create.schematic_and_quill.tooltip.control1": "B-Direito", "item.create.schematic_and_quill.tooltip.action1": "Selecione um canto / confirmar salvamento", "item.create.schematic_and_quill.tooltip.control2": "Ctrl Pressionado", - "item.create.schematic_and_quill.tooltip.action2": "Selecione pontos no _meio_ _do_ _ar_. _Rolar_ para ajustar a distância.", + "item.create.schematic_and_quill.tooltip.action2": "Selecione pontos no _meio_ _do_ _ar_. _Rolar_ para ajustar a distância.", "item.create.schematic_and_quill.tooltip.control3": "B-Direito enquanto Abaixado", - "item.create.schematic_and_quill.tooltip.action3": "_Cancela_ e remove a seleção.", + "item.create.schematic_and_quill.tooltip.action3": "_Cancela_ e remove a seleção.", "block.create.schematicannon.tooltip": "ESQUEMAANNON", - "block.create.schematicannon.tooltip.summary": "Dispara blocos para recriar um _Esquema_ no Mundo. Usa itens de Inventários adjacentes e _Pólvora_ como combustível.", + "block.create.schematicannon.tooltip.summary": "Dispara blocos para recriar um _Esquema_ no Mundo. Usa itens de Inventários adjacentes e _Pólvora_ como combustível.", "block.create.schematicannon.tooltip.control1": "Quando Apertado com B-Direito", "block.create.schematicannon.tooltip.action1": "Abre a _Interface_", @@ -1080,49 +1025,49 @@ "block.create.schematic_table.tooltip.behaviour1": "Importa um Arquivo escolhido da sua Pasta de Esquemas", "block.create.shaft.tooltip": "EIXO", - "block.create.shaft.tooltip.summary": "_Transmite_ _Rotação_ em uma linha reta.", + "block.create.shaft.tooltip.summary": "_Transmite_ _Rotação_ em uma linha reta.", "block.create.cogwheel.tooltip": "RODA DENTADA", - "block.create.cogwheel.tooltip.summary": "_Transmite_ _Rotação_ em uma linha reta, e para _Rodas_ _Dentadas_ adjacentes.", + "block.create.cogwheel.tooltip.summary": "_Transmite_ _Rotação_ em uma linha reta, e para _Rodas_ _Dentadas_ adjacentes.", "block.create.large_cogwheel.tooltip": "RODA DENTADA GRADE", - "block.create.large_cogwheel.tooltip.summary": "Uma versão maior da _Roda_ _Dentada,_ permitindo mudança na _Velocidade_ de _Rotação_ quando conectada a sua Contraparte.", + "block.create.large_cogwheel.tooltip.summary": "Uma versão maior da _Roda_ _Dentada,_ permitindo mudança na _Velocidade_ de _Rotação_ quando conectada a sua Contraparte.", "block.create.encased_shaft.tooltip": "EIXO REVESTIDO", - "block.create.encased_shaft.tooltip.summary": " _Transmite_ _Rotação_ em uma linha reta. Apropriada para propagar Rotação através de Muros.", + "block.create.encased_shaft.tooltip.summary": " _Transmite_ _Rotação_ em uma linha reta. Apropriada para propagar Rotação através de Muros.", - "block.create.gearbox.tooltip": "CAIXA DE TRANSMISSÃO", - "block.create.gearbox.tooltip.summary": "_Transmite_ _Rotação_ em _Quatro_ _direções._ Reverte conexões diretas.", + "block.create.gearbox.tooltip": "CAIXA DE TRANSMISSÃO", + "block.create.gearbox.tooltip.summary": "_Transmite_ _Rotação_ em _Quatro_ _direções._ Reverte conexões diretas.", "item.create.vertical_gearbox.tooltip": "UNLOCALIZED: VERTICAL GEARBOX", "item.create.vertical_gearbox.tooltip.summary": "UNLOCALIZED: _Relays_ _Rotation_ in _four_ _directions_ Reverses straight connections.", - "block.create.gearshift.tooltip": "CÂMBIO", - "block.create.gearshift.tooltip.summary": "Um _disjuntor_ de _rotação_ controlável para eixos conectados.", + "block.create.gearshift.tooltip": "CÂMBIO", + "block.create.gearshift.tooltip.summary": "Um _disjuntor_ de _rotação_ controlável para eixos conectados.", "block.create.gearshift.tooltip.condition1": "Quando Ligado", - "block.create.gearshift.tooltip.behaviour1": "_Inverte_ a rotação de saída.", + "block.create.gearshift.tooltip.behaviour1": "_Inverte_ a rotação de saída.", "block.create.clutch.tooltip": "EMBREAGEM", - "block.create.clutch.tooltip.summary": "Um _disjuntor_ de _rotação_ controlável para os eixos conectados.", + "block.create.clutch.tooltip.summary": "Um _disjuntor_ de _rotação_ controlável para os eixos conectados.", "block.create.clutch.tooltip.condition1": "Quando Ligado", - "block.create.clutch.tooltip.behaviour1": "_Para_ de prover rotação para o outro lado.", + "block.create.clutch.tooltip.behaviour1": "_Para_ de prover rotação para o outro lado.", "block.create.encased_belt.tooltip": "ESTEIRA REVESTIDA", - "block.create.encased_belt.tooltip.summary": "_Transmite_ _Rotação_ através de si e para _Esteiras_ _Revestidas_ conectadas.", + "block.create.encased_belt.tooltip.summary": "_Transmite_ _Rotação_ através de si e para _Esteiras_ _Revestidas_ conectadas.", "block.create.encased_belt.tooltip.condition1": "Quando Conectadas com outra Esteira Revestida", - "block.create.encased_belt.tooltip.behaviour1": "Bloco Conectado irá ter a mesma velocidade de rotação, na mesma direção. Esteiras Conectadas não precisam estar viradas para mesma direção.", + "block.create.encased_belt.tooltip.behaviour1": "Bloco Conectado irá ter a mesma velocidade de rotação, na mesma direção. Esteiras Conectadas não precisam estar viradas para mesma direção.", "block.create.adjustable_pulley.tooltip": "UNLOCALIZED: ANALOG BELT PULLEY", "block.create.adjustable_pulley.tooltip.summary": "UNLOCALIZED: _Relays_ _Rotation_ through its block and to attached _Encased_ _Belts_. Attached encased belts will _rotate_ _faster_ based on the _analog_ _redstone_ _signal_ this block receives.", "block.create.adjustable_pulley.tooltip.condition1": "UNLOCALIZED: Redstone Control", "block.create.adjustable_pulley.tooltip.behaviour1": "UNLOCALIZED: Without a signal, it will _not_ _speed_ _up_ connected belts. With a full strength signal connected belt, speed _doubles_.", - "item.create.belt_connector.tooltip": "ESTEIRA MECÂNICA", - "item.create.belt_connector.tooltip.summary": "Conecta dois _Eixos_ com uma _Esteira_ _Mecânica._ Eixos conectados irá ter exatamente a mesma velocidade e direção de rotação. A Esteira pode atuar como um _Transporte_ para _Entidades._", + "item.create.belt_connector.tooltip": "ESTEIRA MECÂNICA", + "item.create.belt_connector.tooltip.summary": "Conecta dois _Eixos_ com uma _Esteira_ _Mecânica._ Eixos conectados irá ter exatamente a mesma velocidade e direção de rotação. A Esteira pode atuar como um _Transporte_ para _Entidades._", "item.create.belt_connector.tooltip.control1": "B-Direito em um Eixo", - "item.create.belt_connector.tooltip.action1": "Seleciona o eixo como uma polia da Esteira. Os dois Eixos selecionadas precisam estar _alinhados_ seja na _Vertical,_ _Horizontal_ ou _Diagonal_ na direção da Esteira.", + "item.create.belt_connector.tooltip.action1": "Seleciona o eixo como uma polia da Esteira. Os dois Eixos selecionadas precisam estar _alinhados_ seja na _Vertical,_ _Horizontal_ ou _Diagonal_ na direção da Esteira.", "item.create.belt_connector.tooltip.control2": "B-Direito enquanto Abaixado", - "item.create.belt_connector.tooltip.action2": "_Cancela_ a seleção da Posição para a Esteira", + "item.create.belt_connector.tooltip.action2": "_Cancela_ a seleção da Posição para a Esteira", "item.create.goggles.tooltip": "UNLOCALIZED: GOGGLES", "item.create.goggles.tooltip.summary": "UNLOCALIZED: A pair of glasses to augment your vision with useful _kinetic_ _information_.", @@ -1141,17 +1086,17 @@ "block.create.creative_motor.tooltip": "UNLOCALIZED: CREATIVE MOTOR", "block.create.creative_motor.tooltip.summary": "UNLOCALIZED: A configurable source of _Rotational_ _Force_.", - "block.create.water_wheel.tooltip": "RODA DE Ã�GUA", - "block.create.water_wheel.tooltip.summary": "Prove _Força_ _Rotacional_ tirada de _Correntes_ de _Ã�gua_ próximas.", + "block.create.water_wheel.tooltip": "RODA DE ÁGUA", + "block.create.water_wheel.tooltip.summary": "Prove _Força_ _Rotacional_ tirada de _Correntes_ de _Água_ próximas.", "block.create.encased_fan.tooltip": "VENTILADO REVESTIDO", - "block.create.encased_fan.tooltip.summary": "Converte _Força_ _Rotacional_ em _Correntes_ de _Ar_ e vice-versa. Muitos usos.", + "block.create.encased_fan.tooltip.summary": "Converte _Força_ _Rotacional_ em _Correntes_ de _Ar_ e vice-versa. Muitos usos.", "block.create.encased_fan.tooltip.condition1": "Quando sobre Fogo", - "block.create.encased_fan.tooltip.behaviour1": "Prove _Força_ _Rotacional_ (precisa ser na vertical)", + "block.create.encased_fan.tooltip.behaviour1": "Prove _Força_ _Rotacional_ (precisa ser na vertical)", "block.create.encased_fan.tooltip.condition2": "Quando Invertido", - "block.create.encased_fan.tooltip.behaviour2": "_Empurra_ Entidades em um lado, _Puxa_ entidades no outro. Força e Velocidade dependem da Rotação de entrada.", - "block.create.encased_fan.tooltip.condition3": "Quando ar flui através de blocos especiais", - "block.create.encased_fan.tooltip.behaviour3": "Processa itens na frente do Bloco: _Ã�gua_ alva, _Fogo_ defuma, e _Lava_ derrete o ingrediente.", + "block.create.encased_fan.tooltip.behaviour2": "_Empurra_ Entidades em um lado, _Puxa_ entidades no outro. Força e Velocidade dependem da Rotação de entrada.", + "block.create.encased_fan.tooltip.condition3": "Quando ar flui através de blocos especiais", + "block.create.encased_fan.tooltip.behaviour3": "Processa itens na frente do Bloco: _Água_ alva, _Fogo_ defuma, e _Lava_ derrete o ingrediente.", "block.create.nozzle.tooltip": "UNLOCALIZED: NOZZLE", "block.create.nozzle.tooltip.summary": "UNLOCALIZED: Attach to the front of an _Encased_ _Fan_ to distribute its effect on Entities in _all_ _directions_.", @@ -1166,8 +1111,8 @@ "block.create.cuckoo_clock.tooltip.condition1": "UNLOCALIZED: When Rotated", "block.create.cuckoo_clock.tooltip.behaviour1": "UNLOCALIZED: Shows the _current_ _time_ and plays a tune twice a day. _Activates_ once at _noon_ and at dusk, as soon as _players_ _can_ _sleep_.", - "block.create.turntable.tooltip": "MESA GIRATÓRIA", - "block.create.turntable.tooltip.summary": "Muda a _Força_ _Rotacional_ em uma forma refinada de Enjoo.", + "block.create.turntable.tooltip": "MESA GIRATÓRIA", + "block.create.turntable.tooltip.summary": "Muda a _Força_ _Rotacional_ em uma forma refinada de Enjoo.", "block.create.millstone.tooltip": "UNLOCALIZED: MILLSTONE", "block.create.millstone.tooltip.summary": "UNLOCALIZED: A kinetic component suitable for _grinding_ inserted _materials_. Can be powered by an adjacent cogwheel or by connecting to the shaft at the bottom. Results have to be extracted from the component.", @@ -1177,15 +1122,15 @@ "block.create.millstone.tooltip.behaviour2": "UNLOCALIZED: Collects the outputs manually.", "block.create.crushing_wheel.tooltip": "RODA DE MOER", - "block.create.crushing_wheel.tooltip.summary": "Grandes rodas giratórias que _esmagam_ qualquer coisa que impeça seu movimento.", + "block.create.crushing_wheel.tooltip.summary": "Grandes rodas giratórias que _esmagam_ qualquer coisa que impeça seu movimento.", "block.create.crushing_wheel.tooltip.condition1": "Quando conectado a outras Rodas de Moer", - "block.create.crushing_wheel.tooltip.behaviour1": "Forma uma estrutura de esmagamento para processar uma variedade de coisas. Os Dentes da rota precisam estar conectados e se movimentando com a _mesma_ _velocidade_ em _direções_ _opostas._", + "block.create.crushing_wheel.tooltip.behaviour1": "Forma uma estrutura de esmagamento para processar uma variedade de coisas. Os Dentes da rota precisam estar conectados e se movimentando com a _mesma_ _velocidade_ em _direções_ _opostas._", - "block.create.mechanical_press.tooltip": "PRENSA MECÂNICA", - "block.create.mechanical_press.tooltip.summary": "Um forte pistão usado para comprimir itens abaixo dele. Precisa de _Força_ _Rotacional_ constante", + "block.create.mechanical_press.tooltip": "PRENSA MECÂNICA", + "block.create.mechanical_press.tooltip.summary": "Um forte pistão usado para comprimir itens abaixo dele. Precisa de _Força_ _Rotacional_ constante", "block.create.mechanical_press.tooltip.condition1": "Quando Ligado com Redstone", - "block.create.mechanical_press.tooltip.behaviour1": "_Inicia_ compressão de itens jogados abaixo dele.", - "block.create.mechanical_press.tooltip.condition2": "Quando Sobre uma Esteira Mecânica", + "block.create.mechanical_press.tooltip.behaviour1": "_Inicia_ compressão de itens jogados abaixo dele.", + "block.create.mechanical_press.tooltip.condition2": "Quando Sobre uma Esteira Mecânica", "block.create.mechanical_press.tooltip.behaviour2": "_Automaticamente_ comprime itens que passando na Esteira.", "block.create.mechanical_press.tooltip.condition3": "UNLOCALIZED: When above Basin", "block.create.mechanical_press.tooltip.behaviour3": "UNLOCALIZED: Starts to _compact_ _items_ in the basin whenever all necessary ingredients are present.", @@ -1243,27 +1188,27 @@ "block.create.rotation_speed_controller.tooltip.condition1": "UNLOCALIZED: When Attached to Large Cogwheel", "block.create.rotation_speed_controller.tooltip.behaviour1": "UNLOCALIZED: Relays incoming rotational force to the wheel, trying to _match_ the _speed_ it is configured to target. The _cogwheel_ has to be _attached_ _on_ _top_ of the controller.", - "block.create.mechanical_piston.tooltip": "PISTÃO MECÂNICO", - "block.create.mechanical_piston.tooltip.summary": "Uma verão melhorada do _Pistão,_ usando _Força_ _Rotacional_ para mover estruturas de forma precisa. _Varas_ de _Extensão_ do _Pistão_ na traseira definem o _Alcance_ deste Dispositivo. Sem extensões o pistão não se move. Use __Chassis_ de _Translado_ para mover mais de uma linha de blocos.", + "block.create.mechanical_piston.tooltip": "PISTÃO MECÂNICO", + "block.create.mechanical_piston.tooltip.summary": "Uma verão melhorada do _Pistão,_ usando _Força_ _Rotacional_ para mover estruturas de forma precisa. _Varas_ de _Extensão_ do _Pistão_ na traseira definem o _Alcance_ deste Dispositivo. Sem extensões o pistão não se move. Use __Chassis_ de _Translado_ para mover mais de uma linha de blocos.", "block.create.mechanical_piston.tooltip.condition1": "Quando Rodado", - "block.create.mechanical_piston.tooltip.behaviour1": "Começa a mover blocos presos na estrutura. Velocidade e direção diretamente relacionados a Velocidade Rotação de entrada.", + "block.create.mechanical_piston.tooltip.behaviour1": "Começa a mover blocos presos na estrutura. Velocidade e direção diretamente relacionados a Velocidade Rotação de entrada.", - "block.create.sticky_mechanical_piston.tooltip": "PISTÃO MECÂNICO GRUDENTO", - "block.create.sticky_mechanical_piston.tooltip.summary": "Uma versão melhorada do _Pistão_ _Grudento,_ usando _Força_ _Rotacional_ para mover estruturas de forma precisa. Varas_ de _Extensão_ do _Pistão_ na traseira definem o _Alcance_ deste Dispositivo. Sem extensões o pistão não se move. Use __Chassis_ de _Translado_ para mover mais de uma linha de blocos.", + "block.create.sticky_mechanical_piston.tooltip": "PISTÃO MECÂNICO GRUDENTO", + "block.create.sticky_mechanical_piston.tooltip.summary": "Uma versão melhorada do _Pistão_ _Grudento,_ usando _Força_ _Rotacional_ para mover estruturas de forma precisa. Varas_ de _Extensão_ do _Pistão_ na traseira definem o _Alcance_ deste Dispositivo. Sem extensões o pistão não se move. Use __Chassis_ de _Translado_ para mover mais de uma linha de blocos.", "block.create.sticky_mechanical_piston.tooltip.condition1": "Quando Rodado", - "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Começa a mover blocos presos na estrutura. Velocidade e direção diretamente relacionados a Velocidade Rotação de entrada.", + "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Começa a mover blocos presos na estrutura. Velocidade e direção diretamente relacionados a Velocidade Rotação de entrada.", - "block.create.piston_extension_pole.tooltip": "VARA DE EXTENSÃO DO PISTÃO", - "block.create.piston_extension_pole.tooltip.summary": "Aumenta o alcance de _Pistões_ _Mecânicos_", - "block.create.piston_extension_pole.tooltip.condition1": "Quando preso a um Pistão Mecânico", - "block.create.piston_extension_pole.tooltip.behaviour1": "Aumenta a extensão dos pistões em 1 bloco", + "block.create.piston_extension_pole.tooltip": "VARA DE EXTENSÃO DO PISTÃO", + "block.create.piston_extension_pole.tooltip.summary": "Aumenta o alcance de _Pistões_ _Mecânicos_", + "block.create.piston_extension_pole.tooltip.condition1": "Quando preso a um Pistão Mecânico", + "block.create.piston_extension_pole.tooltip.behaviour1": "Aumenta a extensão dos pistões em 1 bloco", - "block.create.mechanical_bearing.tooltip": "ROLAMENTO MECÂNICO", - "block.create.mechanical_bearing.tooltip.summary": "Usado para rotacionar _estruturas_ _grandes_ ou geração de _Força_ _Rotacional_ do vento.", + "block.create.mechanical_bearing.tooltip": "ROLAMENTO MECÂNICO", + "block.create.mechanical_bearing.tooltip.summary": "Usado para rotacionar _estruturas_ _grandes_ ou geração de _Força_ _Rotacional_ do vento.", "block.create.mechanical_bearing.tooltip.condition1": "Quando Rodado", - "block.create.mechanical_bearing.tooltip.behaviour1": "Começa a rotacionar _Chassis_ de _Rotação_ conectados e blocos conectados a eles.", + "block.create.mechanical_bearing.tooltip.behaviour1": "Começa a rotacionar _Chassis_ de _Rotação_ conectados e blocos conectados a eles.", "block.create.mechanical_bearing.tooltip.condition2": "Quando Ligado por Redstone", - "block.create.mechanical_bearing.tooltip.behaviour2": "Começa a passar _Força_ _Rotacional_ das estruturas conectadas. A estrutura dele incluir _Blocos_ de _Vela_ válidos (atualmente qualquer Bloco de Lã).", + "block.create.mechanical_bearing.tooltip.behaviour2": "Começa a passar _Força_ _Rotacional_ das estruturas conectadas. A estrutura dele incluir _Blocos_ de _Vela_ válidos (atualmente qualquer Bloco de Lã).", "block.create.clockwork_bearing.tooltip": "UNLOCALIZED: CLOCKWORK BEARING", "block.create.clockwork_bearing.tooltip.summary": "UNLOCALIZED: An advanced version of the _Mechanical_ _Bearing_ for rotating up to two _clock_ _hands_ according to current _in-game_ _time_.", @@ -1294,34 +1239,34 @@ "block.create.rope_pulley.tooltip.behaviour1": "UNLOCALIZED: Starts moving the attached structure. Speed and direction correlate to the incoming Rotation Speed.", "block.create.linear_chassis.tooltip": "CHASSIS DE TRANSLADO", - "block.create.linear_chassis.tooltip.summary": "Uma base configurável para Estruturas serem movidas por um _Pistão_ _Mecânico._ Esses Blocos precisam formas uma camada de blocos na frente do Pistão.", - "block.create.linear_chassis.tooltip.condition1": "Quando movido por Pistão Mecânico", - "block.create.linear_chassis.tooltip.behaviour1": "_Move_ todos os _Chassis_ _conectados_ na mesma orientação, e Blocos conectados a frente dele. Quando o Pistão volta, blocos apenas serão puxados se a face do chassis for _Grudenta_ (Ver [Ctrl]).", + "block.create.linear_chassis.tooltip.summary": "Uma base configurável para Estruturas serem movidas por um _Pistão_ _Mecânico._ Esses Blocos precisam formas uma camada de blocos na frente do Pistão.", + "block.create.linear_chassis.tooltip.condition1": "Quando movido por Pistão Mecânico", + "block.create.linear_chassis.tooltip.behaviour1": "_Move_ todos os _Chassis_ _conectados_ na mesma orientação, e Blocos conectados a frente dele. Quando o Pistão volta, blocos apenas serão puxados se a face do chassis for _Grudenta_ (Ver [Ctrl]).", "block.create.linear_chassis.tooltip.condition2": "UNLOCALIZED: With Wrench", "block.create.linear_chassis.tooltip.behaviour2": "UNLOCALIZED: Configure the _range_ for this chassis block. Hold CTRL to modify the range of all attached chassis blocks as well.", "block.create.linear_chassis.tooltip.control1": "Quando clicado com B-Direito com Gosma de Slime", - "block.create.linear_chassis.tooltip.action1": "Torna a face clicada _Grudenta._ Quando o pistão volta, o chassis irá _puxar_ _junto_ todos os Blocos conectados na sua coluna e no Alcance configurado.", + "block.create.linear_chassis.tooltip.action1": "Torna a face clicada _Grudenta._ Quando o pistão volta, o chassis irá _puxar_ _junto_ todos os Blocos conectados na sua coluna e no Alcance configurado.", - "block.create.radial_chassis.tooltip": "CHASSIS DE ROTAÇÃO", - "block.create.radial_chassis.tooltip.summary": "Nessário para rotacionar estruturas om um _Rolamento_ _Mecânico._ ", + "block.create.radial_chassis.tooltip": "CHASSIS DE ROTAÇÃO", + "block.create.radial_chassis.tooltip.summary": "Nessário para rotacionar estruturas om um _Rolamento_ _Mecânico._ ", "block.create.radial_chassis.tooltip.condition1": "Quando Rotacionado por Rolamento", - "block.create.radial_chassis.tooltip.behaviour1": "_Rotaciona_ todos os blocos conectados a lados _Grudentos_ (Veja [Ctrl]) dentro do alcance configurado no seu entorno. _Propaga_ a rotação para outros Chassis de Rotação conectados.", + "block.create.radial_chassis.tooltip.behaviour1": "_Rotaciona_ todos os blocos conectados a lados _Grudentos_ (Veja [Ctrl]) dentro do alcance configurado no seu entorno. _Propaga_ a rotação para outros Chassis de Rotação conectados.", "block.create.radial_chassis.tooltip.condition2": "UNLOCALIZED: With Wrench", "block.create.radial_chassis.tooltip.behaviour2": "UNLOCALIZED: Configure the _range_ for this chassis block. Hold CTRL to modify the range of all attached chassis blocks as well.", "block.create.radial_chassis.tooltip.control1": "Quando clicado com B-Direito com Goma de Slime", - "block.create.radial_chassis.tooltip.action1": "Torna face clicada em _Grudenta._ Quando o Chassis girar, todos os blocos conectados nesse lado irão girar junto.", + "block.create.radial_chassis.tooltip.action1": "Torna face clicada em _Grudenta._ Quando o Chassis girar, todos os blocos conectados nesse lado irão girar junto.", - "block.create.mechanical_drill.tooltip": "FURADEIRA MECÂNICA", - "block.create.mechanical_drill.tooltip.summary": "Um dispositivo mecânido feito para _quebrar_ _blocos._", + "block.create.mechanical_drill.tooltip": "FURADEIRA MECÂNICA", + "block.create.mechanical_drill.tooltip.summary": "Um dispositivo mecânido feito para _quebrar_ _blocos._", "block.create.mechanical_drill.tooltip.condition1": "Quando Rodado", - "block.create.mechanical_drill.tooltip.behaviour1": "Atua como um Bloco Quebrador _estacionário._ Também _machuca_ _entidades_ na sua área de efeito.", - "block.create.mechanical_drill.tooltip.condition2": "Quando Empurrado por Pistão Mecânico", - "block.create.mechanical_drill.tooltip.behaviour2": "Quebra os Blocos na direção do avanço da broca.", + "block.create.mechanical_drill.tooltip.behaviour1": "Atua como um Bloco Quebrador _estacionário._ Também _machuca_ _entidades_ na sua área de efeito.", + "block.create.mechanical_drill.tooltip.condition2": "Quando Empurrado por Pistão Mecânico", + "block.create.mechanical_drill.tooltip.behaviour2": "Quebra os Blocos na direção do avanço da broca.", - "block.create.mechanical_harvester.tooltip": "COLETOR MECÂNICO", - "block.create.mechanical_harvester.tooltip.summary": "Um cortador de plantas mecânico indicado para automação de culturas de médio porte", - "block.create.mechanical_harvester.tooltip.condition1": "Quando Empurrado por Pistão Mecânico", - "block.create.mechanical_harvester.tooltip.behaviour1": "_Colhe_ todas as _safra_ _madura_ que a lâmina passar sobre, e os retorna a estado de crescimento inicial.", + "block.create.mechanical_harvester.tooltip": "COLETOR MECÂNICO", + "block.create.mechanical_harvester.tooltip.summary": "Um cortador de plantas mecânico indicado para automação de culturas de médio porte", + "block.create.mechanical_harvester.tooltip.condition1": "Quando Empurrado por Pistão Mecânico", + "block.create.mechanical_harvester.tooltip.behaviour1": "_Colhe_ todas as _safra_ _madura_ que a lâmina passar sobre, e os retorna a estado de crescimento inicial.", "block.create.mechanical_plough.tooltip": "UNLOCALIZED: MECHANICAL PLOUGH", "block.create.mechanical_plough.tooltip.summary": "UNLOCALIZED: A mechanical plough has a variety of uses. It is movable with _Mechanical_ _Pistons_, _Bearings_ or other controllers.", @@ -1338,20 +1283,20 @@ "block.create.mechanical_saw.tooltip.behaviour3": "UNLOCALIZED: _Cuts_ all _Trees_ with which the saw collides.", "block.create.stockpile_switch.tooltip": "DISJUNTOR DE ARMAZENAMENTO", - "block.create.stockpile_switch.tooltip.summary": "Alterna um sinal de Redstone com base no _Espaço_ de _Armazenamento_ do Reciente conectado.", - "block.create.stockpile_switch.tooltip.condition1": "Quando abaixo do Limite Mínimo", + "block.create.stockpile_switch.tooltip.summary": "Alterna um sinal de Redstone com base no _Espaço_ de _Armazenamento_ do Reciente conectado.", + "block.create.stockpile_switch.tooltip.condition1": "Quando abaixo do Limite Mínimo", "block.create.stockpile_switch.tooltip.behaviour1": "Para de enviar _Sinal_ de _Redstone_", - "block.create.stockpile_switch.tooltip.condition2": "Quando acima do Limite Máximo", - "block.create.stockpile_switch.tooltip.behaviour2": "Começa a enviar _Sinal_ de _Redstone_ até chegar no Limite Mínio novamente.", + "block.create.stockpile_switch.tooltip.condition2": "Quando acima do Limite Máximo", + "block.create.stockpile_switch.tooltip.behaviour2": "Começa a enviar _Sinal_ de _Redstone_ até chegar no Limite Mínio novamente.", "block.create.stockpile_switch.tooltip.control1": "Quando clicado com B-Direito", - "block.create.stockpile_switch.tooltip.action1": "Abre a _Interface_ de _Configuração_", + "block.create.stockpile_switch.tooltip.action1": "Abre a _Interface_ de _Configuração_", - "block.create.redstone_link.tooltip": "CONEXÃO DE REDSTONE", - "block.create.redstone_link.tooltip.summary": "Saida para conexões _Redstone_ _Sem-Fio._ Pode ter _Frequências_ usando qualquer item. Distancia do Sinal é limitada, mas resoavelmente justa.", + "block.create.redstone_link.tooltip": "CONEXÃO DE REDSTONE", + "block.create.redstone_link.tooltip.summary": "Saida para conexões _Redstone_ _Sem-Fio._ Pode ter _Frequências_ usando qualquer item. Distancia do Sinal é limitada, mas resoavelmente justa.", "block.create.redstone_link.tooltip.condition1": "Quando Ligado", - "block.create.redstone_link.tooltip.behaviour1": "Recebendo Conexões da mesma _Frequência_ irá gerar um sinal de Redstone.", + "block.create.redstone_link.tooltip.behaviour1": "Recebendo Conexões da mesma _Frequência_ irá gerar um sinal de Redstone.", "block.create.redstone_link.tooltip.control1": "Quando clicado com B-Direito com um Item", - "block.create.redstone_link.tooltip.action1": "Altera a _Frequência_ para aquele item. Até _dois_ _itens_ _diferentes_ podem ser combinados para definir uma Frequência.", + "block.create.redstone_link.tooltip.action1": "Altera a _Frequência_ para aquele item. Até _dois_ _itens_ _diferentes_ podem ser combinados para definir uma Frequência.", "block.create.redstone_link.tooltip.control2": "Quando clicado com B-Direito enquanto Abaixado", "block.create.redstone_link.tooltip.action2": "Muda entre Modo _Receptor_ e _Transmissor_ .", @@ -1361,19 +1306,19 @@ "block.create.nixie_tube.tooltip.behaviour1": "UNLOCALIZED: Shows the current redstone _Signal_ _Strength_ as its displayed value.", "block.create.redstone_contact.tooltip": "CONTATO DE REDSTONE", - "block.create.redstone_contact.tooltip.summary": "Um dispositivo simples para Mecanimos de Redstone avançados.", + "block.create.redstone_contact.tooltip.summary": "Um dispositivo simples para Mecanimos de Redstone avançados.", "block.create.redstone_contact.tooltip.condition1": "Quando apontando para outro Contato", - "block.create.redstone_contact.tooltip.behaviour1": "Provê um _Sinal_ de _Redstone_", - "block.create.redstone_contact.tooltip.condition2": "Quando movido por Pistão Mecânico", - "block.create.redstone_contact.tooltip.behaviour2": "Ativa todos os Contatos imóveis na passagem", + "block.create.redstone_contact.tooltip.behaviour1": "Provê um _Sinal_ de _Redstone_", + "block.create.redstone_contact.tooltip.condition2": "Quando movido por Pistão Mecânico", + "block.create.redstone_contact.tooltip.behaviour2": "Ativa todos os Contatos imóveis na passagem", "block.create.adjustable_crate.tooltip": "adjustable_crate", - "block.create.adjustable_crate.tooltip.summary": "Este _Recipiente_ de _Armazenamento_ permite controle Manual da sua capacidade. Pode conter até _16_ _Pilhas_ de qualquer Item", + "block.create.adjustable_crate.tooltip.summary": "Este _Recipiente_ de _Armazenamento_ permite controle Manual da sua capacidade. Pode conter até _16_ _Pilhas_ de qualquer Item", "block.create.adjustable_crate.tooltip.control1": "Quando clicado com B-Direito", "block.create.adjustable_crate.tooltip.action1": "Abre a _Interface_", "block.create.creative_crate.tooltip": "CRIATIVADOR ESQUEMAANNON", - "block.create.creative_crate.tooltip.summary": "Provê um suprimento infinito de blocos para _Esquemaannons_ próximos", + "block.create.creative_crate.tooltip.summary": "Provê um suprimento infinito de blocos para _Esquemaannons_ próximos", "block.create.creative_crate.tooltip.condition1": "UNLOCALIZED: When Item in Filter Slot", "block.create.creative_crate.tooltip.behaviour1": "UNLOCALIZED: Anything _extracting_ from this container will provide an _endless_ _supply_ of the item specified. Items _inserted_ into this crate will be _voided._", @@ -1385,7 +1330,7 @@ "block.create.deployer.tooltip.behaviour2": "UNLOCALIZED: Toggles punch mode. In _punch_ _mode_, the Deployer will attempt to use its item to _break_ _blocks_ or _hurt_ _entities_.", "block.create.funnel.tooltip": "FUNIL DE ESTEIRA", - "block.create.funnel.tooltip.summary": "Coleta itens passando numa _Esteira_ _Mecânica_ e os insere no _Inventário_ conetado, se possível. Precisa estar diretamente _sobre_ uma Esteira, com a abertura virada contra o movimento da Esteira. O inventário precisa estar na mesma altura que o funil.", + "block.create.funnel.tooltip.summary": "Coleta itens passando numa _Esteira_ _Mecânica_ e os insere no _Inventário_ conetado, se possível. Precisa estar diretamente _sobre_ uma Esteira, com a abertura virada contra o movimento da Esteira. O inventário precisa estar na mesma altura que o funil.", "block.create.funnel.tooltip.condition1": "UNLOCALIZED: Passive Belt pulling", "block.create.funnel.tooltip.behaviour1": "UNLOCALIZED: Funnels can pull items _from_ _belts_ when placed above them, either sideways or at the end. When a side-ways funnel is backed up, items on the _belt_ _will_ _not_ _stall_.", @@ -1402,9 +1347,9 @@ "block.create.brass_casing.tooltip.behaviour1": "UNLOCALIZED: _Reinforces_ _belts_ with a brass foundation. Reinforced Belts can support _Belt_ _Tunnels_, _Extractors_, _Funnels_, and _Transposers_ interacting with the belt from the sides and below.", "block.create.belt_observer.tooltip": "OBSERVADOR DE ESTEIRA", - "block.create.belt_observer.tooltip.summary": "Detecta os itens passando numa _Esteira_ _Mecânica_ a sua frente. Funciona bem com um _Pistão_ em cima, empurrando certos itens.", + "block.create.belt_observer.tooltip.summary": "Detecta os itens passando numa _Esteira_ _Mecânica_ a sua frente. Funciona bem com um _Pistão_ em cima, empurrando certos itens.", "block.create.belt_observer.tooltip.condition1": "Quando item bate com Filtro", - "block.create.belt_observer.tooltip.behaviour1": "Provê um _Pulso_ curto de _Redstone_ para todos os lados. Um Filtro vazio considera todos os itens passando.", + "block.create.belt_observer.tooltip.behaviour1": "Provê um _Pulso_ curto de _Redstone_ para todos os lados. Um Filtro vazio considera todos os itens passando.", "block.create.belt_observer.tooltip.condition2": "UNLOCALIZED: Pulse Mode", "block.create.belt_observer.tooltip.behaviour2": "UNLOCALIZED: Emits a _pulse_ when a _matching_ _item_ _passes_ the center of the observed belt segment.", "block.create.belt_observer.tooltip.condition3": "UNLOCALIZED: Eject Mode", @@ -1413,10 +1358,10 @@ "block.create.belt_observer.tooltip.behaviour4": "UNLOCALIZED: _Splits_ a _matching_ _item_ _stack_ and _ejects_ _half_ of it off the side.", "block.create.pulse_repeater.tooltip": "REPETIDOR DE PULSO", - "block.create.pulse_repeater.tooltip.summary": "Um circuito simples para cortar pulsos de Redstone até um comprimento de _1_ _tick._", + "block.create.pulse_repeater.tooltip.summary": "Um circuito simples para cortar pulsos de Redstone até um comprimento de _1_ _tick._", "block.create.adjustable_repeater.tooltip": "REPETIDOR FLEX", - "block.create.adjustable_repeater.tooltip.summary": "Um um _Repetidor_ de _Redstone_ avançado com um _Delay_ _configurável_ de até 30 Minutos.", + "block.create.adjustable_repeater.tooltip.summary": "Um um _Repetidor_ de _Redstone_ avançado com um _Delay_ _configurável_ de até 30 Minutos.", "block.create.adjustable_pulse_repeater.tooltip": "UNLOCALIZED: FLEX PULSE REPEATER", "block.create.adjustable_pulse_repeater.tooltip.summary": "UNLOCALIZED: A _Pulse_ _Repeater_ with a _configurable_ _Delay_ up to 30 Minutes.", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index 3859bb521..cc0e86c5a 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -5,13 +5,13 @@ "block.create.acacia_window": "UNLOCALIZED: Acacia Window", "block.create.acacia_window_pane": "UNLOCALIZED: Acacia Window Pane", - "block.create.adjustable_crate": "Гибкий Ñ�щик", + "block.create.adjustable_crate": "Гибкий ящик", "block.create.adjustable_pulley": "UNLOCALIZED: Adjustable Pulley", "block.create.adjustable_pulse_repeater": "UNLOCALIZED: Adjustable Pulse Repeater", - "block.create.adjustable_repeater": "Ð�аÑ�траиваемый повторитель", + "block.create.adjustable_repeater": "Настраиваемый повторитель", "block.create.analog_lever": "UNLOCALIZED: Analog Lever", "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", - "block.create.andesite_bricks": "Ð�ндезитовые кирпичи", + "block.create.andesite_bricks": "Андезитовые кирпичи", "block.create.andesite_bricks_slab": "UNLOCALIZED: Andesite Bricks Slab", "block.create.andesite_bricks_stairs": "UNLOCALIZED: Andesite Bricks Stairs", "block.create.andesite_bricks_wall": "UNLOCALIZED: Andesite Bricks Wall", @@ -24,12 +24,7 @@ "block.create.andesite_pillar": "UNLOCALIZED: Andesite Pillar", "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", "block.create.basin": "UNLOCALIZED: Basin", -<<<<<<< HEAD - "block.create.belt": "МеханичеÑ�каÑ� лента", - "block.create.belt_observer": "Ленточный Ñ�канер", -======= "block.create.belt": "Механическая лента", ->>>>>>> mc1.15/dev "block.create.birch_window": "UNLOCALIZED: Birch Window", "block.create.birch_window_pane": "UNLOCALIZED: Birch Window Pane", "block.create.black_seat": "UNLOCALIZED: Black Seat", @@ -53,27 +48,18 @@ "block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone", "block.create.chute": "UNLOCALIZED: Chute", "block.create.clockwork_bearing": "UNLOCALIZED: Clockwork Bearing", -<<<<<<< HEAD - "block.create.clutch": "ПереключаемаÑ� муфта", - "block.create.cogwheel": "ШеÑ�тернÑ�", -======= "block.create.clutch": "Переключаемая муфта", "block.create.cogwheel": "Шестерня", "block.create.content_observer": "UNLOCALIZED: Content Observer", ->>>>>>> mc1.15/dev "block.create.copper_block": "UNLOCALIZED: Copper Block", "block.create.copper_casing": "UNLOCALIZED: Copper Casing", "block.create.copper_ore": "UNLOCALIZED: Copper Ore", "block.create.copper_shingles": "UNLOCALIZED: Copper Shingles", "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", -<<<<<<< HEAD - "block.create.creative_crate": "Креативный Ñ�щик", -======= "block.create.copper_valve_handle": "UNLOCALIZED: Copper Valve Handle", "block.create.creative_crate": "Креативный ящик", ->>>>>>> mc1.15/dev "block.create.creative_motor": "UNLOCALIZED: Creative Motor", - "block.create.crushing_wheel": "Дробильное колеÑ�о", + "block.create.crushing_wheel": "Дробильное колесо", "block.create.crushing_wheel_controller": "UNLOCALIZED: Crushing Wheel Controller", "block.create.cuckoo_clock": "UNLOCALIZED: Cuckoo Clock", "block.create.cyan_seat": "UNLOCALIZED: Cyan Seat", @@ -92,7 +78,7 @@ "block.create.dark_scoria_pillar": "UNLOCALIZED: Dark Scoria Pillar", "block.create.deployer": "UNLOCALIZED: Deployer", "block.create.depot": "UNLOCALIZED: Depot", - "block.create.diorite_bricks": "Диоритовые кирпичи", + "block.create.diorite_bricks": "Диоритовые кирпичи", "block.create.diorite_bricks_slab": "UNLOCALIZED: Diorite Bricks Slab", "block.create.diorite_bricks_stairs": "UNLOCALIZED: Diorite Bricks Stairs", "block.create.diorite_bricks_wall": "UNLOCALIZED: Diorite Bricks Wall", @@ -101,20 +87,20 @@ "block.create.diorite_cobblestone_stairs": "UNLOCALIZED: Diorite Cobblestone Stairs", "block.create.diorite_cobblestone_wall": "UNLOCALIZED: Diorite Cobblestone Wall", "block.create.diorite_pillar": "UNLOCALIZED: Diorite Pillar", - "block.create.dolomite": "Доломит", - "block.create.dolomite_bricks": "Доломитовые кирпичи", - "block.create.dolomite_bricks_slab": "Плита из доломитового кирпича", - "block.create.dolomite_bricks_stairs": "Ступеньки из доломитового кирпича", - "block.create.dolomite_bricks_wall": "Ограда из доломитового кирпича", + "block.create.dolomite": "Доломит", + "block.create.dolomite_bricks": "Доломитовые кирпичи", + "block.create.dolomite_bricks_slab": "Плита из доломитового кирпича", + "block.create.dolomite_bricks_stairs": "Ступеньки из доломитового кирпича", + "block.create.dolomite_bricks_wall": "Ограда из доломитового кирпича", "block.create.dolomite_cobblestone": "UNLOCALIZED: Dolomite Cobblestone", "block.create.dolomite_cobblestone_slab": "UNLOCALIZED: Dolomite Cobblestone Slab", "block.create.dolomite_cobblestone_stairs": "UNLOCALIZED: Dolomite Cobblestone Stairs", "block.create.dolomite_cobblestone_wall": "UNLOCALIZED: Dolomite Cobblestone Wall", - "block.create.dolomite_pillar": "ДоломитоваÑ� колонна", - "block.create.encased_belt": "Ленточный привод", - "block.create.encased_fan": "ВентилÑ�тор", + "block.create.dolomite_pillar": "Доломитовая колонна", + "block.create.encased_belt": "Ленточный привод", + "block.create.encased_fan": "Вентилятор", "block.create.encased_fluid_pipe": "UNLOCALIZED: Encased Fluid Pipe", - "block.create.encased_shaft": "Вальный привод", + "block.create.encased_shaft": "Вальный привод", "block.create.fancy_andesite_bricks": "UNLOCALIZED: Fancy Andesite Bricks", "block.create.fancy_andesite_bricks_slab": "UNLOCALIZED: Fancy Andesite Bricks Slab", "block.create.fancy_andesite_bricks_stairs": "UNLOCALIZED: Fancy Andesite Bricks Stairs", @@ -158,20 +144,20 @@ "block.create.framed_glass": "UNLOCALIZED: Framed Glass", "block.create.framed_glass_pane": "UNLOCALIZED: Framed Glass Pane", "block.create.furnace_engine": "UNLOCALIZED: Furnace Engine", - "block.create.gabbro": "Габбро", - "block.create.gabbro_bricks": "Габбровые кирпичи", + "block.create.gabbro": "Габбро", + "block.create.gabbro_bricks": "Габбровые кирпичи", "block.create.gabbro_bricks_slab": "UNLOCALIZED: Gabbro Bricks Slab", - "block.create.gabbro_bricks_stairs": "Ступеньки из габбрового кирпича", - "block.create.gabbro_bricks_wall": "Ограда из габбрового кирпича", + "block.create.gabbro_bricks_stairs": "Ступеньки из габбрового кирпича", + "block.create.gabbro_bricks_wall": "Ограда из габбрового кирпича", "block.create.gabbro_cobblestone": "UNLOCALIZED: Gabbro Cobblestone", "block.create.gabbro_cobblestone_slab": "UNLOCALIZED: Gabbro Cobblestone Slab", "block.create.gabbro_cobblestone_stairs": "UNLOCALIZED: Gabbro Cobblestone Stairs", "block.create.gabbro_cobblestone_wall": "UNLOCALIZED: Gabbro Cobblestone Wall", "block.create.gabbro_pillar": "UNLOCALIZED: Gabbro Pillar", - "block.create.gearbox": "Муфта", - "block.create.gearshift": "РеверÑ�ивнаÑ� муфта", + "block.create.gearbox": "Муфта", + "block.create.gearshift": "Реверсивная муфта", "block.create.glass_fluid_pipe": "UNLOCALIZED: Glass Fluid Pipe", - "block.create.granite_bricks": "Гранитные кирпичи", + "block.create.granite_bricks": "Гранитные кирпичи", "block.create.granite_bricks_slab": "UNLOCALIZED: Granite Bricks Slab", "block.create.granite_bricks_stairs": "UNLOCALIZED: Granite Bricks Stairs", "block.create.granite_bricks_wall": "UNLOCALIZED: Granite Bricks Wall", @@ -189,7 +175,7 @@ "block.create.horizontal_framed_glass_pane": "UNLOCALIZED: Horizontal Framed Glass Pane", "block.create.jungle_window": "UNLOCALIZED: Jungle Window", "block.create.jungle_window_pane": "UNLOCALIZED: Jungle Window Pane", - "block.create.large_cogwheel": "БольшаÑ� шеÑ�тернÑ�", + "block.create.large_cogwheel": "Большая шестерня", "block.create.layered_andesite": "UNLOCALIZED: Layered Andesite", "block.create.layered_dark_scoria": "UNLOCALIZED: Layered Dark Scoria", "block.create.layered_diorite": "UNLOCALIZED: Layered Diorite", @@ -204,14 +190,6 @@ "block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat", "block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle", "block.create.lime_seat": "UNLOCALIZED: Lime Seat", -<<<<<<< HEAD - "block.create.limesand": "ИзвеÑ�Ñ‚ÑŒ", - "block.create.limestone": "ИзвеÑ�тнÑ�к", - "block.create.limestone_bricks": "ИзвеÑ�тковые кирпичи", - "block.create.limestone_bricks_slab": "Плита из извеÑ�ткового кирпича", - "block.create.limestone_bricks_stairs": "Ступеньки из извеÑ�ткового кирпича", - "block.create.limestone_bricks_wall": "Ограда из извеÑ�ткового кирпича", -======= "block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle", "block.create.limesand": "Известь", "block.create.limestone": "Известняк", @@ -219,25 +197,24 @@ "block.create.limestone_bricks_slab": "Плита из известкового кирпича", "block.create.limestone_bricks_stairs": "Ступеньки из известкового кирпича", "block.create.limestone_bricks_wall": "Ограда из известкового кирпича", ->>>>>>> mc1.15/dev "block.create.limestone_cobblestone": "UNLOCALIZED: Limestone Cobblestone", "block.create.limestone_cobblestone_slab": "UNLOCALIZED: Limestone Cobblestone Slab", "block.create.limestone_cobblestone_stairs": "UNLOCALIZED: Limestone Cobblestone Stairs", "block.create.limestone_cobblestone_wall": "UNLOCALIZED: Limestone Cobblestone Wall", - "block.create.limestone_pillar": "ИзвеÑ�тнÑ�коваÑ� колонна", - "block.create.linear_chassis": "ПоÑ�тупательнаÑ� рама", + "block.create.limestone_pillar": "Известняковая колонна", + "block.create.linear_chassis": "Поступательная рама", "block.create.magenta_seat": "UNLOCALIZED: Magenta Seat", "block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle", "block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm", - "block.create.mechanical_bearing": "МеханичеÑ�кий подшипник", + "block.create.mechanical_bearing": "Механический подшипник", "block.create.mechanical_crafter": "UNLOCALIZED: Mechanical Crafter", - "block.create.mechanical_drill": "МеханичеÑ�кий бур", - "block.create.mechanical_harvester": "МеханичеÑ�кий комбайнер", + "block.create.mechanical_drill": "Механический бур", + "block.create.mechanical_harvester": "Механический комбайнер", "block.create.mechanical_mixer": "UNLOCALIZED: Mechanical Mixer", - "block.create.mechanical_piston": "МеханичеÑ�кий поршень", - "block.create.mechanical_piston_head": "Ствол механичеÑ�кого поршнÑ�", + "block.create.mechanical_piston": "Механический поршень", + "block.create.mechanical_piston_head": "Ствол механического поршня", "block.create.mechanical_plough": "UNLOCALIZED: Mechanical Plough", - "block.create.mechanical_press": "МеханичеÑ�кий преÑ�Ñ�", + "block.create.mechanical_press": "Механический пресс", "block.create.mechanical_pump": "UNLOCALIZED: Mechanical Pump", "block.create.mechanical_saw": "UNLOCALIZED: Mechanical Saw", "block.create.millstone": "UNLOCALIZED: Millstone", @@ -307,62 +284,51 @@ "block.create.paved_weathered_limestone_stairs": "UNLOCALIZED: Paved Weathered Limestone Stairs", "block.create.paved_weathered_limestone_wall": "UNLOCALIZED: Paved Weathered Limestone Wall", "block.create.pink_seat": "UNLOCALIZED: Pink Seat", -<<<<<<< HEAD - "block.create.piston_extension_pole": "Удлинитель поршнÑ�", -======= "block.create.pink_valve_handle": "UNLOCALIZED: Pink Valve Handle", "block.create.piston_extension_pole": "Удлинитель поршня", ->>>>>>> mc1.15/dev "block.create.polished_dark_scoria": "UNLOCALIZED: Polished Dark Scoria", "block.create.polished_dark_scoria_slab": "UNLOCALIZED: Polished Dark Scoria Slab", "block.create.polished_dark_scoria_stairs": "UNLOCALIZED: Polished Dark Scoria Stairs", "block.create.polished_dark_scoria_wall": "UNLOCALIZED: Polished Dark Scoria Wall", - "block.create.polished_dolomite": "Полированный доломит", + "block.create.polished_dolomite": "Полированный доломит", "block.create.polished_dolomite_slab": "UNLOCALIZED: Polished Dolomite Slab", "block.create.polished_dolomite_stairs": "UNLOCALIZED: Polished Dolomite Stairs", "block.create.polished_dolomite_wall": "UNLOCALIZED: Polished Dolomite Wall", - "block.create.polished_gabbro": "Полированный габбро", + "block.create.polished_gabbro": "Полированный габбро", "block.create.polished_gabbro_slab": "UNLOCALIZED: Polished Gabbro Slab", "block.create.polished_gabbro_stairs": "UNLOCALIZED: Polished Gabbro Stairs", "block.create.polished_gabbro_wall": "UNLOCALIZED: Polished Gabbro Wall", - "block.create.polished_limestone": "Полированный извеÑ�тнÑ�к", - "block.create.polished_limestone_slab": "Плита из полированного извеÑ�тнÑ�ка", + "block.create.polished_limestone": "Полированный известняк", + "block.create.polished_limestone_slab": "Плита из полированного известняка", "block.create.polished_limestone_stairs": "UNLOCALIZED: Polished Limestone Stairs", "block.create.polished_limestone_wall": "UNLOCALIZED: Polished Limestone Wall", "block.create.polished_scoria": "UNLOCALIZED: Polished Scoria", "block.create.polished_scoria_slab": "UNLOCALIZED: Polished Scoria Slab", "block.create.polished_scoria_stairs": "UNLOCALIZED: Polished Scoria Stairs", "block.create.polished_scoria_wall": "UNLOCALIZED: Polished Scoria Wall", - "block.create.polished_weathered_limestone": "Полированный обветренный извеÑ�тнÑ�к", - "block.create.polished_weathered_limestone_slab": "Плита из полированного обветренного извеÑ�тнÑ�ка", + "block.create.polished_weathered_limestone": "Полированный обветренный известняк", + "block.create.polished_weathered_limestone_slab": "Плита из полированного обветренного известняка", "block.create.polished_weathered_limestone_stairs": "UNLOCALIZED: Polished Weathered Limestone Stairs", "block.create.polished_weathered_limestone_wall": "UNLOCALIZED: Polished Weathered Limestone Wall", "block.create.portable_storage_interface": "UNLOCALIZED: Portable Storage Interface", "block.create.powered_latch": "UNLOCALIZED: Powered Latch", "block.create.powered_toggle_latch": "UNLOCALIZED: Powered Toggle Latch", "block.create.pulley_magnet": "UNLOCALIZED: Pulley Magnet", - "block.create.pulse_repeater": "Повторитель импульÑ�а", + "block.create.pulse_repeater": "Повторитель импульса", "block.create.purple_seat": "UNLOCALIZED: Purple Seat", -<<<<<<< HEAD - "block.create.radial_chassis": "ПоворотнаÑ� рама", - "block.create.red_seat": "UNLOCALIZED: Red Seat", - "block.create.redstone_contact": "Контактное Ñ�оединение", - "block.create.redstone_link": "Сигнальное Ñ�оединение", -======= "block.create.purple_valve_handle": "UNLOCALIZED: Purple Valve Handle", "block.create.radial_chassis": "Поворотная рама", "block.create.red_seat": "UNLOCALIZED: Red Seat", "block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle", "block.create.redstone_contact": "Контактное соединение", "block.create.redstone_link": "Сигнальное соединение", ->>>>>>> mc1.15/dev "block.create.refined_radiance_casing": "UNLOCALIZED: Radiant Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", "block.create.rope": "UNLOCALIZED: Rope", "block.create.rope_pulley": "UNLOCALIZED: Rope Pulley", "block.create.rotation_speed_controller": "UNLOCALIZED: Rotation Speed Controller", - "block.create.schematic_table": "Стол длÑ� Ñ�хем", - "block.create.schematicannon": "Схемопушка", + "block.create.schematic_table": "Стол для схем", + "block.create.schematicannon": "Схемопушка", "block.create.scoria": "UNLOCALIZED: Scoria", "block.create.scoria_bricks": "UNLOCALIZED: Scoria Bricks", "block.create.scoria_bricks_slab": "UNLOCALIZED: Scoria Bricks Slab", @@ -376,30 +342,30 @@ "block.create.secondary_linear_chassis": "UNLOCALIZED: Secondary Linear Chassis", "block.create.sequenced_gearshift": "UNLOCALIZED: Sequenced Gearshift", "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Casing", - "block.create.shaft": "Вал", + "block.create.shaft": "Вал", "block.create.speedometer": "UNLOCALIZED: Speedometer", "block.create.spout": "UNLOCALIZED: Spout", "block.create.spruce_window": "UNLOCALIZED: Spruce Window", "block.create.spruce_window_pane": "UNLOCALIZED: Spruce Window Pane", - "block.create.sticky_mechanical_piston": "Липкий механичеÑ�кий поршень", - "block.create.stockpile_switch": "Коммутатор хранилища", + "block.create.sticky_mechanical_piston": "Липкий механический поршень", + "block.create.stockpile_switch": "Коммутатор хранилища", "block.create.stressometer": "UNLOCALIZED: Stressometer", - "block.create.tiled_glass": "Плиточное Ñ�текло", - "block.create.tiled_glass_pane": "ПлиточнаÑ� Ñ�теклÑ�ннаÑ� панель", - "block.create.turntable": "Поворотный Ñ�тол", + "block.create.tiled_glass": "Плиточное стекло", + "block.create.tiled_glass_pane": "Плиточная стеклянная панель", + "block.create.turntable": "Поворотный стол", "block.create.vertical_framed_glass": "UNLOCALIZED: Vertical Framed Glass", "block.create.vertical_framed_glass_pane": "UNLOCALIZED: Vertical Framed Glass Pane", - "block.create.water_wheel": "ВодÑ�ное колеÑ�о", - "block.create.weathered_limestone": "Обветренный извеÑ�тнÑ�к", - "block.create.weathered_limestone_bricks": "Кирпичи из обветренного извеÑ�тнÑ�ка", - "block.create.weathered_limestone_bricks_slab": "Плита из кирпича из обветренного извеÑ�тнÑ�ка", - "block.create.weathered_limestone_bricks_stairs": "Ступеньки из кирпича из обветренного извеÑ�тнÑ�ка", - "block.create.weathered_limestone_bricks_wall": "Ограда из кирпича из обветренного извеÑ�тнÑ�ка", + "block.create.water_wheel": "Водяное колесо", + "block.create.weathered_limestone": "Обветренный известняк", + "block.create.weathered_limestone_bricks": "Кирпичи из обветренного известняка", + "block.create.weathered_limestone_bricks_slab": "Плита из кирпича из обветренного известняка", + "block.create.weathered_limestone_bricks_stairs": "Ступеньки из кирпича из обветренного известняка", + "block.create.weathered_limestone_bricks_wall": "Ограда из кирпича из обветренного известняка", "block.create.weathered_limestone_cobblestone": "UNLOCALIZED: Weathered Limestone Cobblestone", "block.create.weathered_limestone_cobblestone_slab": "UNLOCALIZED: Weathered Limestone Cobblestone Slab", "block.create.weathered_limestone_cobblestone_stairs": "UNLOCALIZED: Weathered Limestone Cobblestone Stairs", "block.create.weathered_limestone_cobblestone_wall": "UNLOCALIZED: Weathered Limestone Cobblestone Wall", - "block.create.weathered_limestone_pillar": "Колонна из обветренного извеÑ�тнÑ�ка", + "block.create.weathered_limestone_pillar": "Колонна из обветренного известняка", "block.create.white_seat": "UNLOCALIZED: White Seat", "block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle", "block.create.yellow_seat": "UNLOCALIZED: Yellow Seat", @@ -414,7 +380,7 @@ "item.create.andesite_alloy": "UNLOCALIZED: Andesite Alloy", "item.create.attribute_filter": "UNLOCALIZED: Attribute Filter", - "item.create.belt_connector": "МеханичеÑ�каÑ� лента", + "item.create.belt_connector": "Механическая лента", "item.create.brass_hand": "UNLOCALIZED: Brass Hand", "item.create.brass_ingot": "UNLOCALIZED: Brass Ingot", "item.create.brass_nugget": "UNLOCALIZED: Brass Nugget", @@ -430,37 +396,37 @@ "item.create.crushed_iron_ore": "UNLOCALIZED: Crushed Iron Ore", "item.create.crushed_zinc_ore": "UNLOCALIZED: Crushed Zinc Ore", "item.create.deforester": "UNLOCALIZED: Deforester", - "item.create.dough": "ТеÑ�то", + "item.create.dough": "Тесто", "item.create.electron_tube": "UNLOCALIZED: Electron Tube", "item.create.empty_blaze_burner": "UNLOCALIZED: Empty Blaze Burner", - "item.create.empty_schematic": "ПуÑ�таÑ� Ñ�хема", + "item.create.empty_schematic": "Пустая схема", "item.create.extendo_grip": "UNLOCALIZED: Extendo Grip", - "item.create.filter": "Фильтр", + "item.create.filter": "Фильтр", "item.create.fuel_pellet": "UNLOCALIZED: Fuel Pellet", "item.create.furnace_minecart_contraption": "UNLOCALIZED: Furnace Minecart Contraption", "item.create.goggles": "UNLOCALIZED: Engineer's Goggles", "item.create.golden_sheet": "UNLOCALIZED: Golden Sheet", - "item.create.handheld_blockzapper": "Портативный размещатель блоков", + "item.create.handheld_blockzapper": "Портативный размещатель блоков", "item.create.handheld_worldshaper": "UNLOCALIZED: Handheld Worldshaper", "item.create.integrated_circuit": "UNLOCALIZED: Integrated Circuit", - "item.create.iron_sheet": "ЖелезнаÑ� плаÑ�тина", + "item.create.iron_sheet": "Железная пластина", "item.create.lapis_sheet": "UNLOCALIZED: Lapis Sheet", "item.create.minecart_contraption": "UNLOCALIZED: Minecart Contraption", "item.create.minecart_coupling": "UNLOCALIZED: Minecart Coupling", "item.create.polished_rose_quartz": "UNLOCALIZED: Polished Rose Quartz", "item.create.powdered_obsidian": "UNLOCALIZED: Powdered Obsidian", - "item.create.propeller": "Пропеллер", + "item.create.propeller": "Пропеллер", "item.create.red_sand_paper": "UNLOCALIZED: Red Sand Paper", "item.create.refined_radiance": "UNLOCALIZED: Refined Radiance", - "item.create.rose_quartz": "Розовый Кварц", + "item.create.rose_quartz": "Розовый Кварц", "item.create.sand_paper": "UNLOCALIZED: Sand Paper", - "item.create.schematic": "Схема", - "item.create.schematic_and_quill": "Схема и перо", + "item.create.schematic": "Схема", + "item.create.schematic_and_quill": "Схема и перо", "item.create.shadow_steel": "UNLOCALIZED: Shadow Steel", "item.create.super_glue": "UNLOCALIZED: Super Glue", - "item.create.tree_fertilizer": "Удобрение длÑ� деревьев", + "item.create.tree_fertilizer": "Удобрение для деревьев", "item.create.vertical_gearbox": "UNLOCALIZED: Vertical Gearbox", - "item.create.wand_of_symmetry": "ПоÑ�ох Ñ�имметрии", + "item.create.wand_of_symmetry": "Посох симметрии", "item.create.wheat_flour": "UNLOCALIZED: Wheat Flour", "item.create.whisk": "UNLOCALIZED: Whisk", "item.create.wrench": "UNLOCALIZED: Wrench", @@ -561,94 +527,94 @@ "itemGroup.create.base": "UNLOCALIZED: Create", "itemGroup.create.palettes": "UNLOCALIZED: Create Palettes", - "death.attack.create.crush": "%1$s был переработан дробильными колёÑ�ами", - "death.attack.create.fan_fire": "%1$s Ñ�горел заживо от горÑ�чего воздуха.", - "death.attack.create.fan_lava": "%1$s Ñ�горел заживо от лавового вентилÑ�тора", - "death.attack.create.mechanical_drill": "%1$s был проколот механичеÑ�ким буром", + "death.attack.create.crush": "%1$s был переработан дробильными колёсами", + "death.attack.create.fan_fire": "%1$s сгорел заживо от горячего воздуха.", + "death.attack.create.fan_lava": "%1$s сгорел заживо от лавового вентилятора", + "death.attack.create.mechanical_drill": "%1$s был проколот механическим буром", "death.attack.create.mechanical_saw": "UNLOCALIZED: %1$s got cut in half by a Mechanical Saw", "death.attack.create.cuckoo_clock_explosion": "UNLOCALIZED: %1$s was blown up by tampered cuckoo clock", "create.block.deployer.damage_source_name": "UNLOCALIZED: a rogue Deployer", "create.block.cart_assembler.invalid": "UNLOCALIZED: Place your Cart Assembler on a rail block", - "create.recipe.crushing": "Дробление", + "create.recipe.crushing": "Дробление", "create.recipe.milling": "UNLOCALIZED: 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.pressing": "МеханичеÑ�кий преÑ�Ñ�", + "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.pressing": "Механический пресс", "create.recipe.mixing": "UNLOCALIZED: Mixing", "create.recipe.packing": "UNLOCALIZED: Compacting", "create.recipe.mechanical_sawing": "UNLOCALIZED: Sawing", "create.recipe.mechanical_crafting": "UNLOCALIZED: Mechanical Crafting", "create.recipe.block_cutting": "UNLOCALIZED: Block Cutting", - "create.recipe.blockzapper_upgrade": "Портативный размещатель блоков", + "create.recipe.blockzapper_upgrade": "Портативный размещатель блоков", "create.recipe.sandpaper_polishing": "UNLOCALIZED: Sandpaper Polishing", "create.recipe.mystery_conversion": "UNLOCALIZED: Chromatic Metamorphosis", "create.recipe.processing.catalyst": "UNLOCALIZED: Catalyst", - "create.recipe.processing.chance": "%1$s%% шанÑ� выпадениÑ�", + "create.recipe.processing.chance": "%1$s%% шанс выпадения", "create.recipe.processing.chanceToReturn": "UNLOCALIZED: %1$s%% Chance to Return", - "create.generic.range": "Зона", - "create.generic.radius": "РадиуÑ�", + "create.generic.range": "Зона", + "create.generic.radius": "Радиус", "create.generic.width": "UNLOCALIZED: Width", "create.generic.height": "UNLOCALIZED: Height", "create.generic.length": "UNLOCALIZED: Length", - "create.generic.speed": "СкороÑ�Ñ‚ÑŒ", - "create.generic.delay": "Задержка", - "create.generic.unit.ticks": "тик", - "create.generic.unit.seconds": "Ñ�ек", - "create.generic.unit.minutes": "мин", + "create.generic.speed": "Скорость", + "create.generic.delay": "Задержка", + "create.generic.unit.ticks": "тик", + "create.generic.unit.seconds": "сек", + "create.generic.unit.minutes": "мин", "create.generic.unit.rpm": "UNLOCALIZED: RPM", "create.generic.unit.stress": "UNLOCALIZED: su", "create.generic.unit.degrees": "UNLOCALIZED: °", - "create.action.scroll": "КолМыши", - "create.action.confirm": "Подтвердить", - "create.action.abort": "Отменить", - "create.action.saveToFile": "Сохранить", - "create.action.discard": "СброÑ�ить", + "create.action.scroll": "КолМыши", + "create.action.confirm": "Подтвердить", + "create.action.abort": "Отменить", + "create.action.saveToFile": "Сохранить", + "create.action.discard": "Сбросить", - "create.keyinfo.toolmenu": "ФокуÑ�ировка меню иÑ�трументов", + "create.keyinfo.toolmenu": "Фокусировка меню иструментов", "create.keyinfo.scrollup": "UNLOCALIZED: Simulate Mousewheel Up (inworld)", "create.keyinfo.scrolldown": "UNLOCALIZED: Simulate Mousewheel Down (inworld)", - "create.gui.scrollInput.defaultTitle": "Выберите:", - "create.gui.scrollInput.scrollToModify": "КолМыши, чтобы изменить", + "create.gui.scrollInput.defaultTitle": "Выберите:", + "create.gui.scrollInput.scrollToModify": "КолМыши, чтобы изменить", "create.gui.scrollInput.scrollToAdjustAmount": "UNLOCALIZED: Scroll to Adjust Amount", - "create.gui.scrollInput.scrollToSelect": "КолМыши, чтобы выделить", - "create.gui.scrollInput.shiftScrollsFaster": "Зажмите Shift, чтобы прокручивать быÑ�трее", - "create.gui.toolmenu.focusKey": "Зажмите [%1$s], чтобы Ñ�фокуÑ�ироватьÑ�Ñ�", - "create.gui.toolmenu.cycle": "[КолМыши] , чтобы выбрать", - "create.gui.symmetryWand.mirrorType": "Зеркало", - "create.gui.symmetryWand.orientation": "ОриентациÑ�", + "create.gui.scrollInput.scrollToSelect": "КолМыши, чтобы выделить", + "create.gui.scrollInput.shiftScrollsFaster": "Зажмите Shift, чтобы прокручивать быстрее", + "create.gui.toolmenu.focusKey": "Зажмите [%1$s], чтобы сфокусироваться", + "create.gui.toolmenu.cycle": "[КолМыши] , чтобы выбрать", + "create.gui.symmetryWand.mirrorType": "Зеркало", + "create.gui.symmetryWand.orientation": "Ориентация", - "create.symmetry.mirror.plane": "Линейно", - "create.symmetry.mirror.doublePlane": "ПрÑ�моугольно", - "create.symmetry.mirror.triplePlane": "ВоÑ�ьмиугольно", + "create.symmetry.mirror.plane": "Линейно", + "create.symmetry.mirror.doublePlane": "Прямоугольно", + "create.symmetry.mirror.triplePlane": "Восьмиугольно", - "create.orientation.orthogonal": "ПерпендикулÑ�рно", - "create.orientation.diagonal": "Диагонально", - "create.orientation.horizontal": "Горизонтально", - "create.orientation.alongZ": "По оÑ�и Z", - "create.orientation.alongX": "По оÑ�и X", + "create.orientation.orthogonal": "Перпендикулярно", + "create.orientation.diagonal": "Диагонально", + "create.orientation.horizontal": "Горизонтально", + "create.orientation.alongZ": "По оси Z", + "create.orientation.alongX": "По оси X", - "create.gui.blockzapper.title": "Порт. размещ. блоков", - "create.gui.blockzapper.replaceMode": "Режим замены", - "create.gui.blockzapper.searchDiagonal": "Следовать диагоналÑ�м", - "create.gui.blockzapper.searchFuzzy": "Игнорировать материальные границы", - "create.gui.blockzapper.range": "РадиуÑ�", + "create.gui.blockzapper.title": "Порт. размещ. блоков", + "create.gui.blockzapper.replaceMode": "Режим замены", + "create.gui.blockzapper.searchDiagonal": "Следовать диагоналям", + "create.gui.blockzapper.searchFuzzy": "Игнорировать материальные границы", + "create.gui.blockzapper.range": "Радиус", "create.gui.blockzapper.needsUpgradedAmplifier": "UNLOCALIZED: Requires Upgraded Amplifier", - "create.gui.blockzapper.patternSection": "Шаблоны", - "create.gui.blockzapper.pattern.solid": "Сплошной", - "create.gui.blockzapper.pattern.checkered": "ШахматнаÑ� доÑ�ка", - "create.gui.blockzapper.pattern.inversecheckered": "ОбратнаÑ� шахматнаÑ� доÑ�ка", - "create.gui.blockzapper.pattern.chance25": "25% покрытиÑ�", - "create.gui.blockzapper.pattern.chance50": "50% покрытиÑ�", - "create.gui.blockzapper.pattern.chance75": "75% покрытиÑ�", + "create.gui.blockzapper.patternSection": "Шаблоны", + "create.gui.blockzapper.pattern.solid": "Сплошной", + "create.gui.blockzapper.pattern.checkered": "Шахматная доска", + "create.gui.blockzapper.pattern.inversecheckered": "Обратная шахматная доска", + "create.gui.blockzapper.pattern.chance25": "25% покрытия", + "create.gui.blockzapper.pattern.chance50": "50% покрытия", + "create.gui.blockzapper.pattern.chance75": "75% покрытия", "create.gui.terrainzapper.title": "UNLOCALIZED: Handheld Worldshaper", "create.gui.terrainzapper.placement": "UNLOCALIZED: Placement", "create.gui.terrainzapper.placement.merged": "UNLOCALIZED: Merged", @@ -668,18 +634,18 @@ "create.terrainzapper.shiftRightClickToSet": "UNLOCALIZED: Shift-Right-Click to Select a Shape", - "create.blockzapper.usingBlock": "Материал: %1$s", - "create.blockzapper.componentUpgrades": "УлучшениÑ� компонентов:", - "create.blockzapper.component.body": "КорпуÑ�", - "create.blockzapper.component.amplifier": "УÑ�илитель", - "create.blockzapper.component.accelerator": "УÑ�коритель", - "create.blockzapper.component.retriever": "Коллектор", - "create.blockzapper.component.scope": "Прицел", - "create.blockzapper.componentTier.none": "Ð�ичего", + "create.blockzapper.usingBlock": "Материал: %1$s", + "create.blockzapper.componentUpgrades": "Улучшения компонентов:", + "create.blockzapper.component.body": "Корпус", + "create.blockzapper.component.amplifier": "Усилитель", + "create.blockzapper.component.accelerator": "Ускоритель", + "create.blockzapper.component.retriever": "Коллектор", + "create.blockzapper.component.scope": "Прицел", + "create.blockzapper.componentTier.none": "Ничего", "create.blockzapper.componentTier.brass": "UNLOCALIZED: Brass", "create.blockzapper.componentTier.chromatic": "UNLOCALIZED: Chromatic", - "create.blockzapper.leftClickToSet": "ЛКМ на блок, чтобы выбрать материал", - "create.blockzapper.empty": "ЗакончилиÑ�ÑŒ блоки!", + "create.blockzapper.leftClickToSet": "ЛКМ на блок, чтобы выбрать материал", + "create.blockzapper.empty": "Закончились блоки!", "create.contraptions.movement_mode": "UNLOCALIZED: Movement Mode", "create.contraptions.movement_mode.move_place": "UNLOCALIZED: Always Place when Stopped", @@ -693,10 +659,10 @@ "create.contraptions.cart_movement_mode.rotate_paused": "UNLOCALIZED: Pause actors while rotating", "create.contraptions.cart_movement_mode.rotation_locked": "UNLOCALIZED: Lock rotation", - "create.logistics.filter": "Фильтр", + "create.logistics.filter": "Фильтр", "create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter", - "create.logistics.firstFrequency": "ЧаÑ�Ñ‚. #1", - "create.logistics.secondFrequency": "ЧаÑ�Ñ‚. #2", + "create.logistics.firstFrequency": "Част. #1", + "create.logistics.secondFrequency": "Част. #2", "create.gui.goggles.generator_stats": "UNLOCALIZED: Generator Stats:", "create.gui.goggles.kinetic_stats": "UNLOCALIZED: Kinetic Stats:", @@ -710,24 +676,12 @@ "create.gui.stressometer.no_rotation": "UNLOCALIZED: No Rotation", "create.gui.contraptions.not_fast_enough": "UNLOCALIZED: It appears that this %1$s is _not_ rotating with _enough_ _speed_.", "create.gui.contraptions.network_overstressed": "UNLOCALIZED: It appears that this contraption is _overstressed_. Add more sources or _slow_ _down_ the components with a high _stress_ _impact_.", -<<<<<<< HEAD - "create.gui.adjustable_crate.title": "Гибкий Ñ�щик", - "create.gui.adjustable_crate.storageSpace": "Обьём хранилища", - "create.gui.stockpile_switch.title": "СенÑ�ор хранилища", - "create.gui.stockpile_switch.lowerLimit": "Ð�ижний порог", - "create.gui.stockpile_switch.upperLimit": "Верхний порог", - "create.gui.stockpile_switch.startAt": "Включить на", - "create.gui.stockpile_switch.startAbove": "Включить выше", - "create.gui.stockpile_switch.stopAt": "Отключить на", - "create.gui.stockpile_switch.stopBelow": "Отключить ниже", -======= "create.gui.adjustable_crate.title": "Гибкий ящик", "create.gui.adjustable_crate.storageSpace": "Обьём хранилища", "create.gui.stockpile_switch.title": "Сенсор хранилища", "create.gui.stockpile_switch.invert_signal": "UNLOCALIZED: Invert Signal", "create.gui.stockpile_switch.move_to_lower_at": "UNLOCALIZED: Move to lower lane at %1$s%%", "create.gui.stockpile_switch.move_to_upper_at": "UNLOCALIZED: Move to upper lane at %1$s%%", ->>>>>>> mc1.15/dev "create.gui.sequenced_gearshift.title": "UNLOCALIZED: Sequenced Gearshift", "create.gui.sequenced_gearshift.instruction": "UNLOCALIZED: Instruction", "create.gui.sequenced_gearshift.instruction.turn_angle": "UNLOCALIZED: Turn", @@ -743,40 +697,6 @@ "create.gui.sequenced_gearshift.speed.back": "UNLOCALIZED: Input speed, Reversed", "create.gui.sequenced_gearshift.speed.back_fast": "UNLOCALIZED: Double speed, Reversed", -<<<<<<< HEAD - "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.saved": "Сохранено как %1$s", - - "create.schematic.invalid": "[!] Ð�едейÑ�твительный предмет - иÑ�пользуйте Ñ�тол длÑ� Ñ�хем", - "create.schematic.position": "ПозициÑ�", - "create.schematic.rotation": "Вращение", - "create.schematic.rotation.none": "Ð�ичего", - "create.schematic.rotation.cw90": "90° по чаÑ�овой", - "create.schematic.rotation.cw180": "180° по чаÑ�овой", - "create.schematic.rotation.cw270": "270° по чаÑ�овой", - "create.schematic.mirror": "Отразить", - "create.schematic.mirror.none": "Ð�ичего", - "create.schematic.mirror.frontBack": "Перед-зад", - "create.schematic.mirror.leftRight": "Лево-право", - "create.schematic.tool.deploy": "РазмеÑ�тить", - "create.schematic.tool.move": "Сдвиг по XZ", - "create.schematic.tool.movey": "Сдвиг по Y", - "create.schematic.tool.rotate": "Повернуть", - "create.schematic.tool.print": "Ð�апечатать", - "create.schematic.tool.flip": "Отразить", - "create.schematic.tool.deploy.description.0": "Размещает конÑ�трукцию.", - "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.schematicAndQuill.dimensions": "Размер схемы: %1$sx%2$sx%3$s", "create.schematicAndQuill.firstPos": "Первая позиция установлена.", "create.schematicAndQuill.secondPos": "Вторая позиция установлена.", @@ -810,75 +730,25 @@ "create.schematic.tool.deploy.description.3": "[Ctrl]-КолМыши для изменения дистанции.", "create.schematic.tool.move.description.0": "Сдвигает схему по горизонтали", "create.schematic.tool.move.description.1": "Смотрите на схему и [CTRL]-КолМыши для сдвига.", ->>>>>>> mc1.15/dev "create.schematic.tool.move.description.2": "", "create.schematic.tool.move.description.3": "", - "create.schematic.tool.movey.description.0": "Сдвигает Ñ�хему по вертикали", - "create.schematic.tool.movey.description.1": "[CTRL]-КолМыши длÑ� Ñ�двига вверх/вниз", + "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.1": "[CTRL]-КолМыши длÑ� поворота на 90°", + "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": "", - "create.schematic.tool.print.description.0": "Моментально размещает Ñ�труктуру в мире", - "create.schematic.tool.print.description.1": "[ПКМ] длÑ� размещениÑ� в текущем меÑ�те.", - "create.schematic.tool.print.description.2": "Только длÑ� креативного режима.", + "create.schematic.tool.print.description.0": "Моментально размещает структуру в мире", + "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": "", -<<<<<<< HEAD - "create.schematics.synchronizing": "СинхронизациÑ�...", - "create.schematics.uploadTooLarge": "Схема Ñ�лишком большаÑ�", - "create.schematics.maxAllowedSize": "МакÑ�имальный размер файла Ñ�хемы:", - - "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.settingsTitle": "Параметры размещениÑ�", - "create.gui.schematicannon.listPrinter": "РаÑ�печатать Ñ�пиÑ�ок материалов", - "create.gui.schematicannon.gunpowderLevel": "Порох: %1$s%%", - "create.gui.schematicannon.shotsRemaining": "Ð’Ñ‹Ñ�трелов оÑ�талоÑ�ÑŒ: %1$s", - "create.gui.schematicannon.shotsRemainingWithBackup": "C запаÑ�ом: %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.skipMissing": "ПропуÑ�кать отÑ�утÑ�твующие блоки", - "create.gui.schematicannon.option.skipTileEntities": "Защита от Ñ�ущноÑ�тей", - "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.replaceWithEmpty.description": "Схемопушка отчиÑ�тит вÑ�е блоки, включаÑ� замену на воздух.", - - "create.schematicannon.status.idle": "БездейÑ�твует", - "create.schematicannon.status.ready": "Готова", - "create.schematicannon.status.running": "Работает", - "create.schematicannon.status.finished": "Закончила", - "create.schematicannon.status.paused": "ПриоÑ�тановлена", - "create.schematicannon.status.stopped": "ОÑ�тановлена", - "create.schematicannon.status.noGunpowder": "КончилÑ�Ñ� порох", - "create.schematicannon.status.targetNotLoaded": "Блок не загружен", - "create.schematicannon.status.targetOutsideRange": "Цель Ñ�лишком далеко", - "create.schematicannon.status.searching": "ПоиÑ�к", - "create.schematicannon.status.skipping": "ПропуÑ�к", - "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.schematics.synchronizing": "Синхронизация...", "create.schematics.uploadTooLarge": "Схема слишком большая", "create.schematics.maxAllowedSize": "Максимальный размер файла схемы:", @@ -931,7 +801,6 @@ "create.schematicannon.status.schematicInvalid": "Схема недействительна", "create.schematicannon.status.schematicNotPlaced": "Схема не размещена", "create.schematicannon.status.schematicExpired": "Срок действия файла схемы истек", ->>>>>>> mc1.15/dev "create.gui.filter.blacklist": "UNLOCALIZED: Blacklist", "create.gui.filter.blacklist.description": "UNLOCALIZED: Items pass if they do NOT match any of the above. An empty Blacklist accepts everything.", @@ -987,8 +856,8 @@ "create.gui.attribute_filter.blacklist.description": "UNLOCALIZED: Items pass if they do NOT have any of the selected attributes.", "create.gui.attribute_filter.add_reference_item": "UNLOCALIZED: Add Reference Item", - "create.tooltip.holdKey": "Зажмите [%1$s]", - "create.tooltip.holdKeyOrKey": "Зажмите [%1$s] или [%2$s]", + "create.tooltip.holdKey": "Зажмите [%1$s]", + "create.tooltip.holdKeyOrKey": "Зажмите [%1$s] или [%2$s]", "create.tooltip.keyShift": "Shift", "create.tooltip.keyCtrl": "Ctrl", "create.tooltip.speedRequirement": "UNLOCALIZED: Speed Requirement: %1$s", @@ -1067,24 +936,24 @@ "item.create.example_item.tooltip.action1": "These controls are displayed.", "item.create.wand_of_symmetry.tooltip": "SYMMETRY WAND", - "item.create.wand_of_symmetry.tooltip.summary": "Идеально отражает размещаемые блоки по наÑ�троенным плоÑ�коÑ�Ñ‚Ñ�м.", - "item.create.wand_of_symmetry.tooltip.condition1": "Ð�а панели быÑ�трого доÑ�тупа", - "item.create.wand_of_symmetry.tooltip.behaviour1": "ОÑ�таётÑ�Ñ� активным", - "item.create.wand_of_symmetry.tooltip.control1": "ПКМ на землю", - "item.create.wand_of_symmetry.tooltip.action1": "_Создаёт_ или _Перемещает_ зеркало", - "item.create.wand_of_symmetry.tooltip.control2": "ПКМ в воздух", - "item.create.wand_of_symmetry.tooltip.action2": "_Убирает_ зеркало", - "item.create.wand_of_symmetry.tooltip.control3": "ПКМ крадÑ�Ñ�ÑŒ", - "item.create.wand_of_symmetry.tooltip.action3": "Открывает _Меню_ _наÑ�тройки_", + "item.create.wand_of_symmetry.tooltip.summary": "Идеально отражает размещаемые блоки по настроенным плоскостям.", + "item.create.wand_of_symmetry.tooltip.condition1": "На панели быстрого доступа", + "item.create.wand_of_symmetry.tooltip.behaviour1": "Остаётся активным", + "item.create.wand_of_symmetry.tooltip.control1": "ПКМ на землю", + "item.create.wand_of_symmetry.tooltip.action1": "_Создаёт_ или _Перемещает_ зеркало", + "item.create.wand_of_symmetry.tooltip.control2": "ПКМ в воздух", + "item.create.wand_of_symmetry.tooltip.action2": "_Убирает_ зеркало", + "item.create.wand_of_symmetry.tooltip.control3": "ПКМ крадясь", + "item.create.wand_of_symmetry.tooltip.action3": "Открывает _Меню_ _настройки_", "item.create.handheld_blockzapper.tooltip": "BLOCKZAPPER", - "item.create.handheld_blockzapper.tooltip.summary": "Ð�овейшее уÑ�тройÑ�тво длÑ� размещениÑ� или замены блоков на раÑ�Ñ�тоÑ�нии.", - "item.create.handheld_blockzapper.tooltip.control1": "ЛКМ на блок", - "item.create.handheld_blockzapper.tooltip.action1": "УÑ�танавливает выбранный блок как материал.", - "item.create.handheld_blockzapper.tooltip.control2": "ПКМ на блок", - "item.create.handheld_blockzapper.tooltip.action2": "_Размещает_ или _Замещает_ блок.", - "item.create.handheld_blockzapper.tooltip.control3": "ПКМ крадÑ�Ñ�ÑŒ", - "item.create.handheld_blockzapper.tooltip.action3": "Открывает _Меню_ _наÑ�тройки_", + "item.create.handheld_blockzapper.tooltip.summary": "Новейшее устройство для размещения или замены блоков на расстоянии.", + "item.create.handheld_blockzapper.tooltip.control1": "ЛКМ на блок", + "item.create.handheld_blockzapper.tooltip.action1": "Устанавливает выбранный блок как материал.", + "item.create.handheld_blockzapper.tooltip.control2": "ПКМ на блок", + "item.create.handheld_blockzapper.tooltip.action2": "_Размещает_ или _Замещает_ блок.", + "item.create.handheld_blockzapper.tooltip.control3": "ПКМ крадясь", + "item.create.handheld_blockzapper.tooltip.action3": "Открывает _Меню_ _настройки_", "item.create.handheld_worldshaper.tooltip": "UNLOCALIZED: HANDHELD WORLDSHAPER", "item.create.handheld_worldshaper.tooltip.summary": "UNLOCALIZED: Handy tool for creating _landscapes_ and _terrain_ _features_.", @@ -1096,9 +965,9 @@ "item.create.handheld_worldshaper.tooltip.action3": "UNLOCALIZED: Opens the _Configuration_ _Interface_", "item.create.tree_fertilizer.tooltip": "TREE FERTILIZER", - "item.create.tree_fertilizer.tooltip.summary": "СильнаÑ� Ñ�меÑ�ÑŒ минералов, подходÑ�щаÑ� обычным видам деревьев.", - "item.create.tree_fertilizer.tooltip.condition1": "При иÑ�пользовании на Ñ�аженце", - "item.create.tree_fertilizer.tooltip.behaviour1": "Выращивает деревьÑ� незавиÑ�имо от Ñ�вободного проÑ�транÑ�тва", + "item.create.tree_fertilizer.tooltip.summary": "Сильная смесь минералов, подходящая обычным видам деревьев.", + "item.create.tree_fertilizer.tooltip.condition1": "При использовании на саженце", + "item.create.tree_fertilizer.tooltip.behaviour1": "Выращивает деревья независимо от свободного пространства", "item.create.deforester.tooltip": "UNLOCALIZED: DEFORESTER", "item.create.deforester.tooltip.summary": "UNLOCALIZED: A _radiant_ _axe_ able to chop down trees in a split second.", @@ -1123,70 +992,70 @@ "item.create.attribute_filter.tooltip.behaviour2": "UNLOCALIZED: Opens the _configuration_ _interface_.", "item.create.empty_schematic.tooltip": "EMPTY SCHEMATIC", - "item.create.empty_schematic.tooltip.summary": "ИÑ�пользуетÑ�Ñ� длÑ� крафта и запиÑ�и в _Столе_ _длÑ�_ _Ñ�хем._", + "item.create.empty_schematic.tooltip.summary": "Используется для крафта и записи в _Столе_ _для_ _схем._", "item.create.schematic.tooltip": "SCHEMATIC", - "item.create.schematic.tooltip.summary": "Хранит Ñ�труктуру длÑ� размещениÑ�. РаÑ�положите голограмму и иÑ�пользуйте _Схемопушку_ длÑ� поÑ�троениÑ� голограммы.", - "item.create.schematic.tooltip.condition1": "Когда в руке", - "item.create.schematic.tooltip.behaviour1": "Может быть размещена Ñ� помошью инÑ�трументов на Ñ�кране", - "item.create.schematic.tooltip.control1": "ПКМ крадÑ�Ñ�ÑŒ", - "item.create.schematic.tooltip.action1": "Открывает _Меню_ длÑ� ввода точных _Координат._", + "item.create.schematic.tooltip.summary": "Хранит структуру для размещения. Расположите голограмму и используйте _Схемопушку_ для построения голограммы.", + "item.create.schematic.tooltip.condition1": "Когда в руке", + "item.create.schematic.tooltip.behaviour1": "Может быть размещена с помошью инструментов на экране", + "item.create.schematic.tooltip.control1": "ПКМ крадясь", + "item.create.schematic.tooltip.action1": "Открывает _Меню_ для ввода точных _Координат._", "item.create.schematic_and_quill.tooltip": "SCHEMATIC AND QUILL", - "item.create.schematic_and_quill.tooltip.summary": "ИÑ�пользуетÑ�Ñ� длÑ� Ñ�охранениÑ� Ñ�труктуры в .nbt файл.", - "item.create.schematic_and_quill.tooltip.condition1": "Шаг 1", - "item.create.schematic_and_quill.tooltip.behaviour1": "Выберите две точки Ñ� помощью ПКМ", - "item.create.schematic_and_quill.tooltip.condition2": "Шаг 2", - "item.create.schematic_and_quill.tooltip.behaviour2": "_Ctrl-КолМыши_ на Ñ�торону длÑ� изменениÑ� размера. ПКМ еще раз длÑ� Ñ�охранениÑ�.", - "item.create.schematic_and_quill.tooltip.control1": "ПКМ", - "item.create.schematic_and_quill.tooltip.action1": "Выбрать точку / Сохранить", - "item.create.schematic_and_quill.tooltip.control2": "С зажатым Ctrl", - "item.create.schematic_and_quill.tooltip.action2": "Выбрать точки в _воздухе._ _КолМыши_ длÑ� изменениÑ� раÑ�Ñ�тоÑ�ниÑ�.", - "item.create.schematic_and_quill.tooltip.control3": "ПКМ крадÑ�Ñ�ÑŒ", - "item.create.schematic_and_quill.tooltip.action3": "_СбраÑ�ывает_ и _УдалÑ�ет_ выделение.", + "item.create.schematic_and_quill.tooltip.summary": "Используется для сохранения структуры в .nbt файл.", + "item.create.schematic_and_quill.tooltip.condition1": "Шаг 1", + "item.create.schematic_and_quill.tooltip.behaviour1": "Выберите две точки с помощью ПКМ", + "item.create.schematic_and_quill.tooltip.condition2": "Шаг 2", + "item.create.schematic_and_quill.tooltip.behaviour2": "_Ctrl-КолМыши_ на сторону для изменения размера. ПКМ еще раз для сохранения.", + "item.create.schematic_and_quill.tooltip.control1": "ПКМ", + "item.create.schematic_and_quill.tooltip.action1": "Выбрать точку / Сохранить", + "item.create.schematic_and_quill.tooltip.control2": "С зажатым Ctrl", + "item.create.schematic_and_quill.tooltip.action2": "Выбрать точки в _воздухе._ _КолМыши_ для изменения расстояния.", + "item.create.schematic_and_quill.tooltip.control3": "ПКМ крадясь", + "item.create.schematic_and_quill.tooltip.action3": "_Сбрасывает_ и _Удаляет_ выделение.", "block.create.schematicannon.tooltip": "SCHEMATICANNON", - "block.create.schematicannon.tooltip.summary": "СтрелÑ�ет блоками длÑ� воÑ�Ñ�озданиÑ� размещенной _Схемы._ ИÑ�пользует блоки из Ñ�оÑ�едних инвентарей и _Порох_ в качеÑ�тве топлива.", - "block.create.schematicannon.tooltip.control1": "ПКМ по пушке", - "block.create.schematicannon.tooltip.action1": "Открывает _Меню_", + "block.create.schematicannon.tooltip.summary": "Стреляет блоками для воссоздания размещенной _Схемы._ Использует блоки из соседних инвентарей и _Порох_ в качестве топлива.", + "block.create.schematicannon.tooltip.control1": "ПКМ по пушке", + "block.create.schematicannon.tooltip.action1": "Открывает _Меню_", "block.create.schematic_table.tooltip": "SCHEMATIC TABLE", - "block.create.schematic_table.tooltip.summary": "ЗапиÑ�ывает Ñ�охраненные Ñ�хемы на _ПуÑ�тые_ _Ñ�хемы._", - "block.create.schematic_table.tooltip.condition1": "ЕÑ�ли положить пуÑ�тую Ñ�хему.", - "block.create.schematic_table.tooltip.behaviour1": "ЗапиÑ�ывает выбранный файл из папки Ñ�о Ñ�хемами", + "block.create.schematic_table.tooltip.summary": "Записывает сохраненные схемы на _Пустые_ _схемы._", + "block.create.schematic_table.tooltip.condition1": "Если положить пустую схему.", + "block.create.schematic_table.tooltip.behaviour1": "Записывает выбранный файл из папки со схемами", "block.create.shaft.tooltip": "SHAFT", - "block.create.shaft.tooltip.summary": "_Передаёт_ _вращение_ по прÑ�мой.", + "block.create.shaft.tooltip.summary": "_Передаёт_ _вращение_ по прямой.", "block.create.cogwheel.tooltip": "COGWHEEL", - "block.create.cogwheel.tooltip.summary": "_Передаёт_ _вращение_ по прÑ�мой и к приÑ�оеденённым _ШеÑ�тернÑ�м._", + "block.create.cogwheel.tooltip.summary": "_Передаёт_ _вращение_ по прямой и к присоеденённым _Шестерням._", "block.create.large_cogwheel.tooltip": "LARGE COGWHEEL", - "block.create.large_cogwheel.tooltip.summary": "УвеличеннаÑ� верÑ�иÑ� _ШеÑ�терни,_ позволÑ�ющаÑ� _изменÑ�Ñ‚ÑŒ_ _Ñ�короÑ�Ñ‚ÑŒ_ _вращениÑ�_ при Ñ�оединении Ñ� меньшим аналогом.", + "block.create.large_cogwheel.tooltip.summary": "Увеличенная версия _Шестерни,_ позволяющая _изменять_ _скорость_ _вращения_ при соединении с меньшим аналогом.", "block.create.encased_shaft.tooltip": "ENCASED SHAFT", - "block.create.encased_shaft.tooltip.summary": "_Передаёт_ _вращение_ по прÑ�мой. Подходит длÑ� передачи вращениÑ� через Ñ�тены.", + "block.create.encased_shaft.tooltip.summary": "_Передаёт_ _вращение_ по прямой. Подходит для передачи вращения через стены.", "block.create.gearbox.tooltip": "GEARBOX", - "block.create.gearbox.tooltip.summary": "_Передаёт_ _вращение_ в _4_ _направлениÑ�Ñ…._ РеверÑ�ирует прÑ�мые Ñ�оединениÑ�.", + "block.create.gearbox.tooltip.summary": "_Передаёт_ _вращение_ в _4_ _направлениях._ Реверсирует прямые соединения.", "item.create.vertical_gearbox.tooltip": "UNLOCALIZED: VERTICAL GEARBOX", "item.create.vertical_gearbox.tooltip.summary": "UNLOCALIZED: _Relays_ _Rotation_ in _four_ _directions_ Reverses straight connections.", "block.create.gearshift.tooltip": "GEARSHIFT", - "block.create.gearshift.tooltip.summary": "_Переключатель_ _вращениÑ�_ длÑ� подÑ�оединенных валов.", - "block.create.gearshift.tooltip.condition1": "Когда запитан", - "block.create.gearshift.tooltip.behaviour1": "_РеверÑ�ирует_ выходÑ�щее _вращение._", + "block.create.gearshift.tooltip.summary": "_Переключатель_ _вращения_ для подсоединенных валов.", + "block.create.gearshift.tooltip.condition1": "Когда запитан", + "block.create.gearshift.tooltip.behaviour1": "_Реверсирует_ выходящее _вращение._", "block.create.clutch.tooltip": "CLUTCH", - "block.create.clutch.tooltip.summary": "_Переключатель_ _вращениÑ�_ длÑ� подÑ�оединенных валов.", - "block.create.clutch.tooltip.condition1": "Когда запитан", - "block.create.clutch.tooltip.behaviour1": "_ОÑ�танавливает_ подачу вращениÑ� на другую Ñ�торону.", + "block.create.clutch.tooltip.summary": "_Переключатель_ _вращения_ для подсоединенных валов.", + "block.create.clutch.tooltip.condition1": "Когда запитан", + "block.create.clutch.tooltip.behaviour1": "_Останавливает_ подачу вращения на другую сторону.", "block.create.encased_belt.tooltip": "ENCASED_BELT", - "block.create.encased_belt.tooltip.summary": "_Передаёт_ _вращение_ через Ñ�ебÑ� и к приÑ�оеденённому _Ленточному_ _приводу._", - "block.create.encased_belt.tooltip.condition1": "При приÑ�оеденёнии к другому Ленточному приводу", - "block.create.encased_belt.tooltip.behaviour1": "ПриÑ�оеденённый блок будет иметь те же _Ñ�короÑ�Ñ‚ÑŒ_ и _направление_ _вращениÑ�._ ПриÑ�оеденённые ленты не обÑ�заны Ñ�мотреть в ту же Ñ�торону.", + "block.create.encased_belt.tooltip.summary": "_Передаёт_ _вращение_ через себя и к присоеденённому _Ленточному_ _приводу._", + "block.create.encased_belt.tooltip.condition1": "При присоеденёнии к другому Ленточному приводу", + "block.create.encased_belt.tooltip.behaviour1": "Присоеденённый блок будет иметь те же _скорость_ и _направление_ _вращения._ Присоеденённые ленты не обязаны смотреть в ту же сторону.", "block.create.adjustable_pulley.tooltip": "UNLOCALIZED: ANALOG BELT PULLEY", "block.create.adjustable_pulley.tooltip.summary": "UNLOCALIZED: _Relays_ _Rotation_ through its block and to attached _Encased_ _Belts_. Attached encased belts will _rotate_ _faster_ based on the _analog_ _redstone_ _signal_ this block receives.", @@ -1194,11 +1063,11 @@ "block.create.adjustable_pulley.tooltip.behaviour1": "UNLOCALIZED: Without a signal, it will _not_ _speed_ _up_ connected belts. With a full strength signal connected belt, speed _doubles_.", "item.create.belt_connector.tooltip": "BELT CONNECTOR", - "item.create.belt_connector.tooltip.summary": "СоединÑ�ет _2_ _Вала_ Ñ� помощью _МеханичеÑ�кой_ _ленты._ Соединённые валы будут иметь одинаковые _Ñ�короÑ�Ñ‚ÑŒ_ и _направление_ _вращениÑ�._ Лента может Ñ�лужить как _Конвейер_ длÑ� _СущеÑ�тв._", - "item.create.belt_connector.tooltip.control1": "ПКМ по валу", - "item.create.belt_connector.tooltip.action1": "Выбирает вал в качеÑ�тве одного шкива ленты. Оба выбранных вала должны быть _на_ _одной_ _линии_ _вертикально,_ _горизонтально_ либо _диагонально_ по направлению ленты.", - "item.create.belt_connector.tooltip.control2": "ПКМ крадÑ�Ñ�ÑŒ", - "item.create.belt_connector.tooltip.action2": "_СбраÑ�ывает_ первый выбранный шкив длÑ� ленты.", + "item.create.belt_connector.tooltip.summary": "Соединяет _2_ _Вала_ с помощью _Механической_ _ленты._ Соединённые валы будут иметь одинаковые _скорость_ и _направление_ _вращения._ Лента может служить как _Конвейер_ для _Существ._", + "item.create.belt_connector.tooltip.control1": "ПКМ по валу", + "item.create.belt_connector.tooltip.action1": "Выбирает вал в качестве одного шкива ленты. Оба выбранных вала должны быть _на_ _одной_ _линии_ _вертикально,_ _горизонтально_ либо _диагонально_ по направлению ленты.", + "item.create.belt_connector.tooltip.control2": "ПКМ крадясь", + "item.create.belt_connector.tooltip.action2": "_Сбрасывает_ первый выбранный шкив для ленты.", "item.create.goggles.tooltip": "UNLOCALIZED: GOGGLES", "item.create.goggles.tooltip.summary": "UNLOCALIZED: A pair of glasses to augment your vision with useful _kinetic_ _information_.", @@ -1218,16 +1087,16 @@ "block.create.creative_motor.tooltip.summary": "UNLOCALIZED: A configurable source of _Rotational_ _Force_.", "block.create.water_wheel.tooltip": "WATER WHEEL", - "block.create.water_wheel.tooltip.summary": "ПредоÑ�тавлÑ�ет _Ñ�илу_ _вращениÑ�_ из Ñ�межных _иÑ�точников_ _воды._", + "block.create.water_wheel.tooltip.summary": "Предоставляет _силу_ _вращения_ из смежных _источников_ _воды._", "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.condition2": "При вращении", - "block.create.encased_fan.tooltip.behaviour2": "_Толкает_ Ñ�ущеÑ�тв Ñ� одной Ñ�тороны, _притÑ�гивает_ Ñ� другой. Сила и Ñ�короÑ�Ñ‚ÑŒ завиÑ�Ñ�Ñ‚ от входÑ�щего вращениÑ�.", - "block.create.encased_fan.tooltip.condition3": "Когда воздух проходит через Ñ�пециальные блоки", - "block.create.encased_fan.tooltip.behaviour3": "Обрабатывает предметы перед блоком: _вода_ моет, _огонь_ коптит, _лава_ плавит.", + "block.create.encased_fan.tooltip.summary": "Преобразовывает _силу_ _вращения_ в _воздушный_ _поток_ и обратно. Имеет множество применений.", + "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": "Когда воздух проходит через специальные блоки", + "block.create.encased_fan.tooltip.behaviour3": "Обрабатывает предметы перед блоком: _вода_ моет, _огонь_ коптит, _лава_ плавит.", "block.create.nozzle.tooltip": "UNLOCALIZED: NOZZLE", "block.create.nozzle.tooltip.summary": "UNLOCALIZED: Attach to the front of an _Encased_ _Fan_ to distribute its effect on Entities in _all_ _directions_.", @@ -1243,7 +1112,7 @@ "block.create.cuckoo_clock.tooltip.behaviour1": "UNLOCALIZED: Shows the _current_ _time_ and plays a tune twice a day. _Activates_ once at _noon_ and at dusk, as soon as _players_ _can_ _sleep_.", "block.create.turntable.tooltip": "TURNTABLE", - "block.create.turntable.tooltip.summary": "Преобразует _Ñ�илу_ _вращениÑ�_ прÑ�миком в морÑ�кую болезнь.", + "block.create.turntable.tooltip.summary": "Преобразует _силу_ _вращения_ прямиком в морскую болезнь.", "block.create.millstone.tooltip": "UNLOCALIZED: MILLSTONE", "block.create.millstone.tooltip.summary": "UNLOCALIZED: A kinetic component suitable for _grinding_ inserted _materials_. Can be powered by an adjacent cogwheel or by connecting to the shaft at the bottom. Results have to be extracted from the component.", @@ -1253,16 +1122,16 @@ "block.create.millstone.tooltip.behaviour2": "UNLOCALIZED: Collects the outputs manually.", "block.create.crushing_wheel.tooltip": "CRUSHING WHEEL", - "block.create.crushing_wheel.tooltip.summary": "Большие вращающиеÑ�Ñ� колеÑ�а, которые _дробÑ�Ñ‚_ вÑ�Ñ‘, что мешает их движению.", - "block.create.crushing_wheel.tooltip.condition1": "При приÑ�оеденении к другому дробильному колеÑ�у", - "block.create.crushing_wheel.tooltip.behaviour1": "Формирует дробильную уÑ�тановку длÑ� обработки различных вещей. Зубцы колёÑ� должны Ñ�оединÑ�Ñ‚ÑŒÑ�Ñ� и двигатьÑ�Ñ� Ñ� _одинаковой_ _Ñ�короÑ�тью_ в _противоположных_ _направлениÑ�Ñ…._", + "block.create.crushing_wheel.tooltip.summary": "Большие вращающиеся колеса, которые _дробят_ всё, что мешает их движению.", + "block.create.crushing_wheel.tooltip.condition1": "При присоеденении к другому дробильному колесу", + "block.create.crushing_wheel.tooltip.behaviour1": "Формирует дробильную установку для обработки различных вещей. Зубцы колёс должны соединяться и двигаться с _одинаковой_ _скоростью_ в _противоположных_ _направлениях._", "block.create.mechanical_press.tooltip": "MECHANICAL PRESS", - "block.create.mechanical_press.tooltip.summary": "Мощный поршень длÑ� Ñ�преÑ�Ñ�овываниÑ� предметов под ним. ТребуетÑ�Ñ� поÑ�тоÑ�ннаÑ� _Ñ�ила_ _вращениÑ�._", - "block.create.mechanical_press.tooltip.condition1": "Когда запитан", - "block.create.mechanical_press.tooltip.behaviour1": "_Ð�ачинает_ Ñ�преÑ�Ñ�овывать предметы под ним.", - "block.create.mechanical_press.tooltip.condition2": "При нахождении над механичеÑ�кой лентой", - "block.create.mechanical_press.tooltip.behaviour2": "_Ð�втоматичеÑ�ки_ Ñ�преÑ�Ñ�овывает проходÑ�щие по ленте предметы.", + "block.create.mechanical_press.tooltip.summary": "Мощный поршень для спрессовывания предметов под ним. Требуется постоянная _сила_ _вращения._", + "block.create.mechanical_press.tooltip.condition1": "Когда запитан", + "block.create.mechanical_press.tooltip.behaviour1": "_Начинает_ спрессовывать предметы под ним.", + "block.create.mechanical_press.tooltip.condition2": "При нахождении над механической лентой", + "block.create.mechanical_press.tooltip.behaviour2": "_Автоматически_ спрессовывает проходящие по ленте предметы.", "block.create.mechanical_press.tooltip.condition3": "UNLOCALIZED: When above Basin", "block.create.mechanical_press.tooltip.behaviour3": "UNLOCALIZED: Starts to _compact_ _items_ in the basin whenever all necessary ingredients are present.", @@ -1320,26 +1189,26 @@ "block.create.rotation_speed_controller.tooltip.behaviour1": "UNLOCALIZED: Relays incoming rotational force to the wheel, trying to _match_ the _speed_ it is configured to target. The _cogwheel_ has to be _attached_ _on_ _top_ of the controller.", "block.create.mechanical_piston.tooltip": "MECHANICAL PISTON", - "block.create.mechanical_piston.tooltip.summary": "Более продвинутаÑ� верÑ�иÑ� _ПоршнÑ�,_ иÑ�пользующаÑ� _Ñ�илу_ _вращениÑ�_ длÑ� более точного перемещениÑ� приÑ�оединенных конÑ�трукций. _Удлинители_ _поршнÑ�_ Ñ�зади определÑ�ÑŽÑ‚ _длину_ уÑ�тройÑ�тва. Без удлинителей поршень не будет двигатьÑ�Ñ�. ИÑ�пользуйте _ПоÑ�тупательную_ _раму_ длÑ� перемещениÑ� более чем одной линии блоков.", - "block.create.mechanical_piston.tooltip.condition1": "При вращении", - "block.create.mechanical_piston.tooltip.behaviour1": "Ð�ачинает перемещать прикрепленную конÑ�трукцию. СкороÑ�Ñ‚ÑŒ и направление завиÑ�Ñ�Ñ‚ от входÑ�щего вращениÑ�.", + "block.create.mechanical_piston.tooltip.summary": "Более продвинутая версия _Поршня,_ использующая _силу_ _вращения_ для более точного перемещения присоединенных конструкций. _Удлинители_ _поршня_ сзади определяют _длину_ устройства. Без удлинителей поршень не будет двигаться. Используйте _Поступательную_ _раму_ для перемещения более чем одной линии блоков.", + "block.create.mechanical_piston.tooltip.condition1": "При вращении", + "block.create.mechanical_piston.tooltip.behaviour1": "Начинает перемещать прикрепленную конструкцию. Скорость и направление зависят от входящего вращения.", "block.create.sticky_mechanical_piston.tooltip": "STICKY MECHANICAL PISTON", - "block.create.sticky_mechanical_piston.tooltip.summary": "Более продвинутаÑ� верÑ�иÑ� _Липкого_ _поршнÑ�,_ иÑ�пользующаÑ� _Ñ�илу_ _вращениÑ�_ длÑ� более точного перемещениÑ� приÑ�оединенных конÑ�трукций. _Удлинители_ _поршнÑ�_ Ñ�зади определÑ�ÑŽÑ‚ _длину_ уÑ�тройÑ�тва. Без удлинителей поршень не будет двигатьÑ�Ñ�. ИÑ�пользуйте _ПоÑ�тупательную_ _раму_ длÑ� перемещениÑ� более чем одной линии блоков.", - "block.create.sticky_mechanical_piston.tooltip.condition1": "При вращении", - "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Ð�ачинает перемещать прикрепленную конÑ�трукцию. СкороÑ�Ñ‚ÑŒ и направление завиÑ�Ñ�Ñ‚ от входÑ�щего вращениÑ�.", + "block.create.sticky_mechanical_piston.tooltip.summary": "Более продвинутая версия _Липкого_ _поршня,_ использующая _силу_ _вращения_ для более точного перемещения присоединенных конструкций. _Удлинители_ _поршня_ сзади определяют _длину_ устройства. Без удлинителей поршень не будет двигаться. Используйте _Поступательную_ _раму_ для перемещения более чем одной линии блоков.", + "block.create.sticky_mechanical_piston.tooltip.condition1": "При вращении", + "block.create.sticky_mechanical_piston.tooltip.behaviour1": "Начинает перемещать прикрепленную конструкцию. Скорость и направление зависят от входящего вращения.", "block.create.piston_extension_pole.tooltip": "PISTON POLE", - "block.create.piston_extension_pole.tooltip.summary": "ИÑ�пользуетÑ�Ñ� длÑ� увеличениÑ� длины _МеханичеÑ�кого_ _поршнÑ�._", - "block.create.piston_extension_pole.tooltip.condition1": "При приÑ�оеденении к механичеÑ�кому поршню", - "block.create.piston_extension_pole.tooltip.behaviour1": "Увеличивает длину поршнÑ� на 1 блок", + "block.create.piston_extension_pole.tooltip.summary": "Используется для увеличения длины _Механического_ _поршня._", + "block.create.piston_extension_pole.tooltip.condition1": "При присоеденении к механическому поршню", + "block.create.piston_extension_pole.tooltip.behaviour1": "Увеличивает длину поршня на 1 блок", "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.condition2": "Когда запитан", - "block.create.mechanical_bearing.tooltip.behaviour2": "Ð�ачинает предоÑ�тавлÑ�Ñ‚ÑŒ _Ñ�илу_ _вращениÑ�_ из вращениÑ� приÑ�оединенной конÑ�трукции. Структура должна включать подходÑ�щий _паруÑ�_ (в наÑ�тоÑ�щее времÑ� любой блок шерÑ�ти).", + "block.create.mechanical_bearing.tooltip.summary": "Используется для вращения _больших_ конструкций_ или генерации _силы_ _вращения_ с помощью ветра.", + "block.create.mechanical_bearing.tooltip.condition1": "При вращении", + "block.create.mechanical_bearing.tooltip.behaviour1": "Начинает вращать присоединенную _Поворотную_ _раму_ и связанные с ним блоки.", + "block.create.mechanical_bearing.tooltip.condition2": "Когда запитан", + "block.create.mechanical_bearing.tooltip.behaviour2": "Начинает предоставлять _силу_ _вращения_ из вращения присоединенной конструкции. Структура должна включать подходящий _парус_ (в настоящее время любой блок шерсти).", "block.create.clockwork_bearing.tooltip": "UNLOCALIZED: CLOCKWORK BEARING", "block.create.clockwork_bearing.tooltip.summary": "UNLOCALIZED: An advanced version of the _Mechanical_ _Bearing_ for rotating up to two _clock_ _hands_ according to current _in-game_ _time_.", @@ -1370,34 +1239,34 @@ "block.create.rope_pulley.tooltip.behaviour1": "UNLOCALIZED: Starts moving the attached structure. Speed and direction correlate to the incoming Rotation Speed.", "block.create.linear_chassis.tooltip": "TRANSLATION CHASSIS", - "block.create.linear_chassis.tooltip.summary": "Ð�аÑ�траиваемаÑ� оÑ�нова длÑ� конÑ�трукций, перемещаемых _МеханичеÑ�ким_ _поршнем._ Эти блоки должны формировать первый Ñ�лой блоков перед поршнем.", - "block.create.linear_chassis.tooltip.condition1": "При движении механичеÑ�ким поршнем", - "block.create.linear_chassis.tooltip.behaviour1": "_Перемещает_ вÑ�е _прикрепленные_ _рамы_ Ñ� одинаковой ориентацией, и блоки перед ним. При возврате поршнÑ� в иÑ�ходное положение блоки будут втÑ�гиватьÑ�Ñ�, только еÑ�ли лицеваÑ� Ñ�торона рамы _липкаÑ�_ (Ñ�м. [Ctrl]).", + "block.create.linear_chassis.tooltip.summary": "Настраиваемая основа для конструкций, перемещаемых _Механическим_ _поршнем._ Эти блоки должны формировать первый слой блоков перед поршнем.", + "block.create.linear_chassis.tooltip.condition1": "При движении механическим поршнем", + "block.create.linear_chassis.tooltip.behaviour1": "_Перемещает_ все _прикрепленные_ _рамы_ с одинаковой ориентацией, и блоки перед ним. При возврате поршня в исходное положение блоки будут втягиваться, только если лицевая сторона рамы _липкая_ (см. [Ctrl]).", "block.create.linear_chassis.tooltip.condition2": "UNLOCALIZED: With Wrench", "block.create.linear_chassis.tooltip.behaviour2": "UNLOCALIZED: Configure the _range_ for this chassis block. Hold CTRL to modify the range of all attached chassis blocks as well.", - "block.create.linear_chassis.tooltip.control1": "ПКМ Ñ�о Ñ�гуÑ�тком Ñ�лизи", - "block.create.linear_chassis.tooltip.action1": "Делает выбранную Ñ�торону _липкой._ При возвращении поршнÑ�, рама будет _втÑ�гивать_ вÑ�е подÑ�оединенные блоки в Ñ�воей колонне и в пределах заданного диапазона.", + "block.create.linear_chassis.tooltip.control1": "ПКМ со сгустком слизи", + "block.create.linear_chassis.tooltip.action1": "Делает выбранную сторону _липкой._ При возвращении поршня, рама будет _втягивать_ все подсоединенные блоки в своей колонне и в пределах заданного диапазона.", "block.create.radial_chassis.tooltip": "ROTATION CHASSIS", - "block.create.radial_chassis.tooltip.summary": "ТребуетÑ�Ñ� длÑ� вращающихÑ�Ñ� конÑ�трукций Ñ� _МеханичеÑ�ким_ _подшипником._", - "block.create.radial_chassis.tooltip.condition1": "При вращении Ñ� помощью подшипника", - "block.create.radial_chassis.tooltip.behaviour1": "_Поворачивает_ вÑ�е блоки, прикрепленные к _липким_ Ñ�торонам (Ñ�м. [Ctrl]) в пределах заданного диапазона вокруг Ñ�ебÑ�. _Передает_ вращение на приÑ�оединенные поворотные рамы.", + "block.create.radial_chassis.tooltip.summary": "Требуется для вращающихся конструкций с _Механическим_ _подшипником._", + "block.create.radial_chassis.tooltip.condition1": "При вращении с помощью подшипника", + "block.create.radial_chassis.tooltip.behaviour1": "_Поворачивает_ все блоки, прикрепленные к _липким_ сторонам (см. [Ctrl]) в пределах заданного диапазона вокруг себя. _Передает_ вращение на присоединенные поворотные рамы.", "block.create.radial_chassis.tooltip.condition2": "UNLOCALIZED: With Wrench", "block.create.radial_chassis.tooltip.behaviour2": "UNLOCALIZED: Configure the _range_ for this chassis block. Hold CTRL to modify the range of all attached chassis blocks as well.", - "block.create.radial_chassis.tooltip.control1": "ПКМ Ñ�о Ñ�гуÑ�тком Ñ�лизи", - "block.create.radial_chassis.tooltip.action1": "Делает выбранную Ñ�торону _липкой._ При вращении, вÑ�е приÑ�оединенные блоки в пределах заданного диапазона будут вращатьÑ�Ñ� вмеÑ�те Ñ� ней.", + "block.create.radial_chassis.tooltip.control1": "ПКМ со сгустком слизи", + "block.create.radial_chassis.tooltip.action1": "Делает выбранную сторону _липкой._ При вращении, все присоединенные блоки в пределах заданного диапазона будут вращаться вместе с ней.", "block.create.mechanical_drill.tooltip": "MECHANICAL mechanical_drill", - "block.create.mechanical_drill.tooltip.summary": "МеханичеÑ�кое уÑ�тройÑ�тво, пригодное длÑ� _разрушениÑ�_ _блоков._", - "block.create.mechanical_drill.tooltip.condition1": "При вращении", - "block.create.mechanical_drill.tooltip.behaviour1": "ДейÑ�твует как _Ñ�тационарный_ разрушитель блоков. Также _наноÑ�ит_ _урон_ _Ñ�ущеÑ�твам_ в рабочей облаÑ�ти.", - "block.create.mechanical_drill.tooltip.condition2": "При движении механичеÑ�ким поршнем", - "block.create.mechanical_drill.tooltip.behaviour2": "Разрушает блоки, на которые наталкиваетÑ�Ñ�.", + "block.create.mechanical_drill.tooltip.summary": "Механическое устройство, пригодное для _разрушения_ _блоков._", + "block.create.mechanical_drill.tooltip.condition1": "При вращении", + "block.create.mechanical_drill.tooltip.behaviour1": "Действует как _стационарный_ разрушитель блоков. Также _наносит_ _урон_ _существам_ в рабочей области.", + "block.create.mechanical_drill.tooltip.condition2": "При движении механическим поршнем", + "block.create.mechanical_drill.tooltip.behaviour2": "Разрушает блоки, на которые наталкивается.", "block.create.mechanical_harvester.tooltip": "MECHANICAL mechanical_harvester", - "block.create.mechanical_harvester.tooltip.summary": "МеханичеÑ�кий резак длÑ� раÑ�тений, подходÑ�щий длÑ� автоматизации выращиваниÑ� Ñ�редних раÑ�тений", - "block.create.mechanical_harvester.tooltip.condition1": "При движении механичеÑ�ким поршнем", - "block.create.mechanical_harvester.tooltip.behaviour1": "_Срезает_ вÑ�е _зрелые_ _поÑ�евы_ и Ñ�браÑ�ывает их в иÑ�ходное Ñ�оÑ�тоÑ�ние роÑ�та.", + "block.create.mechanical_harvester.tooltip.summary": "Механический резак для растений, подходящий для автоматизации выращивания средних растений", + "block.create.mechanical_harvester.tooltip.condition1": "При движении механическим поршнем", + "block.create.mechanical_harvester.tooltip.behaviour1": "_Срезает_ все _зрелые_ _посевы_ и сбрасывает их в исходное состояние роста.", "block.create.mechanical_plough.tooltip": "UNLOCALIZED: MECHANICAL PLOUGH", "block.create.mechanical_plough.tooltip.summary": "UNLOCALIZED: A mechanical plough has a variety of uses. It is movable with _Mechanical_ _Pistons_, _Bearings_ or other controllers.", @@ -1414,22 +1283,22 @@ "block.create.mechanical_saw.tooltip.behaviour3": "UNLOCALIZED: _Cuts_ all _Trees_ with which the saw collides.", "block.create.stockpile_switch.tooltip": "stockpile_switch", - "block.create.stockpile_switch.tooltip.summary": "Переключение Ñ�игнала на оÑ�нове _предметов_ и _объёма_ _хранилища_ в прикрепленном контейнере.", - "block.create.stockpile_switch.tooltip.condition1": "Когда ниже нижнего порога", - "block.create.stockpile_switch.tooltip.behaviour1": "ПереÑ�таёт подавать Ñ�игнал", - "block.create.stockpile_switch.tooltip.condition2": "Когда выше верхнего порога", - "block.create.stockpile_switch.tooltip.behaviour2": "Ð�ачинает подавать _Ñ�игнал_ пока не будет доÑ�тигнут нижний порог", - "block.create.stockpile_switch.tooltip.control1": "ПКМ", - "block.create.stockpile_switch.tooltip.action1": "Открывает _Меню_ _наÑ�тройки_", + "block.create.stockpile_switch.tooltip.summary": "Переключение сигнала на основе _предметов_ и _объёма_ _хранилища_ в прикрепленном контейнере.", + "block.create.stockpile_switch.tooltip.condition1": "Когда ниже нижнего порога", + "block.create.stockpile_switch.tooltip.behaviour1": "Перестаёт подавать сигнал", + "block.create.stockpile_switch.tooltip.condition2": "Когда выше верхнего порога", + "block.create.stockpile_switch.tooltip.behaviour2": "Начинает подавать _сигнал_ пока не будет достигнут нижний порог", + "block.create.stockpile_switch.tooltip.control1": "ПКМ", + "block.create.stockpile_switch.tooltip.action1": "Открывает _Меню_ _настройки_", "block.create.redstone_link.tooltip": "REDSTONE LINK", - "block.create.redstone_link.tooltip.summary": "Конечные точки длÑ� _беÑ�проводных_ Ñ�оединений. Можно выбрать _чаÑ�тоты_ Ñ� помощью любого предмета. Диапазон Ñ�игнала ограничен, но доÑ�таточно далёк.", - "block.create.redstone_link.tooltip.condition1": "Когда запитан", - "block.create.redstone_link.tooltip.behaviour1": "Получает Ñ�игнал на той же _чаÑ�тоте_ и выводит его.", - "block.create.redstone_link.tooltip.control1": "ПКМ Ñ� предметом", - "block.create.redstone_link.tooltip.action1": "УÑ�танавливает _чаÑ�тоту_ длÑ� Ñ�того звена. Ð’Ñ�его длÑ� определениÑ� чаÑ�тоты можно иÑ�пользовать _2_ _предмета._", - "block.create.redstone_link.tooltip.control2": "ПКМ крадÑ�Ñ�ÑŒ", - "block.create.redstone_link.tooltip.action2": "Переключение между режимами _приёма_ и _передачи._", + "block.create.redstone_link.tooltip.summary": "Конечные точки для _беспроводных_ соединений. Можно выбрать _частоты_ с помощью любого предмета. Диапазон сигнала ограничен, но достаточно далёк.", + "block.create.redstone_link.tooltip.condition1": "Когда запитан", + "block.create.redstone_link.tooltip.behaviour1": "Получает сигнал на той же _частоте_ и выводит его.", + "block.create.redstone_link.tooltip.control1": "ПКМ с предметом", + "block.create.redstone_link.tooltip.action1": "Устанавливает _частоту_ для этого звена. Всего для определения частоты можно использовать _2_ _предмета._", + "block.create.redstone_link.tooltip.control2": "ПКМ крадясь", + "block.create.redstone_link.tooltip.action2": "Переключение между режимами _приёма_ и _передачи._", "block.create.nixie_tube.tooltip": "UNLOCALIZED: NIXIE TUBE", "block.create.nixie_tube.tooltip.summary": "UNLOCALIZED: A fancy redstone-powered _Number_ _Display_ ranging from 0 to 15.", @@ -1437,19 +1306,19 @@ "block.create.nixie_tube.tooltip.behaviour1": "UNLOCALIZED: Shows the current redstone _Signal_ _Strength_ as its displayed value.", "block.create.redstone_contact.tooltip": "REDSTONE redstone_contact", - "block.create.redstone_contact.tooltip.summary": "ПроÑ�тое уÑ�тройÑ�тво длÑ� продвинутых механизмов.", - "block.create.redstone_contact.tooltip.condition1": "Когда Ñ�мотрит на другое контактное Ñ�оединение", - "block.create.redstone_contact.tooltip.behaviour1": "Подаёт _Ñ�игнал_", - "block.create.redstone_contact.tooltip.condition2": "При движении механичеÑ�ким поршнем", - "block.create.redstone_contact.tooltip.behaviour2": "Включает вÑ�е Ñ�тационарные контактные Ñ�оединениÑ�, через которые проходит.", + "block.create.redstone_contact.tooltip.summary": "Простое устройство для продвинутых механизмов.", + "block.create.redstone_contact.tooltip.condition1": "Когда смотрит на другое контактное соединение", + "block.create.redstone_contact.tooltip.behaviour1": "Подаёт _сигнал_", + "block.create.redstone_contact.tooltip.condition2": "При движении механическим поршнем", + "block.create.redstone_contact.tooltip.behaviour2": "Включает все стационарные контактные соединения, через которые проходит.", "block.create.adjustable_crate.tooltip": "adjustable_crate", - "block.create.adjustable_crate.tooltip.summary": "Этот _контейнер_ позволÑ�ет контролировать его емкоÑ�Ñ‚ÑŒ. Он может Ñ�одержать до _16_ _Ñ�таков_ любого предмета.", - "block.create.adjustable_crate.tooltip.control1": "ПКМ", - "block.create.adjustable_crate.tooltip.action1": "Открывает _Меню_", + "block.create.adjustable_crate.tooltip.summary": "Этот _контейнер_ позволяет контролировать его емкость. Он может содержать до _16_ _стаков_ любого предмета.", + "block.create.adjustable_crate.tooltip.control1": "ПКМ", + "block.create.adjustable_crate.tooltip.action1": "Открывает _Меню_", "block.create.creative_crate.tooltip": "CREATIVE CRATE", - "block.create.creative_crate.tooltip.summary": "Снабжает _Схемопушку_ беÑ�конечным запаÑ�ом блоков", + "block.create.creative_crate.tooltip.summary": "Снабжает _Схемопушку_ бесконечным запасом блоков", "block.create.creative_crate.tooltip.condition1": "UNLOCALIZED: When Item in Filter Slot", "block.create.creative_crate.tooltip.behaviour1": "UNLOCALIZED: Anything _extracting_ from this container will provide an _endless_ _supply_ of the item specified. Items _inserted_ into this crate will be _voided._", @@ -1461,7 +1330,7 @@ "block.create.deployer.tooltip.behaviour2": "UNLOCALIZED: Toggles punch mode. In _punch_ _mode_, the Deployer will attempt to use its item to _break_ _blocks_ or _hurt_ _entities_.", "block.create.funnel.tooltip": "BELT FUNNEL", - "block.create.funnel.tooltip.summary": "Собирает входÑ�щие предметы на _МеханичеÑ�кой_ _ленте_ и по возможноÑ�ти кладет их в прилагаемый _инвентарь._ Должен быть непоÑ�редÑ�твенно _над_ лентой, Ñ� проёмом, Ñ�мотрÑ�щим против направлениÑ� ленты. Инвентарь должен быть на той же выÑ�оте, что и воронка.", + "block.create.funnel.tooltip.summary": "Собирает входящие предметы на _Механической_ _ленте_ и по возможности кладет их в прилагаемый _инвентарь._ Должен быть непосредственно _над_ лентой, с проёмом, смотрящим против направления ленты. Инвентарь должен быть на той же высоте, что и воронка.", "block.create.funnel.tooltip.condition1": "UNLOCALIZED: Passive Belt pulling", "block.create.funnel.tooltip.behaviour1": "UNLOCALIZED: Funnels can pull items _from_ _belts_ when placed above them, either sideways or at the end. When a side-ways funnel is backed up, items on the _belt_ _will_ _not_ _stall_.", @@ -1478,9 +1347,9 @@ "block.create.brass_casing.tooltip.behaviour1": "UNLOCALIZED: _Reinforces_ _belts_ with a brass foundation. Reinforced Belts can support _Belt_ _Tunnels_, _Extractors_, _Funnels_, and _Transposers_ interacting with the belt from the sides and below.", "block.create.belt_observer.tooltip": "BELT OBSERVER", - "block.create.belt_observer.tooltip.summary": "Сканирует предметы, проходÑ�щие по _МеханичеÑ�кой_ _ленте_ перед ним. Хорошо работает Ñ� _поршнем_ Ñ�верху, отталкивающим определенные предметы.", - "block.create.belt_observer.tooltip.condition1": "Когда предмет Ñ�оответÑ�твует фильтру", - "block.create.belt_observer.tooltip.behaviour1": "Подаёт короткий _импульÑ�_ Ñ�о вÑ�ех Ñ�торон. ПуÑ�той фильтр Ñ�оответÑ�твует любому Ñ�лементу.", + "block.create.belt_observer.tooltip.summary": "Сканирует предметы, проходящие по _Механической_ _ленте_ перед ним. Хорошо работает с _поршнем_ сверху, отталкивающим определенные предметы.", + "block.create.belt_observer.tooltip.condition1": "Когда предмет соответствует фильтру", + "block.create.belt_observer.tooltip.behaviour1": "Подаёт короткий _импульс_ со всех сторон. Пустой фильтр соответствует любому элементу.", "block.create.belt_observer.tooltip.condition2": "UNLOCALIZED: Pulse Mode", "block.create.belt_observer.tooltip.behaviour2": "UNLOCALIZED: Emits a _pulse_ when a _matching_ _item_ _passes_ the center of the observed belt segment.", "block.create.belt_observer.tooltip.condition3": "UNLOCALIZED: Eject Mode", @@ -1489,10 +1358,10 @@ "block.create.belt_observer.tooltip.behaviour4": "UNLOCALIZED: _Splits_ a _matching_ _item_ _stack_ and _ejects_ _half_ of it off the side.", "block.create.pulse_repeater.tooltip": "PULSE REPEATER", - "block.create.pulse_repeater.tooltip.summary": "ПроÑ�таÑ� Ñ�хема длÑ� уменьшениÑ� времени проходÑ�щего Ñ�игнала до _1_ _тика._", + "block.create.pulse_repeater.tooltip.summary": "Простая схема для уменьшения времени проходящего сигнала до _1_ _тика._", "block.create.adjustable_repeater.tooltip": "FLEX REPEATER", - "block.create.adjustable_repeater.tooltip.summary": "Продвинутый _Повторитель_ Ñ� _наÑ�траиваемой_ _задержкой_ вплоть до 30 минут.", + "block.create.adjustable_repeater.tooltip.summary": "Продвинутый _Повторитель_ с _настраиваемой_ _задержкой_ вплоть до 30 минут.", "block.create.adjustable_pulse_repeater.tooltip": "UNLOCALIZED: FLEX PULSE REPEATER", "block.create.adjustable_pulse_repeater.tooltip.summary": "UNLOCALIZED: A _Pulse_ _Repeater_ with a _configurable_ _Delay_ up to 30 Minutes.", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index 0a8ea639d..ac6a23398 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -3,86 +3,41 @@ "_": "->------------------------] Game Elements [------------------------<-", - "block.create.acacia_window": "金å�ˆæ¬¢çª—户", - "block.create.acacia_window_pane": "金å�ˆæ¬¢çª—户æ�¿", - "block.create.adjustable_crate": "å�¯è°ƒèŠ‚æ�¿æ�¡ç®±", - "block.create.adjustable_pulley": "å�¯è°ƒèŠ‚è¿žæ�ºé½¿è½®ç®±", - "block.create.adjustable_pulse_repeater": "å�¯è°ƒèŠ‚脉冲中继器", - "block.create.adjustable_repeater": "å�¯è°ƒèŠ‚中继器", - "block.create.analog_lever": "å�¯è°ƒèŠ‚拉æ�†", + "block.create.acacia_window": "金合欢窗户", + "block.create.acacia_window_pane": "金合欢窗户板", + "block.create.adjustable_crate": "可调节板条箱", + "block.create.adjustable_pulley": "可调节连携齿轮箱", + "block.create.adjustable_pulse_repeater": "可调节脉冲中继器", + "block.create.adjustable_repeater": "可调节中继器", + "block.create.analog_lever": "可调节拉杆", "block.create.andesite_belt_funnel": "UNLOCALIZED: Andesite Belt Funnel", - "block.create.andesite_bricks": "安山岩砖", - "block.create.andesite_bricks_slab": "安山岩砖å�°é˜¶", - "block.create.andesite_bricks_stairs": "安山岩砖楼梯", - "block.create.andesite_bricks_wall": "安山岩砖墙", - "block.create.andesite_casing": "安山机壳", - "block.create.andesite_cobblestone": "安山岩圆石", - "block.create.andesite_cobblestone_slab": "安山岩圆石å�°é˜¶", - "block.create.andesite_cobblestone_stairs": "安山岩圆石楼梯", - "block.create.andesite_cobblestone_wall": "安山岩圆石墙", + "block.create.andesite_bricks": "安山岩砖", + "block.create.andesite_bricks_slab": "安山岩砖台阶", + "block.create.andesite_bricks_stairs": "安山岩砖楼梯", + "block.create.andesite_bricks_wall": "安山岩砖墙", + "block.create.andesite_casing": "安山机壳", + "block.create.andesite_cobblestone": "安山岩圆石", + "block.create.andesite_cobblestone_slab": "安山岩圆石台阶", + "block.create.andesite_cobblestone_stairs": "安山岩圆石楼梯", + "block.create.andesite_cobblestone_wall": "安山岩圆石墙", "block.create.andesite_funnel": "UNLOCALIZED: Andesite Funnel", - "block.create.andesite_pillar": "竖纹安山岩", + "block.create.andesite_pillar": "竖纹安山岩", "block.create.andesite_tunnel": "UNLOCALIZED: Andesite Tunnel", -<<<<<<< HEAD - "block.create.basin": "工作盆", - "block.create.belt": "ä¼ é€�带", - "block.create.belt_observer": "ä¼ é€�带侦测器", - "block.create.birch_window": "白桦窗户", - "block.create.birch_window_pane": "白桦窗户æ�¿", -======= "block.create.basin": "工作盆", "block.create.belt": "传送带", "block.create.birch_window": "白桦窗户", "block.create.birch_window_pane": "白桦窗户板", ->>>>>>> mc1.15/dev "block.create.black_seat": "UNLOCALIZED: Black Seat", "block.create.black_valve_handle": "UNLOCALIZED: Black Valve Handle", "block.create.blaze_burner": "UNLOCALIZED: Blaze Burner", "block.create.blue_seat": "UNLOCALIZED: Blue Seat", "block.create.blue_valve_handle": "UNLOCALIZED: Blue Valve Handle", "block.create.brass_belt_funnel": "UNLOCALIZED: Brass Belt Funnel", - "block.create.brass_block": "黄铜å�—", - "block.create.brass_casing": "黄铜机壳", + "block.create.brass_block": "黄铜块", + "block.create.brass_casing": "黄铜机壳", "block.create.brass_funnel": "UNLOCALIZED: Brass Funnel", "block.create.brass_tunnel": "UNLOCALIZED: Brass Tunnel", "block.create.brown_seat": "UNLOCALIZED: Brown Seat", -<<<<<<< HEAD - "block.create.cart_assembler": "矿车装é…�ç«™", - "block.create.chiseled_dark_scoria": "錾制深色熔渣", - "block.create.chiseled_dolomite": "錾制白云岩", - "block.create.chiseled_gabbro": "錾制辉长岩", - "block.create.chiseled_limestone": "錾制石ç�°å²©", - "block.create.chiseled_scoria": "錾制熔渣", - "block.create.chiseled_weathered_limestone": "錾制风化石ç�°å²©", - "block.create.chute": "UNLOCALIZED: Chute", - "block.create.clockwork_bearing": "时钟轴承", - "block.create.clutch": "离å�ˆå™¨", - "block.create.cogwheel": "齿轮", - "block.create.copper_block": "é“œå�—", - "block.create.copper_casing": "铜机壳", - "block.create.copper_ore": "铜矿石", - "block.create.copper_shingles": "铜瓦", - "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", - "block.create.creative_crate": "创造æ�¿æ�¡ç®±", - "block.create.creative_motor": "创造马达", - "block.create.crushing_wheel": "粉碎轮", - "block.create.crushing_wheel_controller": "粉碎轮控制器", - "block.create.cuckoo_clock": "布谷鸟闹钟", - "block.create.cyan_seat": "UNLOCALIZED: Cyan Seat", - "block.create.dark_oak_window": "深色橡木窗户", - "block.create.dark_oak_window_pane": "深色橡木窗户æ�¿", - "block.create.dark_scoria": "深色熔渣", - "block.create.dark_scoria_bricks": "深色熔渣砖", - "block.create.dark_scoria_bricks_slab": "深色熔渣砖å�°é˜¶", - "block.create.dark_scoria_bricks_stairs": "深色熔渣砖楼梯", - "block.create.dark_scoria_bricks_wall": "深色熔渣砖墙", - "block.create.dark_scoria_cobblestone": "深色熔渣圆石", - "block.create.dark_scoria_cobblestone_slab": "深色熔渣圆石å�°é˜¶", - "block.create.dark_scoria_cobblestone_stairs": "深色熔渣圆石楼梯", - "block.create.dark_scoria_cobblestone_wall": "深色熔渣圆石墙", - "block.create.dark_scoria_pillar": "竖纹深色熔渣", - "block.create.deployer": "机械手", -======= "block.create.brown_valve_handle": "UNLOCALIZED: Brown Valve Handle", "block.create.cart_assembler": "矿车装配站", "block.create.chiseled_dark_scoria": "錾制深色熔渣", @@ -122,87 +77,68 @@ "block.create.dark_scoria_cobblestone_wall": "深色熔渣圆石墙", "block.create.dark_scoria_pillar": "竖纹深色熔渣", "block.create.deployer": "机械手", ->>>>>>> mc1.15/dev "block.create.depot": "UNLOCALIZED: Depot", - "block.create.diorite_bricks": "闪长岩砖", - "block.create.diorite_bricks_slab": "闪长岩砖å�°é˜¶", - "block.create.diorite_bricks_stairs": "闪长岩砖楼梯", - "block.create.diorite_bricks_wall": "闪长岩砖墙", - "block.create.diorite_cobblestone": "闪长岩圆石", - "block.create.diorite_cobblestone_slab": "闪长岩圆石å�°é˜¶", - "block.create.diorite_cobblestone_stairs": "闪长岩圆石楼梯", - "block.create.diorite_cobblestone_wall": "闪长岩圆石墙", - "block.create.diorite_pillar": "竖纹闪长岩", - "block.create.dolomite": "白云岩", - "block.create.dolomite_bricks": "白云岩砖", - "block.create.dolomite_bricks_slab": "白云岩砖å�°é˜¶", - "block.create.dolomite_bricks_stairs": "白云岩砖楼梯", - "block.create.dolomite_bricks_wall": "白云岩砖墙", - "block.create.dolomite_cobblestone": "白云岩圆石", - "block.create.dolomite_cobblestone_slab": "白云岩圆石å�°é˜¶", - "block.create.dolomite_cobblestone_stairs": "白云岩圆石楼梯", - "block.create.dolomite_cobblestone_wall": "白云岩圆石墙", - "block.create.dolomite_pillar": "竖纹白云岩", - "block.create.encased_belt": "è¿žæ�ºé½¿è½®ç®±", - "block.create.encased_fan": "鼓风机", + "block.create.diorite_bricks": "闪长岩砖", + "block.create.diorite_bricks_slab": "闪长岩砖台阶", + "block.create.diorite_bricks_stairs": "闪长岩砖楼梯", + "block.create.diorite_bricks_wall": "闪长岩砖墙", + "block.create.diorite_cobblestone": "闪长岩圆石", + "block.create.diorite_cobblestone_slab": "闪长岩圆石台阶", + "block.create.diorite_cobblestone_stairs": "闪长岩圆石楼梯", + "block.create.diorite_cobblestone_wall": "闪长岩圆石墙", + "block.create.diorite_pillar": "竖纹闪长岩", + "block.create.dolomite": "白云岩", + "block.create.dolomite_bricks": "白云岩砖", + "block.create.dolomite_bricks_slab": "白云岩砖台阶", + "block.create.dolomite_bricks_stairs": "白云岩砖楼梯", + "block.create.dolomite_bricks_wall": "白云岩砖墙", + "block.create.dolomite_cobblestone": "白云岩圆石", + "block.create.dolomite_cobblestone_slab": "白云岩圆石台阶", + "block.create.dolomite_cobblestone_stairs": "白云岩圆石楼梯", + "block.create.dolomite_cobblestone_wall": "白云岩圆石墙", + "block.create.dolomite_pillar": "竖纹白云岩", + "block.create.encased_belt": "连携齿轮箱", + "block.create.encased_fan": "鼓风机", "block.create.encased_fluid_pipe": "UNLOCALIZED: Encased Fluid Pipe", - "block.create.encased_shaft": "齿轮箱", - "block.create.fancy_andesite_bricks": "方纹安山岩砖", - "block.create.fancy_andesite_bricks_slab": "方纹安山岩砖å�°é˜¶", - "block.create.fancy_andesite_bricks_stairs": "方纹安山岩砖楼梯", - "block.create.fancy_andesite_bricks_wall": "方纹安山岩砖墙", - "block.create.fancy_dark_scoria_bricks": "方纹深色熔渣砖", - "block.create.fancy_dark_scoria_bricks_slab": "方纹深色熔渣砖å�°é˜¶", - "block.create.fancy_dark_scoria_bricks_stairs": "方纹深色熔渣砖楼梯", - "block.create.fancy_dark_scoria_bricks_wall": "方纹深色熔渣砖墙", - "block.create.fancy_diorite_bricks": "方纹闪长岩砖", - "block.create.fancy_diorite_bricks_slab": "方纹闪长岩砖å�°é˜¶", - "block.create.fancy_diorite_bricks_stairs": "方纹闪长岩砖楼梯", - "block.create.fancy_diorite_bricks_wall": "方纹闪长岩砖墙", - "block.create.fancy_dolomite_bricks": "方纹白云岩砖", - "block.create.fancy_dolomite_bricks_slab": "方纹白云岩砖å�°é˜¶", - "block.create.fancy_dolomite_bricks_stairs": "方纹白云岩砖楼梯", - "block.create.fancy_dolomite_bricks_wall": "方纹白云岩砖墙", - "block.create.fancy_gabbro_bricks": "方纹辉长岩砖", - "block.create.fancy_gabbro_bricks_slab": "方纹辉长岩砖å�°é˜¶", - "block.create.fancy_gabbro_bricks_stairs": "方纹辉长岩砖楼梯", - "block.create.fancy_gabbro_bricks_wall": "方纹辉长岩砖墙", - "block.create.fancy_granite_bricks": "方纹花岗岩砖", - "block.create.fancy_granite_bricks_slab": "方纹花岗岩砖å�°é˜¶", - "block.create.fancy_granite_bricks_stairs": "方纹花岗岩砖楼梯", - "block.create.fancy_granite_bricks_wall": "方纹花岗岩砖墙", - "block.create.fancy_limestone_bricks": "方纹石ç�°å²©ç –", - "block.create.fancy_limestone_bricks_slab": "方纹石ç�°å²©ç –å�°é˜¶", - "block.create.fancy_limestone_bricks_stairs": "方纹石ç�°å²©ç –楼梯", - "block.create.fancy_limestone_bricks_wall": "方纹石ç�°å²©ç –墙", - "block.create.fancy_scoria_bricks": "方纹熔渣砖", - "block.create.fancy_scoria_bricks_slab": "方纹熔渣砖å�°é˜¶", - "block.create.fancy_scoria_bricks_stairs": "方纹熔渣砖楼梯", - "block.create.fancy_scoria_bricks_wall": "方纹熔渣砖墙", - "block.create.fancy_weathered_limestone_bricks": "方纹风化石ç�°å²©ç –", - "block.create.fancy_weathered_limestone_bricks_slab": "方纹风化石ç�°å²©ç –å�°é˜¶", - "block.create.fancy_weathered_limestone_bricks_stairs": "方纹风化石ç�°å²©ç –楼梯", - "block.create.fancy_weathered_limestone_bricks_wall": "方纹风化石ç�°å²©ç –墙", + "block.create.encased_shaft": "齿轮箱", + "block.create.fancy_andesite_bricks": "方纹安山岩砖", + "block.create.fancy_andesite_bricks_slab": "方纹安山岩砖台阶", + "block.create.fancy_andesite_bricks_stairs": "方纹安山岩砖楼梯", + "block.create.fancy_andesite_bricks_wall": "方纹安山岩砖墙", + "block.create.fancy_dark_scoria_bricks": "方纹深色熔渣砖", + "block.create.fancy_dark_scoria_bricks_slab": "方纹深色熔渣砖台阶", + "block.create.fancy_dark_scoria_bricks_stairs": "方纹深色熔渣砖楼梯", + "block.create.fancy_dark_scoria_bricks_wall": "方纹深色熔渣砖墙", + "block.create.fancy_diorite_bricks": "方纹闪长岩砖", + "block.create.fancy_diorite_bricks_slab": "方纹闪长岩砖台阶", + "block.create.fancy_diorite_bricks_stairs": "方纹闪长岩砖楼梯", + "block.create.fancy_diorite_bricks_wall": "方纹闪长岩砖墙", + "block.create.fancy_dolomite_bricks": "方纹白云岩砖", + "block.create.fancy_dolomite_bricks_slab": "方纹白云岩砖台阶", + "block.create.fancy_dolomite_bricks_stairs": "方纹白云岩砖楼梯", + "block.create.fancy_dolomite_bricks_wall": "方纹白云岩砖墙", + "block.create.fancy_gabbro_bricks": "方纹辉长岩砖", + "block.create.fancy_gabbro_bricks_slab": "方纹辉长岩砖台阶", + "block.create.fancy_gabbro_bricks_stairs": "方纹辉长岩砖楼梯", + "block.create.fancy_gabbro_bricks_wall": "方纹辉长岩砖墙", + "block.create.fancy_granite_bricks": "方纹花岗岩砖", + "block.create.fancy_granite_bricks_slab": "方纹花岗岩砖台阶", + "block.create.fancy_granite_bricks_stairs": "方纹花岗岩砖楼梯", + "block.create.fancy_granite_bricks_wall": "方纹花岗岩砖墙", + "block.create.fancy_limestone_bricks": "方纹石灰岩砖", + "block.create.fancy_limestone_bricks_slab": "方纹石灰岩砖台阶", + "block.create.fancy_limestone_bricks_stairs": "方纹石灰岩砖楼梯", + "block.create.fancy_limestone_bricks_wall": "方纹石灰岩砖墙", + "block.create.fancy_scoria_bricks": "方纹熔渣砖", + "block.create.fancy_scoria_bricks_slab": "方纹熔渣砖台阶", + "block.create.fancy_scoria_bricks_stairs": "方纹熔渣砖楼梯", + "block.create.fancy_scoria_bricks_wall": "方纹熔渣砖墙", + "block.create.fancy_weathered_limestone_bricks": "方纹风化石灰岩砖", + "block.create.fancy_weathered_limestone_bricks_slab": "方纹风化石灰岩砖台阶", + "block.create.fancy_weathered_limestone_bricks_stairs": "方纹风化石灰岩砖楼梯", + "block.create.fancy_weathered_limestone_bricks_wall": "方纹风化石灰岩砖墙", "block.create.fluid_pipe": "UNLOCALIZED: Fluid Pipe", "block.create.fluid_tank": "UNLOCALIZED: Fluid Tank", -<<<<<<< HEAD - "block.create.flywheel": "飞轮", - "block.create.framed_glass": "边框玻璃", - "block.create.framed_glass_pane": "边框玻璃æ�¿", - "block.create.furnace_engine": "熔炼引擎", - "block.create.gabbro": "辉长岩", - "block.create.gabbro_bricks": "辉长岩砖", - "block.create.gabbro_bricks_slab": "辉长岩砖å�°é˜¶", - "block.create.gabbro_bricks_stairs": "辉长岩砖楼梯", - "block.create.gabbro_bricks_wall": "辉长岩砖墙", - "block.create.gabbro_cobblestone": "辉长岩圆石", - "block.create.gabbro_cobblestone_slab": "辉长岩圆石å�°é˜¶", - "block.create.gabbro_cobblestone_stairs": "辉长岩圆石楼梯", - "block.create.gabbro_cobblestone_wall": "辉长岩圆石墙", - "block.create.gabbro_pillar": "竖纹辉长岩", - "block.create.gearbox": "å��字齿轮箱", - "block.create.gearshift": "红石齿轮箱", -======= "block.create.fluid_valve": "UNLOCALIZED: Fluid Valve", "block.create.flywheel": "飞轮", "block.create.framed_glass": "边框玻璃", @@ -220,37 +156,19 @@ "block.create.gabbro_pillar": "竖纹辉长岩", "block.create.gearbox": "十字齿轮箱", "block.create.gearshift": "红石齿轮箱", ->>>>>>> mc1.15/dev "block.create.glass_fluid_pipe": "UNLOCALIZED: Glass Fluid Pipe", - "block.create.granite_bricks": "花岗岩砖", - "block.create.granite_bricks_slab": "花岗岩砖å�°é˜¶", - "block.create.granite_bricks_stairs": "花岗岩砖楼梯", - "block.create.granite_bricks_wall": "花岗岩砖墙", - "block.create.granite_cobblestone": "花岗岩圆石", - "block.create.granite_cobblestone_slab": "花岗岩圆石å�°é˜¶", - "block.create.granite_cobblestone_stairs": "花岗岩圆石楼梯", - "block.create.granite_cobblestone_wall": "花岗岩圆石墙", - "block.create.granite_pillar": "竖纹花岗岩", + "block.create.granite_bricks": "花岗岩砖", + "block.create.granite_bricks_slab": "花岗岩砖台阶", + "block.create.granite_bricks_stairs": "花岗岩砖楼梯", + "block.create.granite_bricks_wall": "花岗岩砖墙", + "block.create.granite_cobblestone": "花岗岩圆石", + "block.create.granite_cobblestone_slab": "花岗岩圆石台阶", + "block.create.granite_cobblestone_stairs": "花岗岩圆石楼梯", + "block.create.granite_cobblestone_wall": "花岗岩圆石墙", + "block.create.granite_pillar": "竖纹花岗岩", "block.create.gray_seat": "UNLOCALIZED: Gray Seat", "block.create.gray_valve_handle": "UNLOCALIZED: Gray Valve Handle", "block.create.green_seat": "UNLOCALIZED: Green Seat", -<<<<<<< HEAD - "block.create.hand_crank": "手摇曲柄", - "block.create.horizontal_framed_glass": "竖直边框玻璃", - "block.create.horizontal_framed_glass_pane": "竖直边框玻璃æ�¿", - "block.create.jungle_window": "丛林窗户", - "block.create.jungle_window_pane": "丛林窗户æ�¿", - "block.create.large_cogwheel": "大齿轮", - "block.create.layered_andesite": "层å� å®‰å±±å²©", - "block.create.layered_dark_scoria": "层å� æ·±è‰²ç†”渣", - "block.create.layered_diorite": "层å� é—ªé•¿å²©", - "block.create.layered_dolomite": "层å� ç™½äº‘岩", - "block.create.layered_gabbro": "层å� è¾‰é•¿å²©", - "block.create.layered_granite": "层å� èŠ±å²—岩", - "block.create.layered_limestone": "层å� çŸ³ç�°å²©", - "block.create.layered_scoria": "层å� ç†”渣", - "block.create.layered_weathered_limestone": "层å� é£ŽåŒ–石ç�°å²©", -======= "block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle", "block.create.hand_crank": "手摇曲柄", "block.create.horizontal_framed_glass": "竖直边框玻璃", @@ -267,26 +185,11 @@ "block.create.layered_limestone": "层叠石灰岩", "block.create.layered_scoria": "层叠熔渣", "block.create.layered_weathered_limestone": "层叠风化石灰岩", ->>>>>>> mc1.15/dev "block.create.light_blue_seat": "UNLOCALIZED: Light Blue Seat", "block.create.light_blue_valve_handle": "UNLOCALIZED: Light Blue Valve Handle", "block.create.light_gray_seat": "UNLOCALIZED: Light Gray Seat", "block.create.light_gray_valve_handle": "UNLOCALIZED: Light Gray Valve Handle", "block.create.lime_seat": "UNLOCALIZED: Lime Seat", -<<<<<<< HEAD - "block.create.limesand": "石ç�°æ²™", - "block.create.limestone": "石ç�°å²©", - "block.create.limestone_bricks": "石ç�°å²©ç –", - "block.create.limestone_bricks_slab": "石ç�°å²©ç –å�°é˜¶", - "block.create.limestone_bricks_stairs": "石ç�°å²©ç –楼梯", - "block.create.limestone_bricks_wall": "石ç�°å²©ç –墙", - "block.create.limestone_cobblestone": "石ç�°å²©åœ†çŸ³", - "block.create.limestone_cobblestone_slab": "石ç�°å²©åœ†çŸ³å�°é˜¶", - "block.create.limestone_cobblestone_stairs": "石ç�°å²©åœ†çŸ³æ¥¼æ¢¯", - "block.create.limestone_cobblestone_wall": "石ç�°å²©åœ†çŸ³å¢™", - "block.create.limestone_pillar": "竖纹石ç�°å²©", - "block.create.linear_chassis": "机壳底盘", -======= "block.create.lime_valve_handle": "UNLOCALIZED: Lime Valve Handle", "block.create.limesand": "石灰沙", "block.create.limestone": "石灰岩", @@ -300,124 +203,38 @@ "block.create.limestone_cobblestone_wall": "石灰岩圆石墙", "block.create.limestone_pillar": "竖纹石灰岩", "block.create.linear_chassis": "机壳底盘", ->>>>>>> mc1.15/dev "block.create.magenta_seat": "UNLOCALIZED: Magenta Seat", "block.create.magenta_valve_handle": "UNLOCALIZED: Magenta Valve Handle", "block.create.mechanical_arm": "UNLOCALIZED: Mechanical Arm", - "block.create.mechanical_bearing": "动力轴承", - "block.create.mechanical_crafter": "动力制造器", - "block.create.mechanical_drill": "动力钻头", - "block.create.mechanical_harvester": "动力收割机", - "block.create.mechanical_mixer": "动力æ�…拌器", - "block.create.mechanical_piston": "动力活塞", - "block.create.mechanical_piston_head": "动力活塞头", - "block.create.mechanical_plough": "动力çŠ�", - "block.create.mechanical_press": "动力辊压机", + "block.create.mechanical_bearing": "动力轴承", + "block.create.mechanical_crafter": "动力制造器", + "block.create.mechanical_drill": "动力钻头", + "block.create.mechanical_harvester": "动力收割机", + "block.create.mechanical_mixer": "动力搅拌器", + "block.create.mechanical_piston": "动力活塞", + "block.create.mechanical_piston_head": "动力活塞头", + "block.create.mechanical_plough": "动力犁", + "block.create.mechanical_press": "动力辊压机", "block.create.mechanical_pump": "UNLOCALIZED: Mechanical Pump", - "block.create.mechanical_saw": "动力切割机", - "block.create.millstone": "石磨", - "block.create.minecart_anchor": "矿车锚", - "block.create.mossy_andesite": "生苔安山岩", - "block.create.mossy_dark_scoria": "生苔深色熔渣", - "block.create.mossy_diorite": "生苔闪长岩", - "block.create.mossy_dolomite": "生苔白云岩", - "block.create.mossy_gabbro": "生苔辉长岩", - "block.create.mossy_granite": "生苔花岗岩", - "block.create.mossy_limestone": "生苔石ç�°å²©", - "block.create.mossy_scoria": "生苔熔渣", - "block.create.mossy_weathered_limestone": "生苔风化石ç�°å²©", - "block.create.mysterious_cuckoo_clock": "布谷鸟闹钟", - "block.create.natural_scoria": "天然熔渣", - "block.create.nixie_tube": "辉光管", - "block.create.nozzle": "分散网", - "block.create.oak_window": "橡木窗户", - "block.create.oak_window_pane": "橡木窗户æ�¿", + "block.create.mechanical_saw": "动力切割机", + "block.create.millstone": "石磨", + "block.create.minecart_anchor": "矿车锚", + "block.create.mossy_andesite": "生苔安山岩", + "block.create.mossy_dark_scoria": "生苔深色熔渣", + "block.create.mossy_diorite": "生苔闪长岩", + "block.create.mossy_dolomite": "生苔白云岩", + "block.create.mossy_gabbro": "生苔辉长岩", + "block.create.mossy_granite": "生苔花岗岩", + "block.create.mossy_limestone": "生苔石灰岩", + "block.create.mossy_scoria": "生苔熔渣", + "block.create.mossy_weathered_limestone": "生苔风化石灰岩", + "block.create.mysterious_cuckoo_clock": "布谷鸟闹钟", + "block.create.natural_scoria": "天然熔渣", + "block.create.nixie_tube": "辉光管", + "block.create.nozzle": "分散网", + "block.create.oak_window": "橡木窗户", + "block.create.oak_window_pane": "橡木窗户板", "block.create.orange_seat": "UNLOCALIZED: Orange Seat", -<<<<<<< HEAD - "block.create.ornate_iron_window": "å�Žä¸½é“�窗户", - "block.create.ornate_iron_window_pane": "å�Žä¸½é“�窗户æ�¿", - "block.create.overgrown_andesite": "生è�‰å®‰å±±å²©", - "block.create.overgrown_dark_scoria": "生è�‰æ·±è‰²ç†”渣", - "block.create.overgrown_diorite": "生è�‰é—ªé•¿å²©", - "block.create.overgrown_dolomite": "生è�‰ç™½äº‘岩", - "block.create.overgrown_gabbro": "生è�‰è¾‰é•¿å²©", - "block.create.overgrown_granite": "生è�‰èŠ±å²—岩", - "block.create.overgrown_limestone": "生è�‰çŸ³ç�°å²©", - "block.create.overgrown_scoria": "生è�‰ç†”渣", - "block.create.overgrown_weathered_limestone": "生è�‰é£ŽåŒ–石ç�°å²©", - "block.create.paved_andesite": "安山岩铺路石", - "block.create.paved_andesite_slab": "安山岩铺路石å�°é˜¶", - "block.create.paved_andesite_stairs": "安山岩铺路石楼梯", - "block.create.paved_andesite_wall": "安山岩铺路石墙", - "block.create.paved_dark_scoria": "深色熔渣铺路石", - "block.create.paved_dark_scoria_slab": "深色熔渣铺路石å�°é˜¶", - "block.create.paved_dark_scoria_stairs": "深色熔渣铺路石楼梯", - "block.create.paved_dark_scoria_wall": "深色熔渣铺路石墙", - "block.create.paved_diorite": "闪长岩铺路石", - "block.create.paved_diorite_slab": "闪长岩铺路石å�°é˜¶", - "block.create.paved_diorite_stairs": "闪长岩铺路石楼梯", - "block.create.paved_diorite_wall": "闪长岩铺路石墙", - "block.create.paved_dolomite": "白云岩铺路石", - "block.create.paved_dolomite_slab": "白云岩铺路石å�°é˜¶", - "block.create.paved_dolomite_stairs": "白云岩铺路石楼梯", - "block.create.paved_dolomite_wall": "白云岩铺路石墙", - "block.create.paved_gabbro": "辉长岩铺路石", - "block.create.paved_gabbro_slab": "辉长岩铺路石å�°é˜¶", - "block.create.paved_gabbro_stairs": "辉长岩铺路石楼梯", - "block.create.paved_gabbro_wall": "辉长岩铺路石墙", - "block.create.paved_granite": "花岗岩铺路石", - "block.create.paved_granite_slab": "花岗岩铺路石å�°é˜¶", - "block.create.paved_granite_stairs": "花岗岩铺路石楼梯", - "block.create.paved_granite_wall": "花岗岩铺路石墙", - "block.create.paved_limestone": "石ç�°å²©é“ºè·¯çŸ³", - "block.create.paved_limestone_slab": "石ç�°å²©é“ºè·¯çŸ³å�°é˜¶", - "block.create.paved_limestone_stairs": "石ç�°å²©é“ºè·¯çŸ³æ¥¼æ¢¯", - "block.create.paved_limestone_wall": "石ç�°å²©é“ºè·¯çŸ³å¢™", - "block.create.paved_scoria": "熔渣铺路石", - "block.create.paved_scoria_slab": "熔渣铺路石å�°é˜¶", - "block.create.paved_scoria_stairs": "熔渣铺路石楼梯", - "block.create.paved_scoria_wall": "熔渣铺路石墙", - "block.create.paved_weathered_limestone": "风化石ç�°å²©é“ºè·¯çŸ³", - "block.create.paved_weathered_limestone_slab": "风化石ç�°å²©é“ºè·¯çŸ³å�°é˜¶", - "block.create.paved_weathered_limestone_stairs": "风化石ç�°å²©é“ºè·¯çŸ³æ¥¼æ¢¯", - "block.create.paved_weathered_limestone_wall": "风化石ç�°å²©é“ºè·¯çŸ³å¢™", - "block.create.pink_seat": "UNLOCALIZED: Pink Seat", - "block.create.piston_extension_pole": "活塞æ�†", - "block.create.polished_dark_scoria": "磨制深色熔渣", - "block.create.polished_dark_scoria_slab": "磨制深色熔渣å�°é˜¶", - "block.create.polished_dark_scoria_stairs": "磨制深色熔渣楼梯", - "block.create.polished_dark_scoria_wall": "磨制深色熔渣墙", - "block.create.polished_dolomite": "磨制白云岩", - "block.create.polished_dolomite_slab": "磨制白云岩å�°é˜¶", - "block.create.polished_dolomite_stairs": "磨制白云岩楼梯", - "block.create.polished_dolomite_wall": "磨制白云岩墙", - "block.create.polished_gabbro": "磨制辉长岩", - "block.create.polished_gabbro_slab": "磨制辉长岩å�°é˜¶", - "block.create.polished_gabbro_stairs": "磨制辉长岩楼梯", - "block.create.polished_gabbro_wall": "磨制辉长岩墙", - "block.create.polished_limestone": "磨制石ç�°å²©", - "block.create.polished_limestone_slab": "磨制石ç�°å²©å�°é˜¶", - "block.create.polished_limestone_stairs": "磨制石ç�°å²©æ¥¼æ¢¯", - "block.create.polished_limestone_wall": "磨制石ç�°å²©å¢™", - "block.create.polished_scoria": "磨制熔渣", - "block.create.polished_scoria_slab": "磨制熔渣å�°é˜¶", - "block.create.polished_scoria_stairs": "磨制熔渣楼梯", - "block.create.polished_scoria_wall": "磨制熔渣墙", - "block.create.polished_weathered_limestone": "磨制风化石ç�°å²©", - "block.create.polished_weathered_limestone_slab": "磨制风化石ç�°å²©å�°é˜¶", - "block.create.polished_weathered_limestone_stairs": "磨制风化石ç�°å²©æ¥¼æ¢¯", - "block.create.polished_weathered_limestone_wall": "磨制风化石ç�°å²©å¢™", - "block.create.portable_storage_interface": "移动å¼�存储接å�£", - "block.create.powered_latch": "é”�存器", - "block.create.powered_toggle_latch": "T触å�‘器", - "block.create.pulley_magnet": "ä¼ é€�带ç£�é“�", - "block.create.pulse_repeater": "脉冲中继器", - "block.create.purple_seat": "UNLOCALIZED: Purple Seat", - "block.create.radial_chassis": "旋转底盘", - "block.create.red_seat": "UNLOCALIZED: Red Seat", - "block.create.redstone_contact": "ä¿¡å�·æ£€æµ‹å™¨", - "block.create.redstone_link": "æ— é™�红石信å�·ç»ˆç«¯", -======= "block.create.orange_valve_handle": "UNLOCALIZED: Orange Valve Handle", "block.create.ornate_iron_window": "华丽铁窗户", "block.create.ornate_iron_window_pane": "华丽铁窗户板", @@ -505,424 +322,345 @@ "block.create.red_valve_handle": "UNLOCALIZED: Red Valve Handle", "block.create.redstone_contact": "信号检测器", "block.create.redstone_link": "无限红石信号终端", ->>>>>>> mc1.15/dev "block.create.refined_radiance_casing": "UNLOCALIZED: Radiant Casing", "block.create.reinforced_rail": "UNLOCALIZED: Reinforced Rail", - "block.create.rope": "绳索", - "block.create.rope_pulley": "绳索滑轮", - "block.create.rotation_speed_controller": "转速控制器", - "block.create.schematic_table": "è“�图桌", - "block.create.schematicannon": "è“�图加农炮", - "block.create.scoria": "熔渣", - "block.create.scoria_bricks": "熔渣砖", - "block.create.scoria_bricks_slab": "熔渣砖å�°é˜¶", - "block.create.scoria_bricks_stairs": "熔渣砖楼梯", - "block.create.scoria_bricks_wall": "熔渣砖墙", - "block.create.scoria_cobblestone": "熔渣圆石", - "block.create.scoria_cobblestone_slab": "熔渣圆石å�°é˜¶", - "block.create.scoria_cobblestone_stairs": "熔渣圆石楼梯", - "block.create.scoria_cobblestone_wall": "熔渣圆石墙", - "block.create.scoria_pillar": "竖纹熔渣", - "block.create.secondary_linear_chassis": "机壳底盘2å�·", - "block.create.sequenced_gearshift": "å�¯ç¼–程齿轮箱", + "block.create.rope": "绳索", + "block.create.rope_pulley": "绳索滑轮", + "block.create.rotation_speed_controller": "转速控制器", + "block.create.schematic_table": "蓝图桌", + "block.create.schematicannon": "蓝图加农炮", + "block.create.scoria": "熔渣", + "block.create.scoria_bricks": "熔渣砖", + "block.create.scoria_bricks_slab": "熔渣砖台阶", + "block.create.scoria_bricks_stairs": "熔渣砖楼梯", + "block.create.scoria_bricks_wall": "熔渣砖墙", + "block.create.scoria_cobblestone": "熔渣圆石", + "block.create.scoria_cobblestone_slab": "熔渣圆石台阶", + "block.create.scoria_cobblestone_stairs": "熔渣圆石楼梯", + "block.create.scoria_cobblestone_wall": "熔渣圆石墙", + "block.create.scoria_pillar": "竖纹熔渣", + "block.create.secondary_linear_chassis": "机壳底盘2号", + "block.create.sequenced_gearshift": "可编程齿轮箱", "block.create.shadow_steel_casing": "UNLOCALIZED: Shadow Casing", - "block.create.shaft": "传动æ�†", - "block.create.speedometer": "速度表", + "block.create.shaft": "传动杆", + "block.create.speedometer": "速度表", "block.create.spout": "UNLOCALIZED: Spout", - "block.create.spruce_window": "云æ�‰çª—户", - "block.create.spruce_window_pane": "云æ�‰çª—户æ�¿", - "block.create.sticky_mechanical_piston": "粘性动力活塞", - "block.create.stockpile_switch": "存储检测器", - "block.create.stressometer": "应力表", - "block.create.tiled_glass": "å��字玻璃窗", - "block.create.tiled_glass_pane": "å��字玻璃窗æ�¿", - "block.create.turntable": "转盘", - "block.create.vertical_framed_glass": "竖直边框玻璃", - "block.create.vertical_framed_glass_pane": "竖直边框玻璃æ�¿", - "block.create.water_wheel": "水车", - "block.create.weathered_limestone": "风化石ç�°å²©", - "block.create.weathered_limestone_bricks": "风化石ç�°å²©ç –", - "block.create.weathered_limestone_bricks_slab": "风化石ç�°å²©ç –å�°é˜¶", - "block.create.weathered_limestone_bricks_stairs": "风化石ç�°å²©ç –楼梯", - "block.create.weathered_limestone_bricks_wall": "风化石ç�°å²©ç –墙", - "block.create.weathered_limestone_cobblestone": "风化石ç�°å²©åœ†çŸ³", - "block.create.weathered_limestone_cobblestone_slab": "风化石ç�°å²©åœ†çŸ³å�°é˜¶", - "block.create.weathered_limestone_cobblestone_stairs": "风化石ç�°å²©åœ†çŸ³æ¥¼æ¢¯", - "block.create.weathered_limestone_cobblestone_wall": "风化石ç�°å²©åœ†çŸ³å¢™", - "block.create.weathered_limestone_pillar": "竖纹风化石ç�°å²©", + "block.create.spruce_window": "云杉窗户", + "block.create.spruce_window_pane": "云杉窗户板", + "block.create.sticky_mechanical_piston": "粘性动力活塞", + "block.create.stockpile_switch": "存储检测器", + "block.create.stressometer": "应力表", + "block.create.tiled_glass": "十字玻璃窗", + "block.create.tiled_glass_pane": "十字玻璃窗板", + "block.create.turntable": "转盘", + "block.create.vertical_framed_glass": "竖直边框玻璃", + "block.create.vertical_framed_glass_pane": "竖直边框玻璃板", + "block.create.water_wheel": "水车", + "block.create.weathered_limestone": "风化石灰岩", + "block.create.weathered_limestone_bricks": "风化石灰岩砖", + "block.create.weathered_limestone_bricks_slab": "风化石灰岩砖台阶", + "block.create.weathered_limestone_bricks_stairs": "风化石灰岩砖楼梯", + "block.create.weathered_limestone_bricks_wall": "风化石灰岩砖墙", + "block.create.weathered_limestone_cobblestone": "风化石灰岩圆石", + "block.create.weathered_limestone_cobblestone_slab": "风化石灰岩圆石台阶", + "block.create.weathered_limestone_cobblestone_stairs": "风化石灰岩圆石楼梯", + "block.create.weathered_limestone_cobblestone_wall": "风化石灰岩圆石墙", + "block.create.weathered_limestone_pillar": "竖纹风化石灰岩", "block.create.white_seat": "UNLOCALIZED: White Seat", "block.create.white_valve_handle": "UNLOCALIZED: White Valve Handle", "block.create.yellow_seat": "UNLOCALIZED: Yellow Seat", -<<<<<<< HEAD - "block.create.zinc_block": "锌å�—", - "block.create.zinc_ore": "锌矿石", -======= "block.create.yellow_valve_handle": "UNLOCALIZED: Yellow Valve Handle", "block.create.zinc_block": "锌块", "block.create.zinc_ore": "锌矿石", ->>>>>>> mc1.15/dev - "entity.create.contraption": "结构", + "entity.create.contraption": "结构", "entity.create.seat": "UNLOCALIZED: Seat", - "entity.create.stationary_contraption": "固定结构", - "entity.create.super_glue": "强力胶", + "entity.create.stationary_contraption": "固定结构", + "entity.create.super_glue": "强力胶", - "item.create.andesite_alloy": "安山å�ˆé‡‘", - "item.create.attribute_filter": "属性过滤器", - "item.create.belt_connector": "ä¼ é€�带", - "item.create.brass_hand": "黄铜手部零件", - "item.create.brass_ingot": "黄铜锭", - "item.create.brass_nugget": "黄铜粒", - "item.create.brass_sheet": "黄铜æ�¿", - "item.create.chromatic_compound": "异彩化å�ˆç‰©", - "item.create.copper_ingot": "铜锭", - "item.create.copper_nugget": "铜粒", - "item.create.copper_sheet": "é“œæ�¿", - "item.create.crafter_slot_cover": "制造器盖æ�¿", - "item.create.crushed_brass": "粉碎黄铜", - "item.create.crushed_copper_ore": "粉碎铜矿石", - "item.create.crushed_gold_ore": "粉碎金矿石", - "item.create.crushed_iron_ore": "粉碎é“�矿石", - "item.create.crushed_zinc_ore": "粉碎锌矿石", - "item.create.deforester": "æ ‘æž—æ¯�ç�­è€…", - "item.create.dough": "é�¢å›¢", - "item.create.electron_tube": "电å­�管", + "item.create.andesite_alloy": "安山合金", + "item.create.attribute_filter": "属性过滤器", + "item.create.belt_connector": "传送带", + "item.create.brass_hand": "黄铜手部零件", + "item.create.brass_ingot": "黄铜锭", + "item.create.brass_nugget": "黄铜粒", + "item.create.brass_sheet": "黄铜板", + "item.create.chromatic_compound": "异彩化合物", + "item.create.copper_ingot": "铜锭", + "item.create.copper_nugget": "铜粒", + "item.create.copper_sheet": "铜板", + "item.create.crafter_slot_cover": "制造器盖板", + "item.create.crushed_brass": "粉碎黄铜", + "item.create.crushed_copper_ore": "粉碎铜矿石", + "item.create.crushed_gold_ore": "粉碎金矿石", + "item.create.crushed_iron_ore": "粉碎铁矿石", + "item.create.crushed_zinc_ore": "粉碎锌矿石", + "item.create.deforester": "树林毁灭者", + "item.create.dough": "面团", + "item.create.electron_tube": "电子管", "item.create.empty_blaze_burner": "UNLOCALIZED: Empty Blaze Burner", - "item.create.empty_schematic": "空白è“�图", - "item.create.extendo_grip": "伸缩机械手", - "item.create.filter": "过滤器", + "item.create.empty_schematic": "空白蓝图", + "item.create.extendo_grip": "伸缩机械手", + "item.create.filter": "过滤器", "item.create.fuel_pellet": "UNLOCALIZED: Fuel Pellet", - "item.create.furnace_minecart_contraption": "装é…�过的动力矿车", - "item.create.goggles": "工程师护目镜", - "item.create.golden_sheet": "金æ�¿", - "item.create.handheld_blockzapper": "手æŒ�å¼�æ–¹å�—放置器", - "item.create.handheld_worldshaper": "手æŒ�å¼�环境塑形器", - "item.create.integrated_circuit": "集æˆ�电路æ�¿", - "item.create.iron_sheet": "é“�æ�¿", - "item.create.lapis_sheet": "é�’金石æ�¿", - "item.create.minecart_contraption": "装é…�过的矿车", + "item.create.furnace_minecart_contraption": "装配过的动力矿车", + "item.create.goggles": "工程师护目镜", + "item.create.golden_sheet": "金板", + "item.create.handheld_blockzapper": "手持式方块放置器", + "item.create.handheld_worldshaper": "手持式环境塑形器", + "item.create.integrated_circuit": "集成电路板", + "item.create.iron_sheet": "铁板", + "item.create.lapis_sheet": "青金石板", + "item.create.minecart_contraption": "装配过的矿车", "item.create.minecart_coupling": "UNLOCALIZED: Minecart Coupling", - "item.create.polished_rose_quartz": "磨制玫瑰石英", - "item.create.powdered_obsidian": "黑曜石粉末", - "item.create.propeller": "扇å�¶", - "item.create.red_sand_paper": "红砂纸", - "item.create.refined_radiance": "光辉石", - "item.create.rose_quartz": "玫瑰石英", - "item.create.sand_paper": "砂纸", - "item.create.schematic": "è“�图", - "item.create.schematic_and_quill": "è“�图与笔", - "item.create.shadow_steel": "暗影金属", - "item.create.super_glue": "强力胶", - "item.create.tree_fertilizer": "树木肥料", - "item.create.vertical_gearbox": "ç«–ç›´å��字齿轮箱", - "item.create.wand_of_symmetry": "对称法æ�–", - "item.create.wheat_flour": "å°�麦粉", - "item.create.whisk": "æ�…拌器", - "item.create.wrench": "扳手", - "item.create.zinc_ingot": "锌锭", - "item.create.zinc_nugget": "锌粒", + "item.create.polished_rose_quartz": "磨制玫瑰石英", + "item.create.powdered_obsidian": "黑曜石粉末", + "item.create.propeller": "扇叶", + "item.create.red_sand_paper": "红砂纸", + "item.create.refined_radiance": "光辉石", + "item.create.rose_quartz": "玫瑰石英", + "item.create.sand_paper": "砂纸", + "item.create.schematic": "蓝图", + "item.create.schematic_and_quill": "蓝图与笔", + "item.create.shadow_steel": "暗影金属", + "item.create.super_glue": "强力胶", + "item.create.tree_fertilizer": "树木肥料", + "item.create.vertical_gearbox": "竖直十字齿轮箱", + "item.create.wand_of_symmetry": "对称法杖", + "item.create.wheat_flour": "小麦粉", + "item.create.whisk": "搅拌器", + "item.create.wrench": "扳手", + "item.create.zinc_ingot": "锌锭", + "item.create.zinc_nugget": "锌粒", "_": "->------------------------] Advancements [------------------------<-", - "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.speedometer": "精密的速度控制", - "advancement.create.speedometer.desc": "放置一个速度表，并且带上工程师护目镜æ�¥è¯»å�–速度数æ�®", - "advancement.create.stressometer": "精密的应力控制", - "advancement.create.stressometer.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.mechanical_drill": "å�šå¦‚ç£�石，势如破竹", - "advancement.create.mechanical_drill.desc": "放置一个动力钻头并且为其供能", + "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.speedometer": "精密的速度控制", + "advancement.create.speedometer.desc": "放置一个速度表，并且带上工程师护目镜来读取速度数据", + "advancement.create.stressometer": "精密的应力控制", + "advancement.create.stressometer.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.mechanical_drill": "坚如磐石，势如破竹", + "advancement.create.mechanical_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.mechanical_saw": "一刀两断", - "advancement.create.mechanical_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": "安山岩专家", - "advancement.create.expert_lane_1.desc": "工作进行中", - "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.press.desc": "使用辊压机来辊压一些板子", + "advancement.create.polished_rose_quartz": "粉丝钻石", + "advancement.create.polished_rose_quartz.desc": "用砂纸将玫瑰石英打磨至透明", + "advancement.create.electron_tube": "哔~~哔~~", + "advancement.create.electron_tube.desc": "制作一个可用于合成高级机器的电子管", + "advancement.create.mechanical_saw": "一刀两断", + "advancement.create.mechanical_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": "安山岩专家", + "advancement.create.expert_lane_1.desc": "工作进行中", + "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.mechanical_arm": "UNLOCALIZED: Mechanical Grab'n'Drop", "advancement.create.mechanical_arm.desc": "UNLOCALIZED: Craft a Mechanical Arm, select in- and outputs, place it down and give it power; then watch it do all the work for you.", "advancement.create.musical_arm": "UNLOCALIZED: Play me my Theme Tune!", "advancement.create.musical_arm.desc": "UNLOCALIZED: Watch a Mechanical Arm operate your Jukebox.", - "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.wand_of_symmetry": "简å�•çš„é•œé�¢å‡ ä½•å­¦", - "advancement.create.wand_of_symmetry.desc": "制作一个对称法æ�–", - "advancement.create.deforester": "超时空ç �ä¼�", - "advancement.create.deforester.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.wand_of_symmetry": "简单的镜面几何学", + "advancement.create.wand_of_symmetry.desc": "制作一个对称法杖", + "advancement.create.deforester": "超时空砍伐", + "advancement.create.deforester.desc": "制作一个森林毁灭者， 然后跟你后院的树林说再见吧", "advancement.create.extendo_grip": "biu biu biu!", - "advancement.create.extendo_grip.desc": "拿到一个伸缩机械手", - "advancement.create.dual_extendo_grip": "biu——biu——biu——", - "advancement.create.dual_extendo_grip.desc": "å�ŒæŒ�伸缩机械手加长è·�离", - "advancement.create.eob": "Beta版结æ�Ÿ", - "advancement.create.eob.desc": "期待未æ�¥ä¼šæœ‰æ›´å¤šçš„内容. <3", + "advancement.create.extendo_grip.desc": "拿到一个伸缩机械手", + "advancement.create.dual_extendo_grip": "biu——biu——biu——", + "advancement.create.dual_extendo_grip.desc": "双持伸缩机械手加长距离", + "advancement.create.eob": "Beta版结束", + "advancement.create.eob.desc": "期待未来会有更多的内容. <3", "_": "->------------------------] UI & Messages [------------------------<-", - "itemGroup.create.base": "机械动力", - "itemGroup.create.palettes": "机械动力建筑方å�—", + "itemGroup.create.base": "机械动力", + "itemGroup.create.palettes": "机械动力建筑方块", - "death.attack.create.crush": "%1$s 被压æ‰�了", - "death.attack.create.fan_fire": "%1$s 试图接å�—热风的洗礼", - "death.attack.create.fan_lava": "%1$s 在接å�—热风的洗礼中欲ç�«ç„šèº«", - "death.attack.create.mechanical_drill": "%1$s 被钻头钻的å��掉了", - "death.attack.create.mechanical_saw": "%1$s 被圆锯切æˆ�了两截", - "death.attack.create.cuckoo_clock_explosion": "%1$s 被布谷鸟钟炸得粉身碎骨", + "death.attack.create.crush": "%1$s 被压扁了", + "death.attack.create.fan_fire": "%1$s 试图接受热风的洗礼", + "death.attack.create.fan_lava": "%1$s 在接受热风的洗礼中欲火焚身", + "death.attack.create.mechanical_drill": "%1$s 被钻头钻的坏掉了", + "death.attack.create.mechanical_saw": "%1$s 被圆锯切成了两截", + "death.attack.create.cuckoo_clock_explosion": "%1$s 被布谷鸟钟炸得粉身碎骨", - "create.block.deployer.damage_source_name": "二五仔机械臂", + "create.block.deployer.damage_source_name": "二五仔机械臂", "create.block.cart_assembler.invalid": "UNLOCALIZED: Place your Cart Assembler on a rail block", - "create.recipe.crushing": "粉碎", - "create.recipe.milling": "研磨", - "create.recipe.splashing": "洗涤", - "create.recipe.splashing.fan": "在鼓风机å‰�方倒水", + "create.recipe.crushing": "粉碎", + "create.recipe.milling": "研磨", + "create.recipe.splashing": "洗涤", + "create.recipe.splashing.fan": "在鼓风机前方倒水", "create.recipe.smoking_via_fan": "UNLOCALIZED: Bulk Smoking", "create.recipe.smoking_via_fan.fan": "UNLOCALIZED: Fan behind Fire", "create.recipe.blasting_via_fan": "UNLOCALIZED: Bulk Smelting", "create.recipe.blasting_via_fan.fan": "UNLOCALIZED: Fan behind Lava", - "create.recipe.pressing": "金属压片", - "create.recipe.mixing": "æ··å�ˆæ�…æ‹Œ", - "create.recipe.packing": "压å�—å¡‘å½¢", - "create.recipe.mechanical_sawing": "木æ��切割", - "create.recipe.mechanical_crafting": "自动å�ˆæˆ�", - "create.recipe.block_cutting": "æ–¹å�—切割", + "create.recipe.pressing": "金属压片", + "create.recipe.mixing": "混合搅拌", + "create.recipe.packing": "压块塑形", + "create.recipe.mechanical_sawing": "木材切割", + "create.recipe.mechanical_crafting": "自动合成", + "create.recipe.block_cutting": "方块切割", "create.recipe.blockzapper_upgrade": "UNLOCALIZED: Handheld Blockzapper", - "create.recipe.sandpaper_polishing": "砂纸抛光", - "create.recipe.mystery_conversion": "化å�ˆç‰©å�˜å¼‚", - "create.recipe.processing.catalyst": "催化剂", - "create.recipe.processing.chance": "%1$s%% 概率", - "create.recipe.processing.chanceToReturn": "%1$s%% 概率返还", + "create.recipe.sandpaper_polishing": "砂纸抛光", + "create.recipe.mystery_conversion": "化合物变异", + "create.recipe.processing.catalyst": "催化剂", + "create.recipe.processing.chance": "%1$s%% 概率", + "create.recipe.processing.chanceToReturn": "%1$s%% 概率返还", - "create.generic.range": "范围", - "create.generic.radius": "å�Šå¾„", - "create.generic.width": "宽度", - "create.generic.height": "高度", - "create.generic.length": "长度", - "create.generic.speed": "速度", - "create.generic.delay": "延时", + "create.generic.range": "范围", + "create.generic.radius": "半径", + "create.generic.width": "宽度", + "create.generic.height": "高度", + "create.generic.length": "长度", + "create.generic.speed": "速度", + "create.generic.delay": "延时", "create.generic.unit.ticks": "Ticks", - "create.generic.unit.seconds": "秒", - "create.generic.unit.minutes": "分钟", + "create.generic.unit.seconds": "秒", + "create.generic.unit.minutes": "分钟", "create.generic.unit.rpm": "RPM", "create.generic.unit.stress": "su", - "create.generic.unit.degrees": "°", + "create.generic.unit.degrees": "°", - "create.action.scroll": "滚轮", - "create.action.confirm": "确认", - "create.action.abort": "退出", - "create.action.saveToFile": "ä¿�å­˜", - "create.action.discard": "丢弃", + "create.action.scroll": "滚轮", + "create.action.confirm": "确认", + "create.action.abort": "退出", + "create.action.saveToFile": "保存", + "create.action.discard": "丢弃", - "create.keyinfo.toolmenu": "工具è�œå�•", - "create.keyinfo.scrollup": "（游æˆ�中）å�‘上鼠标滚轮", - "create.keyinfo.scrolldown": "（游æˆ�中）å�‘下鼠标滚轮", + "create.keyinfo.toolmenu": "工具菜单", + "create.keyinfo.scrollup": "（游戏中）向上鼠标滚轮", + "create.keyinfo.scrolldown": "（游戏中）向下鼠标滚轮", - "create.gui.scrollInput.defaultTitle": "选择一个选项:", - "create.gui.scrollInput.scrollToModify": "滚动修改", - "create.gui.scrollInput.scrollToAdjustAmount": "滚动修改数é‡�", - "create.gui.scrollInput.scrollToSelect": "滚动选择", - "create.gui.scrollInput.shiftScrollsFaster": "按ä½�Shift滚动更快", - "create.gui.toolmenu.focusKey": "按ä½� [%1$s] 鼠标滚轮选择", - "create.gui.toolmenu.cycle": "[SCROLL] 循环", - "create.gui.symmetryWand.mirrorType": "é•œå­�类型", - "create.gui.symmetryWand.orientation": "æ–¹å�‘", + "create.gui.scrollInput.defaultTitle": "选择一个选项:", + "create.gui.scrollInput.scrollToModify": "滚动修改", + "create.gui.scrollInput.scrollToAdjustAmount": "滚动修改数量", + "create.gui.scrollInput.scrollToSelect": "滚动选择", + "create.gui.scrollInput.shiftScrollsFaster": "按住Shift滚动更快", + "create.gui.toolmenu.focusKey": "按住 [%1$s] 鼠标滚轮选择", + "create.gui.toolmenu.cycle": "[SCROLL] 循环", + "create.gui.symmetryWand.mirrorType": "镜子类型", + "create.gui.symmetryWand.orientation": "方向", - "create.symmetry.mirror.plane": "é•œåƒ�", - "create.symmetry.mirror.doublePlane": "矩形", - "create.symmetry.mirror.triplePlane": "八角", + "create.symmetry.mirror.plane": "镜像", + "create.symmetry.mirror.doublePlane": "矩形", + "create.symmetry.mirror.triplePlane": "八角", - "create.orientation.orthogonal": "åž‚ç›´", - "create.orientation.diagonal": "对角线", - "create.orientation.horizontal": "æ°´å¹³", - "create.orientation.alongZ": "以z轴对é½�", - "create.orientation.alongX": "以x轴对é½�", + "create.orientation.orthogonal": "垂直", + "create.orientation.diagonal": "对角线", + "create.orientation.horizontal": "水平", + "create.orientation.alongZ": "以z轴对齐", + "create.orientation.alongX": "以x轴对齐", - "create.gui.blockzapper.title": "手æŒ�å¼�æ–¹å�—放置机", - "create.gui.blockzapper.replaceMode": "替æ�¢æ¨¡å¼�", - "create.gui.blockzapper.searchDiagonal": "æ ¹æ�®å¯¹è§’线", - "create.gui.blockzapper.searchFuzzy": "忽视边界", - "create.gui.blockzapper.range": "扩散范围", - "create.gui.blockzapper.needsUpgradedAmplifier": "需è¦�å�‡çº§æ‰©æ•£å™¨", - "create.gui.blockzapper.patternSection": "模å¼�", - "create.gui.blockzapper.pattern.solid": "实心", - "create.gui.blockzapper.pattern.checkered": "棋盘", - "create.gui.blockzapper.pattern.inversecheckered": "å��转棋盘", + "create.gui.blockzapper.title": "手持式方块放置机", + "create.gui.blockzapper.replaceMode": "替换模式", + "create.gui.blockzapper.searchDiagonal": "根据对角线", + "create.gui.blockzapper.searchFuzzy": "忽视边界", + "create.gui.blockzapper.range": "扩散范围", + "create.gui.blockzapper.needsUpgradedAmplifier": "需要升级扩散器", + "create.gui.blockzapper.patternSection": "模式", + "create.gui.blockzapper.pattern.solid": "实心", + "create.gui.blockzapper.pattern.checkered": "棋盘", + "create.gui.blockzapper.pattern.inversecheckered": "反转棋盘", "create.gui.blockzapper.pattern.chance25": "25% ", "create.gui.blockzapper.pattern.chance50": "50% ", "create.gui.blockzapper.pattern.chance75": "75% ", - "create.gui.terrainzapper.title": "手æŒ�å¼�环境塑形器", - "create.gui.terrainzapper.placement": "放置模å¼�", - "create.gui.terrainzapper.placement.merged": "结å�ˆ", - "create.gui.terrainzapper.placement.attached": "ä¾�附", - "create.gui.terrainzapper.placement.inserted": "æ�’å…¥", - "create.gui.terrainzapper.brush": "塑形类型", - "create.gui.terrainzapper.brush.cuboid": "矩形体", - "create.gui.terrainzapper.brush.sphere": "ç�ƒä½“", - "create.gui.terrainzapper.brush.cylinder": "圆柱体", - "create.gui.terrainzapper.tool": "填充类型", - "create.gui.terrainzapper.tool.fill": "å¡«å……", - "create.gui.terrainzapper.tool.place": "å¤�写", - "create.gui.terrainzapper.tool.replace": "替æ�¢", - "create.gui.terrainzapper.tool.clear": "清除", - "create.gui.terrainzapper.tool.overlay": "覆盖", - "create.gui.terrainzapper.tool.flatten": "平整", + "create.gui.terrainzapper.title": "手持式环境塑形器", + "create.gui.terrainzapper.placement": "放置模式", + "create.gui.terrainzapper.placement.merged": "结合", + "create.gui.terrainzapper.placement.attached": "依附", + "create.gui.terrainzapper.placement.inserted": "插入", + "create.gui.terrainzapper.brush": "塑形类型", + "create.gui.terrainzapper.brush.cuboid": "矩形体", + "create.gui.terrainzapper.brush.sphere": "球体", + "create.gui.terrainzapper.brush.cylinder": "圆柱体", + "create.gui.terrainzapper.tool": "填充类型", + "create.gui.terrainzapper.tool.fill": "填充", + "create.gui.terrainzapper.tool.place": "复写", + "create.gui.terrainzapper.tool.replace": "替换", + "create.gui.terrainzapper.tool.clear": "清除", + "create.gui.terrainzapper.tool.overlay": "覆盖", + "create.gui.terrainzapper.tool.flatten": "平整", - "create.terrainzapper.shiftRightClickToSet": "Shift+é¼ æ ‡å�³é”® 以设置塑形类型", + "create.terrainzapper.shiftRightClickToSet": "Shift+鼠标右键 以设置塑形类型", - "create.blockzapper.usingBlock": "使用: %1$s", - "create.blockzapper.componentUpgrades": "组件å�‡çº§:", - "create.blockzapper.component.body": "机体", - "create.blockzapper.component.amplifier": "增大", - "create.blockzapper.component.accelerator": "加速", - "create.blockzapper.component.retriever": "寻回", - "create.blockzapper.component.scope": "范围", - "create.blockzapper.componentTier.none": "æ— ", + "create.blockzapper.usingBlock": "使用: %1$s", + "create.blockzapper.componentUpgrades": "组件升级:", + "create.blockzapper.component.body": "机体", + "create.blockzapper.component.amplifier": "增大", + "create.blockzapper.component.accelerator": "加速", + "create.blockzapper.component.retriever": "寻回", + "create.blockzapper.component.scope": "范围", + "create.blockzapper.componentTier.none": "无", "create.blockzapper.componentTier.brass": "UNLOCALIZED: Brass", "create.blockzapper.componentTier.chromatic": "UNLOCALIZED: Chromatic", - "create.blockzapper.leftClickToSet": "左键点击方å�—以设定方å�—", - "create.blockzapper.empty": "æ–¹å�—ä¸�足ï¼�", + "create.blockzapper.leftClickToSet": "左键点击方块以设定方块", + "create.blockzapper.empty": "方块不足！", - "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.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.filter": "过滤器", "create.logistics.recipe_filter": "UNLOCALIZED: Recipe Filter", -<<<<<<< HEAD - "create.logistics.firstFrequency": "频é�“. #1", - "create.logistics.secondFrequency": "频é�“. #2", - - "create.gui.goggles.generator_stats": "产能器状æ€�:", - "create.gui.goggles.kinetic_stats": "动能状æ€�:", - "create.gui.goggles.at_current_speed": "当å‰�速度应力值", - "create.gui.goggles.base_value": "应力基础值", - "create.gui.gauge.info_header": "仪表信æ�¯:", - "create.gui.speedometer.title": "旋转速度", - "create.gui.stressometer.title": "网络应力", - "create.gui.stressometer.capacity": "剩余应力", - "create.gui.stressometer.overstressed": "超载", - "create.gui.stressometer.no_rotation": "无旋转", - "create.gui.contraptions.not_fast_enough": "显然 %1$s 没有足够的转速.", - "create.gui.contraptions.network_overstressed": "显然装置过载，å‡�速高应力消耗的装置或者添加更多动力", - "create.gui.adjustable_crate.title": "æ�¿æ�¡ç®±", - "create.gui.adjustable_crate.storageSpace": "储存空间", - "create.gui.stockpile_switch.title": "储存开关", - "create.gui.stockpile_switch.lowerLimit": "阈值下é™�", - "create.gui.stockpile_switch.upperLimit": "阈值上é™�", - "create.gui.stockpile_switch.startAt": "å�¯åŠ¨ä¿¡å�·", - "create.gui.stockpile_switch.startAbove": "给予红石信å�·å½“容é‡�大于", - "create.gui.stockpile_switch.stopAt": "å�œæ­¢ä¿¡å�·", - "create.gui.stockpile_switch.stopBelow": "å�œæ­¢çº¢çŸ³ä¿¡å�·å½“容é‡�å°�于", - "create.gui.sequenced_gearshift.title": "å�¯ç¼–程齿轮箱", - "create.gui.sequenced_gearshift.instruction": "指令", - "create.gui.sequenced_gearshift.instruction.turn_angle": "旋转", - "create.gui.sequenced_gearshift.instruction.turn_angle.angle": "角度", - "create.gui.sequenced_gearshift.instruction.turn_distance": "驱动活塞", - "create.gui.sequenced_gearshift.instruction.turn_distance.distance": "è·�离", - "create.gui.sequenced_gearshift.instruction.wait": "等待", - "create.gui.sequenced_gearshift.instruction.wait.duration": "é—´éš”", - "create.gui.sequenced_gearshift.instruction.end": "å�œæ­¢", - "create.gui.sequenced_gearshift.speed": "速度, 速度方å�‘", - "create.gui.sequenced_gearshift.speed.forward": "一å€�速, æ­£å�‘", - "create.gui.sequenced_gearshift.speed.forward_fast": "两å€�速, æ­£å�‘", - "create.gui.sequenced_gearshift.speed.back": "一å€�速, å��å�‘", - "create.gui.sequenced_gearshift.speed.back_fast": "两å€�速, å��å�‘", - - "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.saved": "å�¦å­˜ä¸º %1$s", - - "create.schematic.invalid": "[!] 无效的项目", - "create.schematic.position": "ä½�ç½®", - "create.schematic.rotation": "旋转", - "create.schematic.rotation.none": "æ— ", - "create.schematic.rotation.cw90": "顺时针90", - "create.schematic.rotation.cw180": "顺时针180", - "create.schematic.rotation.cw270": "顺时针270", - "create.schematic.mirror": "é•œåƒ�", - "create.schematic.mirror.none": "æ— ", - "create.schematic.mirror.frontBack": "å‰�å�Ž", - "create.schematic.mirror.leftRight": "å·¦å�³", - "create.schematic.tool.deploy": "部署", - "create.schematic.tool.move": "移动 XZ", - "create.schematic.tool.movey": "移动 Y", - "create.schematic.tool.rotate": "旋转", - "create.schematic.tool.print": "打å�°", - "create.schematic.tool.flip": "翻转", - "create.schematic.tool.deploy.description.0": "将结构移到æŸ�个ä½�ç½®.", - "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.logistics.firstFrequency": "频道. #1", "create.logistics.secondFrequency": "频道. #2", @@ -992,113 +730,25 @@ "create.schematic.tool.deploy.description.3": "按住Ctrl鼠标滚动更改距离.", "create.schematic.tool.move.description.0": "水平移动蓝图", "create.schematic.tool.move.description.1": "选定蓝图,然后按住Ctrl鼠标滚动移动.", ->>>>>>> mc1.15/dev "create.schematic.tool.move.description.2": "", "create.schematic.tool.move.description.3": "", - "create.schematic.tool.movey.description.0": "垂直移动è“�图", - "create.schematic.tool.movey.description.1": "按ä½�Ctrl鼠标滚动上下移动", + "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.1": "按ä½�Ctrl鼠标滚动旋转90度", + "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": "", - "create.schematic.tool.print.description.0": "ç«‹å�³å°†ç»“构放置在世界上", - "create.schematic.tool.print.description.1": "å�³é”®å�•æœºç¡®è®¤å½“å‰�ä½�ç½®.", - "create.schematic.tool.print.description.2": "该工具仅适用于创造模å¼�.", + "create.schematic.tool.print.description.0": "立即将结构放置在世界上", + "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": "", -<<<<<<< HEAD - "create.schematics.synchronizing": "正在å�Œæ­¥...", - "create.schematics.uploadTooLarge": "ä½ çš„è“�图太大", - "create.schematics.maxAllowedSize": "å…�许的最大è“�图文件大å°�为:", - - "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.settingsTitle": "放置设置", - "create.gui.schematicannon.listPrinter": "物å“�清å�•æ‰“å�°æœº", - "create.gui.schematicannon.gunpowderLevel": "ç�«è�¯ %1$s%%", - "create.gui.schematicannon.shotsRemaining": "å�‘射进度: %1$s", - "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.skipMissing": "绕过缺少的方å�—", - "create.gui.schematicannon.option.skipTileEntities": "ä¿�护存储方å�—", - "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.replaceWithEmpty.description": "è“�图加农炮将清ç�†å’Œæ›¿æ�¢å·¥ä½œåŒºåŸŸå†…所有原本的方å�—.", - - "create.schematicannon.status.idle": "闲置", - "create.schematicannon.status.ready": "准备", - "create.schematicannon.status.running": "è¿�è¡Œ", - "create.schematicannon.status.finished": "完æˆ�", - "create.schematicannon.status.paused": "已暂å�œ", - "create.schematicannon.status.stopped": "å�œæ­¢", - "create.schematicannon.status.noGunpowder": "ç�«è�¯æ¶ˆè€—完毕", - "create.schematicannon.status.targetNotLoaded": "æ–¹å�—未加载", - "create.schematicannon.status.targetOutsideRange": "定ä½�目标太远", - "create.schematicannon.status.searching": "æ�œç´¢", - "create.schematicannon.status.skipping": "跳过", - "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.filter.blacklist": "黑å��å�•", - "create.gui.filter.blacklist.description": "å�ªé€šè¿‡ä¸�在黑å��å�•ä¸­çš„物å“�，如果黑å��å�•ä¸ºç©ºï¼Œæ‰€æœ‰ç‰©å“�都å�¯ä»¥é€šè¿‡", - "create.gui.filter.whitelist": "白å��å�•", - "create.gui.filter.whitelist.description": "å�ªé€šè¿‡åœ¨ç™½å��å�•ä¸­çš„物å“�，如果白å��å�•ä¸ºç©ºï¼Œæ‰€æœ‰ç‰©å“�都无法通过", - "create.gui.filter.respect_data": "匹é…�物å“�属性", - "create.gui.filter.respect_data.description": "å�ªæœ‰ç‰©å“�çš„è€�ä¹…ã€�附魔等其他属性相å�Œæ—¶æ‰�å�¯ä»¥åŒ¹é…�", - "create.gui.filter.ignore_data": "忽视物å“�属性", - "create.gui.filter.ignore_data.description": "匹é…�时忽视物å“�çš„è€�ä¹…ã€�附魔等其他属性", - - "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": "严é‡�å�—æ�Ÿ", - "create.item_attributes.not_stackable": "无法堆å� ", - "create.item_attributes.equipable": "å�¯è£…备", - "create.item_attributes.furnace_fuel": "是燃料", - "create.item_attributes.in_tag": "标签是%1$s", - "create.item_attributes.in_item_group": "属于 %1$s", - "create.item_attributes.added_by": "ç”±%1$s添加", - - "create.gui.attribute_filter.no_selected_attributes": "没有标记任何属性", - "create.gui.attribute_filter.selected_attributes": "已选择的属性:", - "create.gui.attribute_filter.whitelist_disjunctive": "ä»»æ„�匹é…�白å��å�• (任何)", - "create.gui.attribute_filter.whitelist_disjunctive.description": "å�ªè¦�有其中一项属性符å�ˆï¼Œå°±å�¯ä»¥é€šè¿‡", - "create.gui.attribute_filter.whitelist_conjunctive": "全匹é…�白å��å�• (所有)", - "create.gui.attribute_filter.whitelist_conjunctive.description": "å�ªæœ‰æ‰€æœ‰å±žæ€§éƒ½åŒ¹é…�æ‰�å�¯ä»¥é€šè¿‡", - "create.gui.attribute_filter.blacklist": "黑å��å�•", - "create.gui.attribute_filter.blacklist.description": "å�ªè¦�没有上述属性，就å�¯ä»¥é€šè¿‡", - "create.gui.attribute_filter.add_reference_item": "添加å�‚考物å“�", - - "create.tooltip.holdKey": "按ä½� [%1$s]", - "create.tooltip.holdKeyOrKey": "按ä½� [%1$s] 或 [%2$s]", -======= "create.schematics.synchronizing": "正在同步...", "create.schematics.uploadTooLarge": "你的蓝图太大", "create.schematics.maxAllowedSize": "允许的最大蓝图文件大小为:", @@ -1208,25 +858,24 @@ "create.tooltip.holdKey": "按住 [%1$s]", "create.tooltip.holdKeyOrKey": "按住 [%1$s] 或 [%2$s]", ->>>>>>> mc1.15/dev "create.tooltip.keyShift": "Shift", "create.tooltip.keyCtrl": "Ctrl", - "create.tooltip.speedRequirement": "需求速度: %1$s", - "create.tooltip.speedRequirement.none": "æ— ", - "create.tooltip.speedRequirement.medium": "适当的", - "create.tooltip.speedRequirement.high": "飞快的", - "create.tooltip.stressImpact": "应力消耗: %1$s", - "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": "(作为产能器)", - "create.tooltip.generationSpeed": "产生 %1$s %2$s", - "create.tooltip.analogStrength": "调节强度: %1$s/15", + "create.tooltip.speedRequirement": "需求速度: %1$s", + "create.tooltip.speedRequirement.none": "无", + "create.tooltip.speedRequirement.medium": "适当的", + "create.tooltip.speedRequirement.high": "飞快的", + "create.tooltip.stressImpact": "应力消耗: %1$s", + "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": "(作为产能器)", + "create.tooltip.generationSpeed": "产生 %1$s %2$s", + "create.tooltip.analogStrength": "调节强度: %1$s/15", "create.mechanical_arm.extract_from": "UNLOCALIZED: Take items from %1$s", "create.mechanical_arm.deposit_to": "UNLOCALIZED: Deposit items to %1$s", @@ -1256,22 +905,22 @@ "create.gui.config.overlay8": "UNLOCALIZED: to reset to the default position", "create.command.killTPSCommand": "killtps", - "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.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", - "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": "æ¼�æ–—å�žé£Ÿ", + "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": "漏斗吞食", "create.subtitle.blaze_munch": "UNLOCALIZED: Blaze munches happily", @@ -1287,207 +936,207 @@ "item.create.example_item.tooltip.action1": "These controls are displayed.", "item.create.wand_of_symmetry.tooltip": "SYMMETRY WAND", - "item.create.wand_of_symmetry.tooltip.summary": "完美地镜é�¢å¤�制工作区域内的方å�—放置与破å��", - "item.create.wand_of_symmetry.tooltip.condition1": "当在热键æ �æ—¶", - "item.create.wand_of_symmetry.tooltip.behaviour1": "æŒ�续进行镜é�¢å¤�制", - "item.create.wand_of_symmetry.tooltip.control1": "当å�³é”®åœ°é�¢æ—¶", - "item.create.wand_of_symmetry.tooltip.action1": "_创建_或_移动_é•œå­�", - "item.create.wand_of_symmetry.tooltip.control2": "当å�³é”®ç©ºæ°”æ—¶", - "item.create.wand_of_symmetry.tooltip.action2": "_删除_ é•œå­�", - "item.create.wand_of_symmetry.tooltip.control3": "当潜行å�³é”®æ—¶", - "item.create.wand_of_symmetry.tooltip.action3": "打开_guiç•Œé�¢_", + "item.create.wand_of_symmetry.tooltip.summary": "完美地镜面复制工作区域内的方块放置与破坏", + "item.create.wand_of_symmetry.tooltip.condition1": "当在热键栏时", + "item.create.wand_of_symmetry.tooltip.behaviour1": "持续进行镜面复制", + "item.create.wand_of_symmetry.tooltip.control1": "当右键地面时", + "item.create.wand_of_symmetry.tooltip.action1": "_创建_或_移动_镜子", + "item.create.wand_of_symmetry.tooltip.control2": "当右键空气时", + "item.create.wand_of_symmetry.tooltip.action2": "_删除_ 镜子", + "item.create.wand_of_symmetry.tooltip.control3": "当潜行右键时", + "item.create.wand_of_symmetry.tooltip.action3": "打开_gui界面_", "item.create.handheld_blockzapper.tooltip": "BLOCKZAPPER", - "item.create.handheld_blockzapper.tooltip.summary": "新颖的å°�工具,å�¯ä»¥è¿œè·�离放置或更æ�¢æ–¹å�—.", - "item.create.handheld_blockzapper.tooltip.control1": "当左键方å�—æ—¶", - "item.create.handheld_blockzapper.tooltip.action1": "设定放置此方å�—.", - "item.create.handheld_blockzapper.tooltip.control2": "当å�³é”®æ–¹å�—æ—¶", - "item.create.handheld_blockzapper.tooltip.action2": "_放置_或_替æ�¢_ 目标方å�—.", - "item.create.handheld_blockzapper.tooltip.control3": "当潜行å�³é”®æ—¶", - "item.create.handheld_blockzapper.tooltip.action3": "打开_guiç•Œé�¢_", + "item.create.handheld_blockzapper.tooltip.summary": "新颖的小工具,可以远距离放置或更换方块.", + "item.create.handheld_blockzapper.tooltip.control1": "当左键方块时", + "item.create.handheld_blockzapper.tooltip.action1": "设定放置此方块.", + "item.create.handheld_blockzapper.tooltip.control2": "当右键方块时", + "item.create.handheld_blockzapper.tooltip.action2": "_放置_或_替换_ 目标方块.", + "item.create.handheld_blockzapper.tooltip.control3": "当潜行右键时", + "item.create.handheld_blockzapper.tooltip.action3": "打开_gui界面_", "item.create.handheld_worldshaper.tooltip": "HANDHELD WORLDSHAPER", - "item.create.handheld_worldshaper.tooltip.summary": "_创造_大陆和山脉的手æŒ�工具", - "item.create.handheld_worldshaper.tooltip.control1": "当左键方å�—æ—¶", - "item.create.handheld_worldshaper.tooltip.action1": "设定放置此方å�—", - "item.create.handheld_worldshaper.tooltip.control2": "当å�³é”®æ–¹å�—æ—¶", - "item.create.handheld_worldshaper.tooltip.action2": "_放置_或_替æ�¢_目标方å�—", - "item.create.handheld_worldshaper.tooltip.control3": "当潜行å�³é”®æ—¶", - "item.create.handheld_worldshaper.tooltip.action3": "打开工具的_guiç•Œé�¢_", + "item.create.handheld_worldshaper.tooltip.summary": "_创造_大陆和山脉的手持工具", + "item.create.handheld_worldshaper.tooltip.control1": "当左键方块时", + "item.create.handheld_worldshaper.tooltip.action1": "设定放置此方块", + "item.create.handheld_worldshaper.tooltip.control2": "当右键方块时", + "item.create.handheld_worldshaper.tooltip.action2": "_放置_或_替换_目标方块", + "item.create.handheld_worldshaper.tooltip.control3": "当潜行右键时", + "item.create.handheld_worldshaper.tooltip.action3": "打开工具的_gui界面_", "item.create.tree_fertilizer.tooltip": "TREE FERTILIZER", - "item.create.tree_fertilizer.tooltip.summary": "适用于常è§�树木的快速肥料", - "item.create.tree_fertilizer.tooltip.condition1": "在树苗上使用时", - "item.create.tree_fertilizer.tooltip.behaviour1": "无论_生长时间_多少,直接长大", + "item.create.tree_fertilizer.tooltip.summary": "适用于常见树木的快速肥料", + "item.create.tree_fertilizer.tooltip.condition1": "在树苗上使用时", + "item.create.tree_fertilizer.tooltip.behaviour1": "无论_生长时间_多少,直接长大", "item.create.deforester.tooltip": "DEFORESTER", - "item.create.deforester.tooltip.summary": "_æ ‘æž—æ¯�ç�­è€…_，能够瞬间ç �倒一棵树", + "item.create.deforester.tooltip.summary": "_树林毁灭者_，能够瞬间砍倒一棵树", "item.create.extendo_grip.tooltip": "EXTENDO GRIP", - "item.create.extendo_grip.tooltip.summary": "biubiubiu! 大幅度_增加了_使用者的_触碰è·�离_.", - "item.create.extendo_grip.tooltip.condition1": "放置于副手æ �æ—¶", - "item.create.extendo_grip.tooltip.behaviour1": "大幅增加_主手_的触碰è·�离,与_主手_的伸缩机械手æ�ºå�Œä½¿ç”¨ï¼Œå�¯è¿›ä¸€æ­¥å¢žåŠ _触碰è·�离_.", + "item.create.extendo_grip.tooltip.summary": "biubiubiu! 大幅度_增加了_使用者的_触碰距离_.", + "item.create.extendo_grip.tooltip.condition1": "放置于副手栏时", + "item.create.extendo_grip.tooltip.behaviour1": "大幅增加_主手_的触碰距离,与_主手_的伸缩机械手携同使用，可进一步增加_触碰距离_.", "item.create.filter.tooltip": "FILTER", - "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.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.attribute_filter.tooltip": "ATTRIBUTE FILTER", - "item.create.attribute_filter.tooltip.summary": "比起普通过滤器， _属性过滤器_å�¯ä»¥æ ¹æ�®ä¸�å�Œç‰©å“�çš„_属性_æ�¥è¿›è¡Œè¿‡æ»¤", - "item.create.attribute_filter.tooltip.condition1": "当处于_过滤器_槽中", - "item.create.attribute_filter.tooltip.behaviour1": "æ ¹æ�®_过滤器的_é…�ç½®,_控制_物å“�æµ�ç»�过滤器", - "item.create.attribute_filter.tooltip.condition2": "当å�³é”®æ—¶", - "item.create.attribute_filter.tooltip.behaviour2": "打开_é…�ç½®é�¢æ�¿_", + "item.create.attribute_filter.tooltip.summary": "比起普通过滤器， _属性过滤器_可以根据不同物品的_属性_来进行过滤", + "item.create.attribute_filter.tooltip.condition1": "当处于_过滤器_槽中", + "item.create.attribute_filter.tooltip.behaviour1": "根据_过滤器的_配置,_控制_物品流经过滤器", + "item.create.attribute_filter.tooltip.condition2": "当右键时", + "item.create.attribute_filter.tooltip.behaviour2": "打开_配置面板_", "item.create.empty_schematic.tooltip": "EMPTY SCHEMATIC", - "item.create.empty_schematic.tooltip.summary": "å�¯ä½œä¸ºå�ˆæˆ�æ��料或在_è“�图桌_使用", + "item.create.empty_schematic.tooltip.summary": "可作为合成材料或在_蓝图桌_使用", "item.create.schematic.tooltip": "SCHEMATIC", - "item.create.schematic.tooltip.summary": "å�¯ä»¥æ”¾ç½®åœ¨ä¸–界中的结构,æ ¹æ�®éœ€è¦�放置全æ�¯å›¾,并使用_è“�图加农炮_进行构建.", - "item.create.schematic.tooltip.condition1": "当全æ�¯å›¾å­˜åœ¨æ—¶", - "item.create.schematic.tooltip.behaviour1": "å�¯ä»¥ä½¿ç”¨å±�幕上的工具定ä½�", - "item.create.schematic.tooltip.control1": "当潜行å�³é”®æ—¶", - "item.create.schematic.tooltip.action1": "打开一个用于输入_精确å��æ ‡_çš„ç•Œé�¢.", + "item.create.schematic.tooltip.summary": "可以放置在世界中的结构,根据需要放置全息图,并使用_蓝图加农炮_进行构建.", + "item.create.schematic.tooltip.condition1": "当全息图存在时", + "item.create.schematic.tooltip.behaviour1": "可以使用屏幕上的工具定位", + "item.create.schematic.tooltip.control1": "当潜行右键时", + "item.create.schematic.tooltip.action1": "打开一个用于输入_精确坐标_的界面.", "item.create.schematic_and_quill.tooltip": "SCHEMATIC AND QUILL", - "item.create.schematic_and_quill.tooltip.summary": "用于将世界中的结构ä¿�存到.nbt文件.", - "item.create.schematic_and_quill.tooltip.condition1": "第一步", - "item.create.schematic_and_quill.tooltip.behaviour1": "手æŒ�è“�图与å�³é”®æ—‹è½¬ä¸¤ä¸ªç‚¹", - "item.create.schematic_and_quill.tooltip.condition2": "第二步", - "item.create.schematic_and_quill.tooltip.behaviour2": "按ä½�Ctrl鼠标滚轮选择选区大å°�,å�³é”®ç©ºç™½å¤„ä¿�å­˜.", - "item.create.schematic_and_quill.tooltip.control1": "å�³é”®", - "item.create.schematic_and_quill.tooltip.action1": "选å�–点/确认ä¿�å­˜", - "item.create.schematic_and_quill.tooltip.control2": "按ä½�Ctrl鼠标滚轮", - "item.create.schematic_and_quill.tooltip.action2": "在_空中_选择点滚动以调整è·�离。", - "item.create.schematic_and_quill.tooltip.control3": "当潜行å�³é”®æ—¶", - "item.create.schematic_and_quill.tooltip.action3": "_é‡�ç½®_并删除选区.", + "item.create.schematic_and_quill.tooltip.summary": "用于将世界中的结构保存到.nbt文件.", + "item.create.schematic_and_quill.tooltip.condition1": "第一步", + "item.create.schematic_and_quill.tooltip.behaviour1": "手持蓝图与右键旋转两个点", + "item.create.schematic_and_quill.tooltip.condition2": "第二步", + "item.create.schematic_and_quill.tooltip.behaviour2": "按住Ctrl鼠标滚轮选择选区大小,右键空白处保存.", + "item.create.schematic_and_quill.tooltip.control1": "右键", + "item.create.schematic_and_quill.tooltip.action1": "选取点/确认保存", + "item.create.schematic_and_quill.tooltip.control2": "按住Ctrl鼠标滚轮", + "item.create.schematic_and_quill.tooltip.action2": "在_空中_选择点滚动以调整距离。", + "item.create.schematic_and_quill.tooltip.control3": "当潜行右键时", + "item.create.schematic_and_quill.tooltip.action3": "_重置_并删除选区.", "block.create.schematicannon.tooltip": "SCHEMATICANNON", - "block.create.schematicannon.tooltip.summary": "通过å�‘å°„æ–¹å�—以在世界中é‡�新构建已部署的_å…¨æ�¯å›¾_,使用相邻箱å­�中的物å“�å�Š_ç�«è�¯_作为燃料.", - "block.create.schematicannon.tooltip.control1": "当å�³é”®æ—¶", - "block.create.schematicannon.tooltip.action1": "打开_guiç•Œé�¢_", + "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.behaviour1": "从Schematics文件夹上传所选文件", + "block.create.schematic_table.tooltip.summary": "将保存的蓝图图写入_空白蓝图_", + "block.create.schematic_table.tooltip.condition1": "放入空白蓝图时", + "block.create.schematic_table.tooltip.behaviour1": "从Schematics文件夹上传所选文件", "block.create.shaft.tooltip": "SHAFT", - "block.create.shaft.tooltip.summary": "å°†_旋转动能_进行直线传递.", + "block.create.shaft.tooltip.summary": "将_旋转动能_进行直线传递.", "block.create.cogwheel.tooltip": "COGWHEEL", - "block.create.cogwheel.tooltip.summary": "å°†_旋转动能_进行直线传递，或者传递到邻近的_齿轮_上", + "block.create.cogwheel.tooltip.summary": "将_旋转动能_进行直线传递，或者传递到邻近的_齿轮_上", "block.create.large_cogwheel.tooltip": "LARGE COGWHEEL", - "block.create.large_cogwheel.tooltip.summary": "大å�·é½¿è½®ä¼ åŠ¨ç»“æž„,连接到_å°�å�·é½¿è½®_时改å�˜å…¶_转速_.", + "block.create.large_cogwheel.tooltip.summary": "大号齿轮传动结构,连接到_小号齿轮_时改变其_转速_.", "block.create.encased_shaft.tooltip": "ENCASED SHAFT", - "block.create.encased_shaft.tooltip.summary": "å°†_旋转动能_进行直线传递，其方å�—体积使其在穿过墙体时更加_美观_.", + "block.create.encased_shaft.tooltip.summary": "将_旋转动能_进行直线传递，其方块体积使其在穿过墙体时更加_美观_.", "block.create.gearbox.tooltip": "GEARBOX", - "block.create.gearbox.tooltip.summary": "å��字传动旋转结构，å�Œæ—¶å°†ç›´çº¿æ—‹è½¬æ–¹å�‘_å��转_.", + "block.create.gearbox.tooltip.summary": "十字传动旋转结构，同时将直线旋转方向_反转_.", "item.create.vertical_gearbox.tooltip": " VERTICAL GEARBOX", - "item.create.vertical_gearbox.tooltip.summary": "_ç«–ç›´_版本的_å��字传动_结构", + "item.create.vertical_gearbox.tooltip.summary": "_竖直_版本的_十字传动_结构", "block.create.gearshift.tooltip": "GEARSHIFT", - "block.create.gearshift.tooltip.summary": "用于动能控制_旋转方å�‘_的开关.", - "block.create.gearshift.tooltip.condition1": "当æ��供红石信å�·æ—¶", - "block.create.gearshift.tooltip.behaviour1": "_更改_旋转方å�‘.", + "block.create.gearshift.tooltip.summary": "用于动能控制_旋转方向_的开关.", + "block.create.gearshift.tooltip.condition1": "当提供红石信号时", + "block.create.gearshift.tooltip.behaviour1": "_更改_旋转方向.", "block.create.clutch.tooltip": "CLUTCH", - "block.create.clutch.tooltip.summary": "传动开关装置.", - "block.create.clutch.tooltip.condition1": "当æ��供红石信å�·æ—¶", - "block.create.clutch.tooltip.behaviour1": "_å�œæ­¢_å�¦ä¸€ä¾§çš„旋转.", + "block.create.clutch.tooltip.summary": "传动开关装置.", + "block.create.clutch.tooltip.condition1": "当提供红石信号时", + "block.create.clutch.tooltip.behaviour1": "_停止_另一侧的旋转.", "block.create.encased_belt.tooltip": "ENCASED_BELT", - "block.create.encased_belt.tooltip.summary": "å°†_旋转动能_进行直线传递，或者传递到临近的_è¿žæ�ºé½¿è½®ç®±_.", - "block.create.encased_belt.tooltip.condition1": "连接到其他传动或装置时", - "block.create.encased_belt.tooltip.behaviour1": "将具有完全相å�Œçš„转速和方å�‘.", + "block.create.encased_belt.tooltip.summary": "将_旋转动能_进行直线传递，或者传递到临近的_连携齿轮箱_.", + "block.create.encased_belt.tooltip.condition1": "连接到其他传动或装置时", + "block.create.encased_belt.tooltip.behaviour1": "将具有完全相同的转速和方向.", "block.create.adjustable_pulley.tooltip": "ANALOG BELT PULLEY", - "block.create.adjustable_pulley.tooltip.summary": "å°†_旋转动能_进行直线传递，或者传递到临近的_è¿žæ�ºé½¿è½®ç®±_.当方å�—接收到信å�·æ—¶æ—‹è½¬é€Ÿåº¦å°†ä¼šæ”¹å�˜.", - "block.create.adjustable_pulley.tooltip.condition1": "当æ��ä¾›ä¸�å�Œçº¢çŸ³ä¿¡å�·å¼ºåº¦æ—¶", - "block.create.adjustable_pulley.tooltip.behaviour1": "如果没有红石信å�·_ä¸�会加速_,最强的红石信å�·å°†ä¼šæ��å�‡è‡³_两å€�速_", + "block.create.adjustable_pulley.tooltip.summary": "将_旋转动能_进行直线传递，或者传递到临近的_连携齿轮箱_.当方块接收到信号时旋转速度将会改变.", + "block.create.adjustable_pulley.tooltip.condition1": "当提供不同红石信号强度时", + "block.create.adjustable_pulley.tooltip.behaviour1": "如果没有红石信号_不会加速_,最强的红石信号将会提升至_两倍速_", "item.create.belt_connector.tooltip": "BELT CONNECTOR", - "item.create.belt_connector.tooltip.summary": "用_ä¼ é€�带_连接两个_传动æ�†_,连接的传动æ�†å°†å…·æœ‰å®Œå…¨ç›¸å�Œçš„转速和方å�‘.ä¼ é€�带å�¯ä»¥_传输实体_å’Œ_物å“�_.", - "item.create.belt_connector.tooltip.control1": "当å�³é”®ä¼ åŠ¨æ�†æ—¶", - "item.create.belt_connector.tooltip.action1": "选择传动æ�†ä½œä¸ºä¼ é€�带的传输点,选定的两个传动æ�†éƒ½å¿…须相互_åž‚ç›´_,_æ°´å¹³_或_对角平é½�_.", - "item.create.belt_connector.tooltip.control2": "当潜行å�³é”®æ—¶", - "item.create.belt_connector.tooltip.action2": "_é‡�ç½®_ä¼ é€�带的第一个选定ä½�ç½®", + "item.create.belt_connector.tooltip.summary": "用_传送带_连接两个_传动杆_,连接的传动杆将具有完全相同的转速和方向.传送带可以_传输实体_和_物品_.", + "item.create.belt_connector.tooltip.control1": "当右键传动杆时", + "item.create.belt_connector.tooltip.action1": "选择传动杆作为传送带的传输点,选定的两个传动杆都必须相互_垂直_,_水平_或_对角平齐_.", + "item.create.belt_connector.tooltip.control2": "当潜行右键时", + "item.create.belt_connector.tooltip.action2": "_重置_传送带的第一个选定位置", "item.create.goggles.tooltip": "GOGGLES", - "item.create.goggles.tooltip.summary": "一副特殊的眼镜,能够让你看è§� _动能_ çš„ä¿¡æ�¯.", - "item.create.goggles.tooltip.condition1": "当装备时", - "item.create.goggles.tooltip.behaviour1": "将会展示å�•ä¸ªåŠ¨èƒ½å…ƒä»¶çš„_速度_ã€�_应力_等信æ�¯", - "item.create.goggles.tooltip.condition2": "当看å�‘仪表时", - "item.create.goggles.tooltip.behaviour2": "将会展示仪表连接网络的_速度_ã€�_应力_等信æ�¯.", + "item.create.goggles.tooltip.summary": "一副特殊的眼镜,能够让你看见 _动能_ 的信息.", + "item.create.goggles.tooltip.condition1": "当装备时", + "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": "一ç§�有用的工具，能够调整_动能_çš„_æ–¹å�‘_ã€�_é…�ç½®_ç­‰.", - "item.create.wrench.tooltip.control1": "当å�³é”®ç‚¹å‡»_动能元件_æ—¶", - "item.create.wrench.tooltip.action1": "以点击的é�¢ä¸ºè½´å¿ƒ_旋转_点击的方å�—", - "item.create.wrench.tooltip.control2": "当潜行å�³é”®æ—¶", - "item.create.wrench.tooltip.action2": "将物å“�_å�–下_并移动到你的背包中.", + "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": "将物品_取下_并移动到你的背包中.", "block.create.creative_motor.tooltip": "CREATIVE MOTOR", - "block.create.creative_motor.tooltip.summary": "å�¯ä»¥é…�置的_æ— é™�动力_æ�¥æº�", + "block.create.creative_motor.tooltip.summary": "可以配置的_无限动力_来源", "block.create.water_wheel.tooltip": "WATER WHEEL", - "block.create.water_wheel.tooltip.summary": "从相邻的æµ�水中获得动力", + "block.create.water_wheel.tooltip.summary": "从相邻的流水中获得动力", "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.condition2": "当旋转时", - "block.create.encased_fan.tooltip.behaviour2": "æ ¹æ�®æ—‹è½¬æ–¹å�‘_推动_或者_å�¸å¼•_实体,强度和速度å�–决于给予的动力.", - "block.create.encased_fan.tooltip.condition3": "当气æµ�通过ç�«,æ°´,岩浆时", - "block.create.encased_fan.tooltip.behaviour3": "在_被å�¹å‡º_的水，ç�«ï¼Œå²©æµ†ç²’å­�中放置物å“�会获得相应产物(_建议é…�å�ˆjei查看_).", + "block.create.encased_fan.tooltip.summary": "有多种用途,主要可以将_动力_和_风力_进行互相转换.", + "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": "当气流通过火,水,岩浆时", + "block.create.encased_fan.tooltip.behaviour3": "在_被吹出_的水，火，岩浆粒子中放置物品会获得相应产物(_建议配合jei查看_).", "block.create.nozzle.tooltip": "NOZZLE", - "block.create.nozzle.tooltip.summary": "ä¾�附在鼓风机上,能够将鼓风机的风到_分散_å�„个方å�‘.", + "block.create.nozzle.tooltip.summary": "依附在鼓风机上,能够将鼓风机的风到_分散_各个方向.", "block.create.hand_crank.tooltip": "HAND CRANK", - "block.create.hand_crank.tooltip.summary": "一ç§�简å�•çš„旋转能æº�,需è¦�_人工转动_.", - "block.create.hand_crank.tooltip.condition1": "当使用时", - "block.create.hand_crank.tooltip.behaviour1": "å�‘ä¾�附的结构æ��供动力,_潜行_时将会æ��ä¾›_å��å�‘_的旋转动力", + "block.create.hand_crank.tooltip.summary": "一种简单的旋转能源,需要_人工转动_.", + "block.create.hand_crank.tooltip.condition1": "当使用时", + "block.create.hand_crank.tooltip.behaviour1": "向依附的结构提供动力,_潜行_时将会提供_反向_的旋转动力", "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.summary": "精致的工艺品,能够记录时间", + "block.create.cuckoo_clock.tooltip.condition1": "当旋转时", + "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.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": "一对能够粉碎一切的粉碎轮。å�‘两个粉碎轮æ��ä¾›å�‘内且相å��的转速æ�¥å·¥ä½œ", - "block.create.crushing_wheel.tooltip.condition1": "当两个粉碎轮一起è¿�作时", - "block.create.crushing_wheel.tooltip.behaviour1": "粉碎物å“�并获得相应产物(建议é…�å�ˆjei查看)", + "block.create.crushing_wheel.tooltip.summary": "一对能够粉碎一切的粉碎轮。向两个粉碎轮提供向内且相反的转速来工作", + "block.create.crushing_wheel.tooltip.condition1": "当两个粉碎轮一起运作时", + "block.create.crushing_wheel.tooltip.behaviour1": "粉碎物品并获得相应产物(建议配合jei查看)", "block.create.mechanical_press.tooltip": "MECHANICAL PRESS", - "block.create.mechanical_press.tooltip.summary": "一个强力的活塞å¼�机器,用于压制其下方的物å“�.", - "block.create.mechanical_press.tooltip.condition1": "当æ��供红石信å�·æ—¶", - "block.create.mechanical_press.tooltip.behaviour1": "_压制_其下方的物å“�.", - "block.create.mechanical_press.tooltip.condition2": "在传é€�带上方时", - "block.create.mechanical_press.tooltip.behaviour2": "_自动压缩_ç»�过传é€�带的物å“�.", + "block.create.mechanical_press.tooltip.summary": "一个强力的活塞式机器,用于压制其下方的物品.", + "block.create.mechanical_press.tooltip.condition1": "当提供红石信号时", + "block.create.mechanical_press.tooltip.behaviour1": "_压制_其下方的物品.", + "block.create.mechanical_press.tooltip.condition2": "在传送带上方时", + "block.create.mechanical_press.tooltip.behaviour2": "_自动压缩_经过传送带的物品.", "block.create.mechanical_press.tooltip.condition3": "UNLOCALIZED: When above Basin", "block.create.mechanical_press.tooltip.behaviour3": "UNLOCALIZED: Starts to _compact_ _items_ in the basin whenever all necessary ingredients are present.", "block.create.basin.tooltip": "BASIN", - "block.create.basin.tooltip.summary": "一ç§�方便的_物å“�容器_,常常用于_辊压机_å’Œ_æ�…拌机_,å�¯ä»¥è¢«_红石比较器_检测", + "block.create.basin.tooltip.summary": "一种方便的_物品容器_,常常用于_辊压机_和_搅拌机_,可以被_红石比较器_检测", "block.create.blaze_heater.tooltip": "UNLOCALIZED: BLAZE HEATER", "block.create.blaze_heater.tooltip.summary": "UNLOCALIZED: A block to heat a basin when housing a tamed blaze.", @@ -1502,272 +1151,272 @@ "block.create.reinforced_rail.tooltip.summary": "UNLOCALIZED: A timber stabilized rail, _does_ _not_ _need_ _supports_.", "block.create.mechanical_mixer.tooltip": "MECHANICAL MIXER", - "block.create.mechanical_mixer.tooltip.summary": "一ç§�能够动æ€�进行æ�…拌的机器,需è¦�æ�’定且够快的速度，并且下方需è¦�放置_工作盆_(中间需è¦�一格高)", - "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.summary": "一种能够动态进行搅拌的机器,需要恒定且够快的速度，并且下方需要放置_工作盆_(中间需要一格高)", + "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_crafter.tooltip": "MECHANICAL CRAFTER", - "block.create.mechanical_crafter.tooltip.summary": "一ç§�ä¾�é� _动能_çš„_自动_å�ˆæˆ�å�°ã€‚æ ¹æ�®æƒ³è¦�å�ˆæˆ�物å“�çš„_å�ˆæˆ�表_æ�¥æ‘†æ”¾_相应数é‡�_的机械制造机，并且用扳手调整物å“�在制造机里的_传动方å�‘_以让他们å�ˆåœ¨ä¸€èµ·å�Žè¢«è¾“出", - "block.create.mechanical_crafter.tooltip.condition1": "当旋转时", - "block.create.mechanical_crafter.tooltip.behaviour1": "当机器中_所有_的物å“�槽有物å“�æ—¶,将会å�¯åŠ¨æ‰€æœ‰çš„制造机æ�¥å·¥ä½œ.", - "block.create.mechanical_crafter.tooltip.condition2": "被红石激活时", - "block.create.mechanical_crafter.tooltip.behaviour2": "强制å�¯åŠ¨å½“å‰�网格中所有给定的_æ��æ–™_çš„_å�ˆæˆ�_", - "block.create.mechanical_crafter.tooltip.control1": "当在机器å‰�方使用扳手时", - "block.create.mechanical_crafter.tooltip.action1": "将会改å�˜ç‰©å“�移动的方å�‘. è¦�å�ˆæˆ�一个物å“�，所有原料必须被_移动到一起_，并且在阵列的_外缘_被弹出机器", - "block.create.mechanical_crafter.tooltip.control2": "当侧方或者å�Žæ–¹ä½¿ç”¨æ‰³æ‰‹æ—¶", - "block.create.mechanical_crafter.tooltip.action2": "连接相邻的制造机的物å“�æ �，这样_相å�Œ_的物å“�就会自动进入所有相互连接的制造机", + "block.create.mechanical_crafter.tooltip.summary": "一种依靠_动能_的_自动_合成台。根据想要合成物品的_合成表_来摆放_相应数量_的机械制造机，并且用扳手调整物品在制造机里的_传动方向_以让他们合在一起后被输出", + "block.create.mechanical_crafter.tooltip.condition1": "当旋转时", + "block.create.mechanical_crafter.tooltip.behaviour1": "当机器中_所有_的物品槽有物品时,将会启动所有的制造机来工作.", + "block.create.mechanical_crafter.tooltip.condition2": "被红石激活时", + "block.create.mechanical_crafter.tooltip.behaviour2": "强制启动当前网格中所有给定的_材料_的_合成_", + "block.create.mechanical_crafter.tooltip.control1": "当在机器前方使用扳手时", + "block.create.mechanical_crafter.tooltip.action1": "将会改变物品移动的方向. 要合成一个物品，所有原料必须被_移动到一起_，并且在阵列的_外缘_被弹出机器", + "block.create.mechanical_crafter.tooltip.control2": "当侧方或者后方使用扳手时", + "block.create.mechanical_crafter.tooltip.action2": "连接相邻的制造机的物品栏，这样_相同_的物品就会自动进入所有相互连接的制造机", "block.create.furnace_engine.tooltip": "FURNACE ENGINE", - "block.create.furnace_engine.tooltip.summary": "一ç§�强力的_旋转动能_çš„æ�¥æº�,但是需è¦�_正在工作_çš„_熔炉_(三ç§�熔炉都å�¯ä»¥)", - "block.create.furnace_engine.tooltip.condition1": "当连接正在燃烧的熔炉", - "block.create.furnace_engine.tooltip.behaviour1": "将会带动_相连_çš„_飞轮_(需è¦�间隔一格),用高炉速度更快", + "block.create.furnace_engine.tooltip.summary": "一种强力的_旋转动能_的来源,但是需要_正在工作_的_熔炉_(三种熔炉都可以)", + "block.create.furnace_engine.tooltip.condition1": "当连接正在燃烧的熔炉", + "block.create.furnace_engine.tooltip.behaviour1": "将会带动_相连_的_飞轮_(需要间隔一格),用高炉速度更快", "block.create.flywheel.tooltip": "FLYWHEEL", - "block.create.flywheel.tooltip.summary": "一ç§�大型的金属轮， 能将_熔炉引擎_æ��供的动能稳定化输出， 需è¦�与_熔炉引擎_间隔一个方å�—", - "block.create.flywheel.tooltip.condition1": "当连接正在输出的_熔炉引擎_", - "block.create.flywheel.tooltip.behaviour1": "将会æ��供相应的_旋转动能_.", + "block.create.flywheel.tooltip.summary": "一种大型的金属轮， 能将_熔炉引擎_提供的动能稳定化输出， 需要与_熔炉引擎_间隔一个方块", + "block.create.flywheel.tooltip.condition1": "当连接正在输出的_熔炉引擎_", + "block.create.flywheel.tooltip.behaviour1": "将会提供相应的_旋转动能_.", "block.create.portable_storage_interface.tooltip": "PORTABLE STORAGE INTERFACE", - "block.create.portable_storage_interface.tooltip.summary": "一ç§�便æ�ºçš„_物å“�接å�£_,能够将移动的结构中的物å“�进行交互移动", - "block.create.portable_storage_interface.tooltip.condition1": "当处于移动时", - "block.create.portable_storage_interface.tooltip.behaviour1": "与固定的_传输器_交互. 会根æ�®ä¼ è¾“器的方å�‘进行输出或者输入物å“�。 移动结构在传输物å“�的时候会短暂地å�œä¸‹", + "block.create.portable_storage_interface.tooltip.summary": "一种便携的_物品接口_,能够将移动的结构中的物品进行交互移动", + "block.create.portable_storage_interface.tooltip.condition1": "当处于移动时", + "block.create.portable_storage_interface.tooltip.behaviour1": "与固定的_传输器_交互. 会根据传输器的方向进行输出或者输入物品。 移动结构在传输物品的时候会短暂地停下", "block.create.rotation_speed_controller.tooltip": "ROTATION SPEED CONTROLLER", - "block.create.rotation_speed_controller.tooltip.summary": "一个å�¯ä»¥å�˜æ�¢æ‰€è¿žæŽ¥é½¿è½®æ—‹è½¬é€Ÿåº¦çš„元件", - "block.create.rotation_speed_controller.tooltip.condition1": "当连接大齿轮时", - "block.create.rotation_speed_controller.tooltip.behaviour1": "将输入的旋转动能改å�˜é€Ÿåº¦å�Ž,传递给连接的大齿轮,连接的大齿轮è¦�放在上方.", + "block.create.rotation_speed_controller.tooltip.summary": "一个可以变换所连接齿轮旋转速度的元件", + "block.create.rotation_speed_controller.tooltip.condition1": "当连接大齿轮时", + "block.create.rotation_speed_controller.tooltip.behaviour1": "将输入的旋转动能改变速度后,传递给连接的大齿轮,连接的大齿轮要放在上方.", "block.create.mechanical_piston.tooltip": "MECHANICAL PISTON", - "block.create.mechanical_piston.tooltip.summary": "活塞的高级版本,使用_旋转动能_精确地移动其连接的方å�—,背é�¢å�¯æ”¾ç½®æ´»å¡žæ�†å»¶é•¿æ´»å¡žèŒƒå›´,没有活塞æ�†å°†ä¸�会工作,使用_底盘_或者_粘液å�—_å�¯ä»¥ç§»åŠ¨å¤šè¡Œæ–¹å�—.", - "block.create.mechanical_piston.tooltip.condition1": "推拉活塞时", - "block.create.mechanical_piston.tooltip.behaviour1": "活塞的速度和方å�‘与所接å�—转速的大å°�以å�Šæ–¹å�‘相关.", + "block.create.mechanical_piston.tooltip.summary": "活塞的高级版本,使用_旋转动能_精确地移动其连接的方块,背面可放置活塞杆延长活塞范围,没有活塞杆将不会工作,使用_底盘_或者_粘液块_可以移动多行方块.", + "block.create.mechanical_piston.tooltip.condition1": "推拉活塞时", + "block.create.mechanical_piston.tooltip.behaviour1": "活塞的速度和方向与所接受转速的大小以及方向相关.", "block.create.sticky_mechanical_piston.tooltip": "STICKY MECHANICAL PISTON", - "block.create.sticky_mechanical_piston.tooltip.summary": "粘性活塞的高级版本,使用_旋转动能_精确移动其粘贴的方å�—,背é�¢å�¯æ”¾ç½®æ´»å¡žæ�†å»¶é•¿æ´»å¡žèŒƒå›´,没有活塞æ�†å°†ä¸�会工作,使用_底盘_或者_粘液å�—_å�¯ä»¥ç§»åŠ¨å¤šè¡Œæ–¹å�—.", - "block.create.sticky_mechanical_piston.tooltip.condition1": "推拉活塞时", - "block.create.sticky_mechanical_piston.tooltip.behaviour1": "活塞的速度和方å�‘与所接å�—转速的大å°�以å�Šæ–¹å�‘相关.", + "block.create.sticky_mechanical_piston.tooltip.summary": "粘性活塞的高级版本,使用_旋转动能_精确移动其粘贴的方块,背面可放置活塞杆延长活塞范围,没有活塞杆将不会工作,使用_底盘_或者_粘液块_可以移动多行方块.", + "block.create.sticky_mechanical_piston.tooltip.condition1": "推拉活塞时", + "block.create.sticky_mechanical_piston.tooltip.behaviour1": "活塞的速度和方向与所接受转速的大小以及方向相关.", "block.create.piston_extension_pole.tooltip": "PISTON POLE", - "block.create.piston_extension_pole.tooltip.summary": "用于增加_动力活塞_的移动范围", - "block.create.piston_extension_pole.tooltip.condition1": "当连接到动力活塞时", - "block.create.piston_extension_pole.tooltip.behaviour1": "活塞的移动范围将扩大", + "block.create.piston_extension_pole.tooltip.summary": "用于增加_动力活塞_的移动范围", + "block.create.piston_extension_pole.tooltip.condition1": "当连接到动力活塞时", + "block.create.piston_extension_pole.tooltip.behaviour1": "活塞的移动范围将扩大", "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.condition2": "给予红石信å�·æ—¶", - "block.create.mechanical_bearing.tooltip.behaviour2": "开始旋转并为连接的传动方å�—æ��供动力(此结构需使用_羊毛_建造).", + "block.create.mechanical_bearing.tooltip.summary": "用于建造大型的旋转结构,或者反之转换_风能_为_旋转能_.", + "block.create.mechanical_bearing.tooltip.condition1": "当旋转时", + "block.create.mechanical_bearing.tooltip.behaviour1": "使用_粘液块_或者_底盘_来驱动更多方块", + "block.create.mechanical_bearing.tooltip.condition2": "给予红石信号时", + "block.create.mechanical_bearing.tooltip.behaviour2": "开始旋转并为连接的传动方块提供动力(此结构需使用_羊毛_建造).", "block.create.clockwork_bearing.tooltip": "CLOCKWORK BEARING", - "block.create.clockwork_bearing.tooltip.summary": "一ç§�高级的机械轴承,å�¯ä»¥æ ¹æ�®å½“å‰�游æˆ�内时间旋转两个ä¸�å�Œçš„指针", - "block.create.clockwork_bearing.tooltip.condition1": "当旋转时", - "block.create.clockwork_bearing.tooltip.behaviour1": "旋转第一个连接的结构作为时针,第二个连接的结构作为分针", + "block.create.clockwork_bearing.tooltip.summary": "一种高级的机械轴承,可以根据当前游戏内时间旋转两个不同的指针", + "block.create.clockwork_bearing.tooltip.condition1": "当旋转时", + "block.create.clockwork_bearing.tooltip.behaviour1": "旋转第一个连接的结构作为时针,第二个连接的结构作为分针", "block.create.sequenced_gearshift.tooltip": "SEQUENCED GEARSHIFT", - "block.create.sequenced_gearshift.tooltip.summary": "一ç§�å�¯ç¼–程的组件，å�¯ä»¥æ ¹æ�®å†…部的指令改å�˜æ—‹è½¬çš„_æ–¹å�‘_，_速度_，以å�Š_è·�离_。 此组件å�¯ä»¥æœ‰æ•ˆé…�å�ˆæ´»å¡žå’Œè½´æ‰¿ç­‰ä½¿ç”¨ã€‚最高å�¯è®©å…¶æŒ‰_顺åº�_执行_5æ�¡æŒ‡ä»¤_。æ�¡é«˜é€Ÿæ—‹è½¬æ—¶å�¯èƒ½ä¼šå�˜å¾—ä¸�精确。", - "block.create.sequenced_gearshift.tooltip.condition1": "当给予红石信å�·æ—¶", - "block.create.sequenced_gearshift.tooltip.behaviour1": "在输入旋转动能的情况下,执行指令.", - "block.create.sequenced_gearshift.tooltip.condition2": "当å�³é”®æ—¶", - "block.create.sequenced_gearshift.tooltip.behaviour2": "将打开é…�ç½®_é…�置界é�¢_", + "block.create.sequenced_gearshift.tooltip.summary": "一种可编程的组件，可以根据内部的指令改变旋转的_方向_，_速度_，以及_距离_。 此组件可以有效配合活塞和轴承等使用。最高可让其按_顺序_执行_5条指令_。条高速旋转时可能会变得不精确。", + "block.create.sequenced_gearshift.tooltip.condition1": "当给予红石信号时", + "block.create.sequenced_gearshift.tooltip.behaviour1": "在输入旋转动能的情况下,执行指令.", + "block.create.sequenced_gearshift.tooltip.condition2": "当右键时", + "block.create.sequenced_gearshift.tooltip.behaviour2": "将打开配置_配置界面_", "block.create.cart_assembler.tooltip": "CART ASSEMBLER", - "block.create.cart_assembler.tooltip.summary": "将连接当å‰�æ–¹å�—的结构连接在_矿车_上", - "block.create.cart_assembler.tooltip.condition1": "当被红石信å�·æ¿€æ´»æ—¶", - "block.create.cart_assembler.tooltip.behaviour1": "将装é…�站上连接的结构组装到矿车上，并é€�矿车上路", - "block.create.cart_assembler.tooltip.condition2": "没有红石信å�·æ—¶", - "block.create.cart_assembler.tooltip.behaviour2": "å°†ç»�过的矿车上的结构_实体化_,并å�œä½�矿车.", + "block.create.cart_assembler.tooltip.summary": "将连接当前方块的结构连接在_矿车_上", + "block.create.cart_assembler.tooltip.condition1": "当被红石信号激活时", + "block.create.cart_assembler.tooltip.behaviour1": "将装配站上连接的结构组装到矿车上，并送矿车上路", + "block.create.cart_assembler.tooltip.condition2": "没有红石信号时", + "block.create.cart_assembler.tooltip.behaviour2": "将经过的矿车上的结构_实体化_,并停住矿车.", "block.create.cart_assembler.tooltip.condition3": "UNLOCALIZED: When placed above Detector Rail", "block.create.cart_assembler.tooltip.behaviour3": "UNLOCALIZED: _Assembles_ unassembled _carts_, _disassembles_ assembled _carts_.", "block.create.cart_assembler.tooltip.condition4": "UNLOCALIZED: When placed above Activator Rail", "block.create.cart_assembler.tooltip.behaviour4": "UNLOCALIZED: _Disassembles_ _carts_ when _powered_.", "block.create.rope_pulley.tooltip": "ROPE PULLEY", - "block.create.rope_pulley.tooltip.summary": "移动绳索相连的结构. 使用_底盘_或者_粘液å�—_æ�¥ç§»åŠ¨å¤šè¡Œæ–¹å�—", - "block.create.rope_pulley.tooltip.condition1": "当旋转时", - "block.create.rope_pulley.tooltip.behaviour1": "æ ¹æ�®è¾“入的转速的大å°�以å�Šæ–¹å�‘,移动链接的结构.", + "block.create.rope_pulley.tooltip.summary": "移动绳索相连的结构. 使用_底盘_或者_粘液块_来移动多行方块", + "block.create.rope_pulley.tooltip.condition1": "当旋转时", + "block.create.rope_pulley.tooltip.behaviour1": "根据输入的转速的大小以及方向,移动链接的结构.", "block.create.linear_chassis.tooltip": "TRANSLATION CHASSIS", - "block.create.linear_chassis.tooltip.summary": "一ç§�å�¯é…�置的_底盘_。这ç§�底盘å�¯ä»¥å°†å¤šä¸ªæ–¹å�—连接起æ�¥ç»„å�ˆæˆ�_大型结构_", - "block.create.linear_chassis.tooltip.condition1": "被移动时", - "block.create.linear_chassis.tooltip.behaviour1": "移动所有_并排_çš„_机壳底盘_。如果底盘上涂了_粘液ç�ƒ_，那么其范围内一æ�¡ç›´çº¿çš„æ–¹å�—都会被_é»�附移动_(详情è§�Ctrl).", - "block.create.linear_chassis.tooltip.condition2": "当使用扳手时", - "block.create.linear_chassis.tooltip.behaviour2": "通过_鼠标滚轮_æ�¥é…�置连接的方å�—的范围.按ä½�_Ctrl_时滚动滚轮å�¯ä»¥å�Œæ—¶é…�置相连的其他底盘.", - "block.create.linear_chassis.tooltip.control1": "当用粘液ç�ƒå�³é”®æ—¶", - "block.create.linear_chassis.tooltip.action1": "å�˜ä¸º_粘性机壳底盘_. 所有工作范围内与其相连的方å�—会与其_一å�Œç§»åŠ¨_", + "block.create.linear_chassis.tooltip.summary": "一种可配置的_底盘_。这种底盘可以将多个方块连接起来组合成_大型结构_", + "block.create.linear_chassis.tooltip.condition1": "被移动时", + "block.create.linear_chassis.tooltip.behaviour1": "移动所有_并排_的_机壳底盘_。如果底盘上涂了_粘液球_，那么其范围内一条直线的方块都会被_黏附移动_(详情见Ctrl).", + "block.create.linear_chassis.tooltip.condition2": "当使用扳手时", + "block.create.linear_chassis.tooltip.behaviour2": "通过_鼠标滚轮_来配置连接的方块的范围.按住_Ctrl_时滚动滚轮可以同时配置相连的其他底盘.", + "block.create.linear_chassis.tooltip.control1": "当用粘液球右键时", + "block.create.linear_chassis.tooltip.action1": "变为_粘性机壳底盘_. 所有工作范围内与其相连的方块会与其_一同移动_", "block.create.radial_chassis.tooltip": "ROTATION CHASSIS", - "block.create.radial_chassis.tooltip.summary": "一ç§�å�¯é…�置的底盘。这ç§�底盘å�¯ä»¥å°†å¤šä¸ªæ–¹å�—连接起æ�¥ç»„å�ˆæˆ�_大型结构_", - "block.create.radial_chassis.tooltip.condition1": "当旋转时", - "block.create.radial_chassis.tooltip.behaviour1": "所有_竖排_çš„_旋转底盘_会互相粘连移动，并且æ¯�个涂了_粘液ç�ƒ_的底盘都会带动其工作å�Šå¾„内的方å�—(详情è§�Ctrl).", - "block.create.radial_chassis.tooltip.condition2": "当使用扳手时", - "block.create.radial_chassis.tooltip.behaviour2": "é…�置连接的方å�—çš„å�Šå¾„.按ä½�_Ctrl_å�¯ä»¥å�Œæ—¶é…�置相连的其他底盘.", - "block.create.radial_chassis.tooltip.control1": "当用粘液ç�ƒå�³é”®æ—¶", - "block.create.radial_chassis.tooltip.action1": "å�˜ä¸º_粘性旋转底盘_.所有工作范围内与其相连的方å�—会与其_一å�Œç§»åŠ¨_.", + "block.create.radial_chassis.tooltip.summary": "一种可配置的底盘。这种底盘可以将多个方块连接起来组合成_大型结构_", + "block.create.radial_chassis.tooltip.condition1": "当旋转时", + "block.create.radial_chassis.tooltip.behaviour1": "所有_竖排_的_旋转底盘_会互相粘连移动，并且每个涂了_粘液球_的底盘都会带动其工作半径内的方块(详情见Ctrl).", + "block.create.radial_chassis.tooltip.condition2": "当使用扳手时", + "block.create.radial_chassis.tooltip.behaviour2": "配置连接的方块的半径.按住_Ctrl_可以同时配置相连的其他底盘.", + "block.create.radial_chassis.tooltip.control1": "当用粘液球右键时", + "block.create.radial_chassis.tooltip.action1": "变为_粘性旋转底盘_.所有工作范围内与其相连的方块会与其_一同移动_.", "block.create.mechanical_drill.tooltip": "MECHANICAL mechanical_drill", - "block.create.mechanical_drill.tooltip.summary": "用于_ç ´å��æ–¹å�—_的装置，å�¯ä»¥è¢«_动力活塞_å’Œ_动力轴承_等带动", - "block.create.mechanical_drill.tooltip.condition1": "被供能时", - "block.create.mechanical_drill.tooltip.behaviour1": "_原地_ç ´å��æ­£å‰�方的方å�—,且_伤害_在一定范围内生物å�ŠçŽ©å®¶.", - "block.create.mechanical_drill.tooltip.condition2": "当移动时", - "block.create.mechanical_drill.tooltip.behaviour2": "横å�‘或纵å�‘ç ´å��其所_碰到_çš„æ–¹å�—.", + "block.create.mechanical_drill.tooltip.summary": "用于_破坏方块_的装置，可以被_动力活塞_和_动力轴承_等带动", + "block.create.mechanical_drill.tooltip.condition1": "被供能时", + "block.create.mechanical_drill.tooltip.behaviour1": "_原地_破坏正前方的方块,且_伤害_在一定范围内生物及玩家.", + "block.create.mechanical_drill.tooltip.condition2": "当移动时", + "block.create.mechanical_drill.tooltip.behaviour2": "横向或纵向破坏其所_碰到_的方块.", "block.create.mechanical_harvester.tooltip": "MECHANICAL mechanical_harvester", - "block.create.mechanical_harvester.tooltip.summary": "适用于中型作物自动化的收割机，å�¯ä»¥è¢«_动力活塞_å’Œ_动力轴承_等带动.", - "block.create.mechanical_harvester.tooltip.condition1": "当移动时", - "block.create.mechanical_harvester.tooltip.behaviour1": "收割机移动至æˆ�熟作物，收割作物并将作物å�˜ä¸ºåˆ�始生长状æ€�.", + "block.create.mechanical_harvester.tooltip.summary": "适用于中型作物自动化的收割机，可以被_动力活塞_和_动力轴承_等带动.", + "block.create.mechanical_harvester.tooltip.condition1": "当移动时", + "block.create.mechanical_harvester.tooltip.behaviour1": "收割机移动至成熟作物，收割作物并将作物变为初始生长状态.", "block.create.mechanical_plough.tooltip": "MECHANICAL mechanical_plough", - "block.create.mechanical_plough.tooltip.summary": "çŠ�是一个é�žå¸¸æœ‰ç”¨çš„多功能方å�—， 它å�¯ä»¥è¢« _动力活塞_ å’Œ _动力轴承_ 等带动", - "block.create.mechanical_plough.tooltip.condition1": "当移动时", - "block.create.mechanical_plough.tooltip.behaviour1": "å�¯ä»¥æ‰“掉无碰撞体积的一些_附ç�€æ–¹å�—_，比如ç�«æŠŠå’Œé›ªç­‰. å�¯ä»¥åœ¨ä¸�伤害实体的情况下移动它们. 能åƒ�_锄头_一样翻土耕田.", + "block.create.mechanical_plough.tooltip.summary": "犁是一个非常有用的多功能方块， 它可以被 _动力活塞_ 和 _动力轴承_ 等带动", + "block.create.mechanical_plough.tooltip.condition1": "当移动时", + "block.create.mechanical_plough.tooltip.behaviour1": "可以打掉无碰撞体积的一些_附着方块_，比如火把和雪等. 可以在不伤害实体的情况下移动它们. 能像_锄头_一样翻土耕田.", "block.create.mechanical_saw.tooltip": "MECHANICAL mechanical_saw", - "block.create.mechanical_saw.tooltip.summary": "å�¯ä»¥ç”¨äºŽç �æ ‘,也å�¯ä»¥ç”¨äºŽåˆ‡å‰²æ–¹å�—，å�¯ä»¥è¢«_动力活塞_å’Œ_动力轴承_等带动", - "block.create.mechanical_saw.tooltip.condition1": "当å�‘上放置时", - "block.create.mechanical_saw.tooltip.behaviour1": "å�¯ä»¥åˆ‡å‰²å�„ç§�物å“�(建议é…�å�ˆjei查看)", - "block.create.mechanical_saw.tooltip.condition2": "当方å�‘在水平é�¢æ—¶", - "block.create.mechanical_saw.tooltip.behaviour2": "å�¯ä»¥ç �倒é�¢å‰�的树木", - "block.create.mechanical_saw.tooltip.condition3": "当移动时", - "block.create.mechanical_saw.tooltip.behaviour3": "将会ç �倒碰撞到的树木", + "block.create.mechanical_saw.tooltip.summary": "可以用于砍树,也可以用于切割方块，可以被_动力活塞_和_动力轴承_等带动", + "block.create.mechanical_saw.tooltip.condition1": "当向上放置时", + "block.create.mechanical_saw.tooltip.behaviour1": "可以切割各种物品(建议配合jei查看)", + "block.create.mechanical_saw.tooltip.condition2": "当方向在水平面时", + "block.create.mechanical_saw.tooltip.behaviour2": "可以砍倒面前的树木", + "block.create.mechanical_saw.tooltip.condition3": "当移动时", + "block.create.mechanical_saw.tooltip.behaviour3": "将会砍倒碰撞到的树木", "block.create.stockpile_switch.tooltip": "stockpile_switch", - "block.create.stockpile_switch.tooltip.summary": "æ ¹æ�®è¿žæŽ¥çš„容器_存储空间_çš„å� ç”¨æƒ…况切æ�¢çº¢çŸ³ä¿¡å�·å¼ºåº¦.", - "block.create.stockpile_switch.tooltip.condition1": "低于下é™�æ—¶", - "block.create.stockpile_switch.tooltip.behaviour1": "å�œæ­¢æ��供红石信å�·", - "block.create.stockpile_switch.tooltip.condition2": "超过上é™�æ—¶", - "block.create.stockpile_switch.tooltip.behaviour2": "开始æ��供红石信å�·,直到å†�次到达下é™�.", - "block.create.stockpile_switch.tooltip.control1": "当å�³é”®æ–¹å�—æ—¶", - "block.create.stockpile_switch.tooltip.action1": "打开é…�ç½®é�¢æ�¿", + "block.create.stockpile_switch.tooltip.summary": "根据连接的容器_存储空间_的占用情况切换红石信号强度.", + "block.create.stockpile_switch.tooltip.condition1": "低于下限时", + "block.create.stockpile_switch.tooltip.behaviour1": "停止提供红石信号", + "block.create.stockpile_switch.tooltip.condition2": "超过上限时", + "block.create.stockpile_switch.tooltip.behaviour2": "开始提供红石信号,直到再次到达下限.", + "block.create.stockpile_switch.tooltip.control1": "当右键方块时", + "block.create.stockpile_switch.tooltip.action1": "打开配置面板", "block.create.redstone_link.tooltip": "REDSTONE LINK", - "block.create.redstone_link.tooltip.summary": "无线红石信å�·ç»ˆç«¯,å�¯ä»¥ä½¿ç”¨ä»»ä½•ç‰©å“�编辑终端频é�“. 虽然è·�离有é™�，但是也挺远的.", - "block.create.redstone_link.tooltip.condition1": "当å�¯ç”¨æ—¶", - "block.create.redstone_link.tooltip.behaviour1": "接收相å�Œé¢‘é�“æ��供的红石信å�·.", - "block.create.redstone_link.tooltip.control1": "当手æŒ�æ–¹å�—å�³é”®æ–¹å�—æ—¶", - "block.create.redstone_link.tooltip.action1": "手æŒ�ä»»æ„�物å“�为其设置频é�“,å�¯ä»¥ç»„å�ˆä¸¤ä¸ªç‰©å“�.", - "block.create.redstone_link.tooltip.control2": "当潜行å�³é”®æ—¶", - "block.create.redstone_link.tooltip.action2": "在终端模å¼�和接收模å¼�之间切æ�¢.", + "block.create.redstone_link.tooltip.summary": "无线红石信号终端,可以使用任何物品编辑终端频道. 虽然距离有限，但是也挺远的.", + "block.create.redstone_link.tooltip.condition1": "当启用时", + "block.create.redstone_link.tooltip.behaviour1": "接收相同频道提供的红石信号.", + "block.create.redstone_link.tooltip.control1": "当手持方块右键方块时", + "block.create.redstone_link.tooltip.action1": "手持任意物品为其设置频道,可以组合两个物品.", + "block.create.redstone_link.tooltip.control2": "当潜行右键时", + "block.create.redstone_link.tooltip.action2": "在终端模式和接收模式之间切换.", "block.create.nixie_tube.tooltip": "NIXIE TUBE", - "block.create.nixie_tube.tooltip.summary": "一个花里胡哨的红石强度显示器，范围：0到15。", - "block.create.nixie_tube.tooltip.condition1": "被红石激活时", - "block.create.nixie_tube.tooltip.behaviour1": "直观的显示当å‰�红石型å�·çš„强度", + "block.create.nixie_tube.tooltip.summary": "一个花里胡哨的红石强度显示器，范围：0到15。", + "block.create.nixie_tube.tooltip.condition1": "被红石激活时", + "block.create.nixie_tube.tooltip.behaviour1": "直观的显示当前红石型号的强度", "block.create.redstone_contact.tooltip": "REDSTONE CONTACT", - "block.create.redstone_contact.tooltip.summary": "一ç§�用于高级红石装置的设备. å�ªèƒ½ä¸¤ä¸¤å·¥ä½œ. å�¯ä»¥è¢«_动力活塞_å’Œ_动力轴承_等带动", - "block.create.redstone_contact.tooltip.condition1": "当正对é�¢æ”¾ç½®ä¹Ÿæ”¾ç½®_相互æœ�å�‘_的接触信å�·å�‘生器时", - "block.create.redstone_contact.tooltip.behaviour1": "æ��ä¾›_红石信å�·_.", - "block.create.redstone_contact.tooltip.condition2": "当移动时", - "block.create.redstone_contact.tooltip.behaviour2": "如果接触到其他信å�·å�‘生器，使其å�‘出红石信å�·.", + "block.create.redstone_contact.tooltip.summary": "一种用于高级红石装置的设备. 只能两两工作. 可以被_动力活塞_和_动力轴承_等带动", + "block.create.redstone_contact.tooltip.condition1": "当正对面放置也放置_相互朝向_的接触信号发生器时", + "block.create.redstone_contact.tooltip.behaviour1": "提供_红石信号_.", + "block.create.redstone_contact.tooltip.condition2": "当移动时", + "block.create.redstone_contact.tooltip.behaviour2": "如果接触到其他信号发生器，使其发出红石信号.", "block.create.adjustable_crate.tooltip": "ADJUSTABLE CRATE", - "block.create.adjustable_crate.tooltip.summary": "该箱å­�å…�许对其容é‡�进行调整,最大å�¯ä»¥å®¹çº³_16组_物å“�.", - "block.create.adjustable_crate.tooltip.control1": "当å�³é”®æ–¹å�—æ—¶", - "block.create.adjustable_crate.tooltip.action1": "打开箱å­�", + "block.create.adjustable_crate.tooltip.summary": "该箱子允许对其容量进行调整,最大可以容纳_16组_物品.", + "block.create.adjustable_crate.tooltip.control1": "当右键方块时", + "block.create.adjustable_crate.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.creative_crate.tooltip.summary": "这个容器可以给临近的 _蓝图大炮_ 提供无限物品以及燃料 （创造专用物品）", + "block.create.creative_crate.tooltip.condition1": "当标记了物品时", + "block.create.creative_crate.tooltip.behaviour1": "容器将会从虚空中提供_无限量_的标记物品，并且任何放置到容器中的物品都会被_送入虚空_", "block.create.deployer.tooltip": "DEPLOYER", - "block.create.deployer.tooltip.summary": "它是一个_机械手_,将尽å�¯èƒ½_模仿玩家_的行为,也能将方å�—从容器中å�–出并_放置_. å�¯ä»¥è®¾ç½®_白å��å�•_.", - "block.create.deployer.tooltip.condition1": "被供能时", - "block.create.deployer.tooltip.behaviour1": "机械手å�¯ä»¥æœ€å¤šä¼¸é•¿_两个方å�—_çš„è·�离", - "block.create.deployer.tooltip.condition2": "当使用扳手时", - "block.create.deployer.tooltip.behaviour2": "将会å�¯ç”¨æ‹³å¤´æ¨¡å¼�,在拳头模å¼�之下,机械臂将会试图使用手中的物å“�_ç ´å��æ–¹å�—_,或者_攻击实体_.", + "block.create.deployer.tooltip.summary": "它是一个_机械手_,将尽可能_模仿玩家_的行为,也能将方块从容器中取出并_放置_. 可以设置_白名单_.", + "block.create.deployer.tooltip.condition1": "被供能时", + "block.create.deployer.tooltip.behaviour1": "机械手可以最多伸长_两个方块_的距离", + "block.create.deployer.tooltip.condition2": "当使用扳手时", + "block.create.deployer.tooltip.behaviour2": "将会启用拳头模式,在拳头模式之下,机械臂将会试图使用手中的物品_破坏方块_,或者_攻击实体_.", "block.create.funnel.tooltip": "FUNNEL", - "block.create.funnel.tooltip.summary": "接收传é€�带上的物å“�到_连接的容器_,必须放置在_正对_ä¼ é€�带的_æ–¹å�‘_å�Š_高度_.", - "block.create.funnel.tooltip.condition1": "æ��å�–ä¼ é€�带物å“�", - "block.create.funnel.tooltip.behaviour1": "ä½�于黄铜机壳加固的传é€�带_边上_或者_末端_æ—¶,ä¼ é€�带æ¼�æ–—å�¯ä»¥å°†ç‰©å“�从传é€�带上_拿出_. 传动带æ¼�斗阻塞时_ä¸�会阻塞_ä¼ é€�带.", + "block.create.funnel.tooltip.summary": "接收传送带上的物品到_连接的容器_,必须放置在_正对_传送带的_方向_及_高度_.", + "block.create.funnel.tooltip.condition1": "提取传送带物品", + "block.create.funnel.tooltip.behaviour1": "位于黄铜机壳加固的传送带_边上_或者_末端_时,传送带漏斗可以将物品从传送带上_拿出_. 传动带漏斗阻塞时_不会阻塞_传送带.", "block.create.belt_tunnel.tooltip": "BELT TUNNEL", - "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": "当使用扳手å�³é”®ä¾§é�¢æ—¶", - "block.create.belt_tunnel.tooltip.action2": "如果传é€�带隧é�“有_å°�窗å�£_，调整其窗å�£å†…çš„_é�®å¸˜é«˜åº¦_", + "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": "当使用扳手右键侧面时", + "block.create.belt_tunnel.tooltip.action2": "如果传送带隧道有_小窗口_，调整其窗口内的_遮帘高度_", "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.summary": "一种坚固的机壳,有多种用处.", + "block.create.brass_casing.tooltip.condition1": "当被使用在传送带上时", + "block.create.brass_casing.tooltip.behaviour1": "当传送带上装配有黄铜机壳时,可以在传送带上安装_传送带隧道_、_提取器_、_传输器_、_传送带漏斗_等物品", "block.create.belt_observer.tooltip": "BELT OBSERVER", - "block.create.belt_observer.tooltip.summary": "检测_ä¼ é€�带_上ç»�过侦测器的物å“�ã€�实体. 使用_扳手_å°†å�¯ä»¥ä¿®æ”¹å®ƒçš„模å¼�. é�žç‰©å“�实体总会以观测模å¼�ç»�行侦测. å�¯è¿›è¡Œç‰©å“�标记", - "block.create.belt_observer.tooltip.condition1": "观测模å¼�", - "block.create.belt_observer.tooltip.behaviour1": "当观测到传é€�带上有_匹é…�的物å“�_或者实体时,将会æ��ä¾›_红石信å�·_", - "block.create.belt_observer.tooltip.condition2": "脉冲模å¼�", - "block.create.belt_observer.tooltip.behaviour2": "当侦测器中心线_匹é…�_到物å“�时，将会å�‘出_红石脉冲_", - "block.create.belt_observer.tooltip.condition3": "转移模å¼�", - "block.create.belt_observer.tooltip.behaviour3": "å°†_匹é…�的物å“�_转移至侦测器å‰�方的传é€�带. 如果目标ä½�置被堵塞,物å“�将会_å�œä¸‹_等待转移.", - "block.create.belt_observer.tooltip.condition4": "å�‡åˆ†æ¨¡å¼�", - "block.create.belt_observer.tooltip.behaviour4": "将匹é…�的物å“�_分æˆ�两部分_,一å�Šçš„物å“�被传é€�到å‰�方的传é€�带.", + "block.create.belt_observer.tooltip.summary": "检测_传送带_上经过侦测器的物品、实体. 使用_扳手_将可以修改它的模式. 非物品实体总会以观测模式经行侦测. 可进行物品标记", + "block.create.belt_observer.tooltip.condition1": "观测模式", + "block.create.belt_observer.tooltip.behaviour1": "当观测到传送带上有_匹配的物品_或者实体时,将会提供_红石信号_", + "block.create.belt_observer.tooltip.condition2": "脉冲模式", + "block.create.belt_observer.tooltip.behaviour2": "当侦测器中心线_匹配_到物品时，将会发出_红石脉冲_", + "block.create.belt_observer.tooltip.condition3": "转移模式", + "block.create.belt_observer.tooltip.behaviour3": "将_匹配的物品_转移至侦测器前方的传送带. 如果目标位置被堵塞,物品将会_停下_等待转移.", + "block.create.belt_observer.tooltip.condition4": "均分模式", + "block.create.belt_observer.tooltip.behaviour4": "将匹配的物品_分成两部分_,一半的物品被传送到前方的传送带.", "block.create.pulse_repeater.tooltip": "PULSE REPEATER", - "block.create.pulse_repeater.tooltip.summary": "一个简å�•çš„电路元件,将通过的红石信å�·å�˜ä¸º1tick.", + "block.create.pulse_repeater.tooltip.summary": "一个简单的电路元件,将通过的红石信号变为1tick.", "block.create.adjustable_repeater.tooltip": "FLEX REPEATER", - "block.create.adjustable_repeater.tooltip.summary": "高级中继器,最大å�¯è®¾ç½®30分钟延迟", + "block.create.adjustable_repeater.tooltip.summary": "高级中继器,最大可设置30分钟延迟", "block.create.adjustable_pulse_repeater.tooltip": "FLEX PULSE REPEATER", - "block.create.adjustable_pulse_repeater.tooltip.summary": "一ç§�å�•æ¬¡1tick的红石脉冲器，å�¯ä»¥è°ƒèŠ‚延时至30min", + "block.create.adjustable_pulse_repeater.tooltip.summary": "一种单次1tick的红石脉冲器，可以调节延时至30min", "block.create.analog_lever.tooltip": "ANALOG LEVER", - "block.create.analog_lever.tooltip.summary": "一ç§�å�¯ä»¥è°ƒèŠ‚ä»»æ„�ä¿¡å�·å¼ºåº¦çš„推æ�†.", + "block.create.analog_lever.tooltip.summary": "一种可以调节任意信号强度的推杆.", "block.create.powered_toggle_latch.tooltip": "POWERED TOGGLE LATCH", - "block.create.powered_toggle_latch.tooltip.summary": "一ç§�拉æ�†ï¼Œåœ¨çº¢çŸ³ç”µè·¯ä¸­å�¯ä»¥ç”¨ä½œt触å�‘器.", + "block.create.powered_toggle_latch.tooltip.summary": "一种拉杆，在红石电路中可以用作t触发器.", "block.create.powered_latch.tooltip": "POWERED LATCH", - "block.create.powered_latch.tooltip.summary": "一ç§�拉æ�†,在红石电路中用作é”�存器,从å�Žæ–¹è¾“入将会å�¯ç”¨è¿™ä¸ªæ‹‰æ�†,从侧边输入将会é‡�置这个拉æ�†.", + "block.create.powered_latch.tooltip.summary": "一种拉杆,在红石电路中用作锁存器,从后方输入将会启用这个拉杆,从侧边输入将会重置这个拉杆.", "block.create.speedometer.tooltip": "SPEEDOMETER", - "block.create.speedometer.tooltip.summary": "测é‡�并展示连接网络的旋转速度,支æŒ�使用红石比较器", - "block.create.speedometer.tooltip.condition1": "接入动力时", - "block.create.speedometer.tooltip.behaviour1": "将会用颜色展示速度的大å°�,绿-æ…¢ã€�è“�-中ã€�ç´«-å¿«.", + "block.create.speedometer.tooltip.summary": "测量并展示连接网络的旋转速度,支持使用红石比较器", + "block.create.speedometer.tooltip.condition1": "接入动力时", + "block.create.speedometer.tooltip.behaviour1": "将会用颜色展示速度的大小,绿-慢、蓝-中、紫-快.", "block.create.stressometer.tooltip": "STRESSOMETER", - "block.create.stressometer.tooltip.summary": "测é‡�并展示连接网络的应力值,支æŒ�红石比较器", - "block.create.stressometer.tooltip.condition1": "接入动力时", - "block.create.stressometer.tooltip.behaviour1": "将会用颜色展示承å�—的应力. 如果网络过载则会瘫痪，必须å‡�少机器或者增加动力", + "block.create.stressometer.tooltip.summary": "测量并展示连接网络的应力值,支持红石比较器", + "block.create.stressometer.tooltip.condition1": "接入动力时", + "block.create.stressometer.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": "打磨_副手_上或者_准心所指_的物å“�", + "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.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": "一ç§�用_光辉_锻造的化å�ˆç‰©æ��æ–™.", + "item.create.refined_radiance.tooltip.summary": "一种用_光辉_锻造的化合物材料.", "item.create.shadow_steel.tooltip": "SHADOW STEEL", - "item.create.shadow_steel.tooltip.summary": "一ç§�用_虚空_锻造的化å�ˆç‰©æ��æ–™.", + "item.create.shadow_steel.tooltip.summary": "一种用_虚空_锻造的化合物材料.", "item.create.crafter_slot_cover.tooltip": "SLOT COVER", - "item.create.crafter_slot_cover.tooltip.summary": "用æ�¥æ ‡è®°_机械制造机_以ä¸�放入物å“�. 在制造与桶类似的斜å�‘å�ˆæˆ�表时é�žå¸¸æœ‰ç”¨.", + "item.create.crafter_slot_cover.tooltip.summary": "用来标记_机械制造机_以不放入物品. 在制造与桶类似的斜向合成表时非常有用.", "create.tooltip.wip": "WIP", - "create.tooltip.workInProgress": "工作进行中!", - "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.tooltip.workInProgress": "工作进行中!", + "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": "试试就逝世", "_": "Thank you for translating Create!" diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index a291eadeb..b83263266 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -27,8 +27,8 @@ import com.simibubi.create.content.contraptions.components.actors.SeatMovementBe import com.simibubi.create.content.contraptions.components.clock.CuckooClockBlock; import com.simibubi.create.content.contraptions.components.crafter.CrafterCTBehaviour; import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock; -import com.simibubi.create.content.contraptions.components.crank.HandCrankBlock; import com.simibubi.create.content.contraptions.components.crank.AllValveHandles; +import com.simibubi.create.content.contraptions.components.crank.HandCrankBlock; import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelBlock; import com.simibubi.create.content.contraptions.components.crusher.CrushingWheelControllerBlock; import com.simibubi.create.content.contraptions.components.deployer.DeployerBlock; @@ -143,11 +143,8 @@ import com.simibubi.create.foundation.utility.DyeHelper; import com.simibubi.create.foundation.worldgen.OxidizingBlock; import com.tterrag.registrate.providers.RegistrateRecipeProvider; import com.tterrag.registrate.util.entry.BlockEntry; + import net.minecraft.block.AbstractBlock; -import net.minecraft.advancements.criterion.InventoryChangeTrigger; -import net.minecraft.advancements.criterion.ItemPredicate; -import net.minecraft.advancements.criterion.MinMaxBounds; -import net.minecraft.advancements.criterion.EntityPredicate.AndPredicate; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.SoundType; diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java index ed8357930..1495cbf79 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java +++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java @@ -45,7 +45,6 @@ import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.item.crafting.ShapedRecipe; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; @JeiPlugin diff --git a/src/main/java/com/simibubi/create/compat/jei/EmptyBackground.java b/src/main/java/com/simibubi/create/compat/jei/EmptyBackground.java index 504a3418a..eeed3d260 100644 --- a/src/main/java/com/simibubi/create/compat/jei/EmptyBackground.java +++ b/src/main/java/com/simibubi/create/compat/jei/EmptyBackground.java @@ -1,6 +1,7 @@ package com.simibubi.create.compat.jei; import com.mojang.blaze3d.matrix.MatrixStack; + import mezz.jei.api.gui.drawable.IDrawable; public class EmptyBackground implements IDrawable { diff --git a/src/main/java/com/simibubi/create/compat/jei/category/BlastingViaFanCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/BlastingViaFanCategory.java index 0bb6af6fc..f3acb0752 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/BlastingViaFanCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/BlastingViaFanCategory.java @@ -1,7 +1,6 @@ package com.simibubi.create.compat.jei.category; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.gui.GuiGameElement; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java index 0198612b9..48f89f043 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java @@ -5,7 +5,6 @@ import static com.simibubi.create.foundation.gui.AllGuiTextures.BLOCKZAPPER_UPGR import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java index a7f151d4c..7c9753311 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/CreateRecipeCategory.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; public abstract class CreateRecipeCategory> implements IRecipeCategory { diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java index 9e9c348dc..dbdbd4cbe 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/MechanicalCraftingCategory.java @@ -3,7 +3,6 @@ package com.simibubi.create.compat.jei.category; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java index 2fbe47794..46091b49f 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/MixingCategory.java @@ -3,9 +3,9 @@ package com.simibubi.create.compat.jei.category; import java.util.ArrayList; import java.util.List; -import com.mojang.blaze3d.matrix.MatrixStack; import org.apache.commons.lang3.mutable.MutableInt; +import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlocks; import com.simibubi.create.compat.jei.category.animations.AnimatedBlazeBurner; import com.simibubi.create.compat.jei.category.animations.AnimatedMixer; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java index 9f0a7da56..43248d03a 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.List; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.processing.ProcessingOutput; import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java index 6abbb0f4a..ad9502d59 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java @@ -3,7 +3,6 @@ package com.simibubi.create.compat.jei.category; import java.util.Arrays; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java index 85f50364d..a0ae6825f 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.List; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.components.fan.SplashingRecipe; import com.simibubi.create.content.contraptions.processing.ProcessingOutput; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java index 7d17fb862..9de3c0081 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedBlazeBurner.java @@ -1,7 +1,6 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.HeatLevel; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java index 08ec5cff8..dc523fa03 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java @@ -1,7 +1,6 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.GuiGameElement; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrushingWheels.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrushingWheels.java index 8253141fe..cb07eadd9 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrushingWheels.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrushingWheels.java @@ -5,7 +5,6 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.gui.GuiGameElement; -import com.simibubi.create.foundation.utility.MatrixStacker; import net.minecraft.block.BlockState; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction.Axis; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java index b53aff4d7..80bc6a479 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java @@ -1,7 +1,6 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.gui.AllGuiTextures; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java index bf7156d87..4f59ec139 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java @@ -1,7 +1,6 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.gui.GuiGameElement; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java index 122c28dfe..9a0b92551 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java @@ -3,7 +3,6 @@ package com.simibubi.create.compat.jei.category.animations; import static com.simibubi.create.foundation.utility.AnimationTickHolder.ticks; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.gui.GuiGameElement; diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java index 4df2b5a7a..eeb9cb392 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java @@ -1,7 +1,6 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.components.saw.SawBlock; import com.simibubi.create.foundation.gui.AllGuiTextures; diff --git a/src/main/java/com/simibubi/create/content/contraptions/KineticDebugger.java b/src/main/java/com/simibubi/create/content/contraptions/KineticDebugger.java index 356da57fd..f62c174bc 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/KineticDebugger.java +++ b/src/main/java/com/simibubi/create/content/contraptions/KineticDebugger.java @@ -18,8 +18,8 @@ import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; public class KineticDebugger { diff --git a/src/main/java/com/simibubi/create/content/contraptions/TorquePropagator.java b/src/main/java/com/simibubi/create/content/contraptions/TorquePropagator.java index 47cb219a4..6dfae6185 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/TorquePropagator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/TorquePropagator.java @@ -5,10 +5,8 @@ import java.util.Map; import com.simibubi.create.Create; import com.simibubi.create.content.contraptions.base.KineticTileEntity; - import com.simibubi.create.foundation.utility.WorldHelper; -import net.minecraft.util.registry.DynamicRegistries; -import net.minecraft.util.registry.Registry; + import net.minecraft.world.IWorld; public class TorquePropagator { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java index 80c00a60d..d9200bca5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java @@ -1,9 +1,11 @@ package com.simibubi.create.content.contraptions.components.actors; +import javax.annotation.ParametersAreNonnullByDefault; + import com.simibubi.create.AllShapes; import com.simibubi.create.content.contraptions.wrench.IWrenchable; - import com.simibubi.create.foundation.utility.BlockHelper; + import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -19,8 +21,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; -import javax.annotation.ParametersAreNonnullByDefault; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public abstract class AttachedActorBlock extends HorizontalBlock implements IWrenchable { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java index f82c646c0..ced7a4f2f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java @@ -1,10 +1,13 @@ package com.simibubi.create.content.contraptions.components.actors; +import javax.annotation.ParametersAreNonnullByDefault; + import com.simibubi.create.AllShapes; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.base.DirectionalKineticBlock; import com.simibubi.create.foundation.block.ITE; +import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.material.PushReaction; @@ -23,9 +26,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class DrillBlock extends DirectionalKineticBlock implements ITE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java index 855304f00..84226b258 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterMovementBehaviour.java @@ -18,8 +18,8 @@ import net.minecraft.block.KelpBlock; import net.minecraft.block.SugarCaneBlock; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.item.ItemStack; -import net.minecraft.state.Property; import net.minecraft.state.IntegerProperty; +import net.minecraft.state.Property; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceMovement.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceMovement.java index f91b4dca7..e5677918c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceMovement.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceMovement.java @@ -14,7 +14,7 @@ import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -25,8 +25,8 @@ public class PortableStorageInterfaceMovement extends MovementBehaviour { static final String _clientPrevPos_ = "ClientPrevPos"; @Override - public Vec3d getActiveAreaOffset(MovementContext context) { - return new Vec3d(context.state.get(PortableStorageInterfaceBlock.FACING) + public Vector3d getActiveAreaOffset(MovementContext context) { + return Vector3d.of(context.state.get(PortableStorageInterfaceBlock.FACING) .getDirectionVec()).scale(1.85f); } @@ -58,9 +58,9 @@ public class PortableStorageInterfaceMovement extends MovementBehaviour { return false; context.data.put(_workingPos_, NBTUtil.writeBlockPos(psi.getPos())); if (!context.world.isRemote) { - Vec3d diff = VecHelper.getCenterOf(psi.getPos()) + Vector3d diff = VecHelper.getCenterOf(psi.getPos()) .subtract(context.position); - diff = VecHelper.project(diff, new Vec3d(currentFacing.getDirectionVec())); + diff = VecHelper.project(diff, Vector3d.of(currentFacing.getDirectionVec())); float distance = (float) (diff.length() + 1.85f - 1); psi.startTransferringTo(context.contraption, distance); } else { @@ -136,11 +136,11 @@ public class PortableStorageInterfaceMovement extends MovementBehaviour { } private Optional getCurrentFacingIfValid(MovementContext context) { - Vec3d directionVec = new Vec3d(context.state.get(PortableStorageInterfaceBlock.FACING) + Vector3d directionVec = Vector3d.of(context.state.get(PortableStorageInterfaceBlock.FACING) .getDirectionVec()); directionVec = VecHelper.rotate(directionVec, context.rotation.x, context.rotation.y, context.rotation.z); Direction facingFromVector = Direction.getFacingFromVector(directionVec.x, directionVec.y, directionVec.z); - if (directionVec.distanceTo(new Vec3d(facingFromVector.getDirectionVec())) > 1 / 8f) + if (directionVec.distanceTo(Vector3d.of(facingFromVector.getDirectionVec())) > 1 / 8f) return Optional.empty(); return Optional.of(facingFromVector); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceTileEntity.java index 9c5e3abcd..a9fe85edb 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceTileEntity.java @@ -9,6 +9,7 @@ import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.utility.LerpedFloat; +import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; @@ -70,8 +71,8 @@ public class PortableStorageInterfaceTileEntity extends SmartTileEntity { } @Override - protected void read(CompoundNBT compound, boolean clientPacket) { - super.read(compound, clientPacket); + protected void fromTag(BlockState state, CompoundNBT compound, boolean clientPacket) { + super.fromTag(state, compound, clientPacket); transferTimer = compound.getInt("Timer"); distance = compound.getFloat("Distance"); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/ContraptionBlockSource.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/ContraptionBlockSource.java index 467a18f2c..dd28f58ef 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/ContraptionBlockSource.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/ContraptionBlockSource.java @@ -1,7 +1,10 @@ package com.simibubi.create.content.contraptions.components.actors.dispenser; +import javax.annotation.Nullable; + import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.foundation.utility.BlockHelper; + import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.dispenser.IBlockSource; @@ -10,11 +13,8 @@ import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import javax.annotation.Nullable; - @MethodsReturnNonnullByDefault public class ContraptionBlockSource implements IBlockSource { private final BlockPos pos; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java index 1cafd550d..17c1887ed 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java @@ -1,7 +1,12 @@ package com.simibubi.create.content.contraptions.components.actors.dispenser; +import java.util.HashMap; + +import javax.annotation.ParametersAreNonnullByDefault; + import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.foundation.utility.VecHelper; + import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Block; import net.minecraft.block.Blocks; @@ -15,9 +20,6 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import javax.annotation.ParametersAreNonnullByDefault; -import java.util.HashMap; - public class DispenserMovementBehaviour extends DropperMovementBehaviour { private static final HashMap MOVED_DISPENSE_ITEM_BEHAVIOURS = new HashMap<>(); private static final HashMap MOVED_PROJECTILE_DISPENSE_BEHAVIOURS = new HashMap<>(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DropperMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DropperMovementBehaviour.java index b8f5d1c82..27aa13c60 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DropperMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DropperMovementBehaviour.java @@ -1,18 +1,19 @@ package com.simibubi.create.content.contraptions.components.actors.dispenser; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.foundation.item.ItemHelper; + import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - public class DropperMovementBehaviour extends MovementBehaviour { protected static final MovedDefaultDispenseItemBehaviour defaultBehaviour = new MovedDefaultDispenseItemBehaviour(); private static final Random RNG = new Random(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/IMovedDispenseItemBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/IMovedDispenseItemBehaviour.java index 3f2ca2366..e00a451f5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/IMovedDispenseItemBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/IMovedDispenseItemBehaviour.java @@ -1,6 +1,9 @@ package com.simibubi.create.content.contraptions.components.actors.dispenser; +import java.util.Random; + import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; + import net.minecraft.block.BeehiveBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -9,7 +12,10 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnReason; import net.minecraft.entity.item.TNTEntity; -import net.minecraft.entity.projectile.*; +import net.minecraft.entity.projectile.FireworkRocketEntity; +import net.minecraft.entity.projectile.PotionEntity; +import net.minecraft.entity.projectile.ProjectileEntity; +import net.minecraft.entity.projectile.SmallFireballEntity; import net.minecraft.fluid.FlowingFluid; import net.minecraft.fluid.Fluid; import net.minecraft.item.ItemStack; @@ -29,8 +35,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import java.util.Random; - public interface IMovedDispenseItemBehaviour { static void init() { MovedProjectileDispenserBehaviour movedPotionDispenseItemBehaviour = new MovedProjectileDispenserBehaviour() { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedDefaultDispenseItemBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedDefaultDispenseItemBehaviour.java index dc95e1144..8cafefeb4 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedDefaultDispenseItemBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedDefaultDispenseItemBehaviour.java @@ -2,6 +2,7 @@ package com.simibubi.create.content.contraptions.components.actors.dispenser; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.foundation.utility.VecHelper; + import net.minecraft.block.DispenserBlock; import net.minecraft.entity.item.ItemEntity; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedProjectileDispenserBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedProjectileDispenserBehaviour.java index 4d88a7dfd..bd39d404f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedProjectileDispenserBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/MovedProjectileDispenserBehaviour.java @@ -1,9 +1,13 @@ package com.simibubi.create.content.contraptions.components.actors.dispenser; +import java.lang.reflect.Method; + +import javax.annotation.Nullable; + import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; + import net.minecraft.dispenser.IPosition; import net.minecraft.dispenser.ProjectileDispenseBehavior; -import net.minecraft.entity.Entity; import net.minecraft.entity.projectile.ProjectileEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -12,9 +16,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import javax.annotation.Nullable; -import java.lang.reflect.Method; - public abstract class MovedProjectileDispenserBehaviour extends MovedDefaultDispenseItemBehaviour { @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java index 080b29baf..612394898 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/ConnectedInputHandler.java @@ -1,7 +1,21 @@ package com.simibubi.create.content.contraptions.components.crafter; +import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.function.Consumer; +import java.util.stream.Collectors; + import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.BlockHelper; + import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; @@ -16,12 +30,6 @@ import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.wrapper.CombinedInvWrapper; -import java.util.*; -import java.util.function.Consumer; -import java.util.stream.Collectors; - -import static com.simibubi.create.content.contraptions.base.HorizontalKineticBlock.HORIZONTAL_FACING; - public class ConnectedInputHandler { public static boolean shouldConnect(World world, BlockPos pos, Direction face, Direction direction) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterRenderer.java index 0f856890e..c46aec35e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterRenderer.java @@ -19,7 +19,6 @@ import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; @@ -29,6 +28,7 @@ import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; public class MechanicalCrafterRenderer extends SafeTileEntityRenderer { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/AllValveHandles.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/AllValveHandles.java index a6faae88f..a450ba28b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/AllValveHandles.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/AllValveHandles.java @@ -1,20 +1,21 @@ package com.simibubi.create.content.contraptions.components.crank; +import java.util.ArrayList; +import java.util.List; + import com.simibubi.create.AllTags; import com.simibubi.create.foundation.config.StressConfigDefaults; import com.simibubi.create.foundation.data.CreateRegistrate; import com.simibubi.create.foundation.data.SharedProperties; import com.tterrag.registrate.util.entry.BlockEntry; -import net.minecraft.item.DyeColor; -import java.util.ArrayList; -import java.util.List; +import net.minecraft.item.DyeColor; public class AllValveHandles { private static final List types = new ArrayList<>(); static { for (DyeColor color : DyeColor.values()) - types.add(color.getName()); + types.add(color.getString()); types.add("copper"); } public static final BlockEntry[] variants = new BlockEntry[types.size()]; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntity.java index 3dd9969b9..ddb0b03ef 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankTileEntity.java @@ -2,8 +2,8 @@ package com.simibubi.create.content.contraptions.components.crank; import com.simibubi.create.content.contraptions.base.GeneratingKineticTileEntity; -import net.minecraft.block.BlockState; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java index e93a929eb..48cdabe20 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java @@ -1,9 +1,10 @@ package com.simibubi.create.content.contraptions.components.crank; +import javax.annotation.ParametersAreNonnullByDefault; + import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllShapes; -import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; @@ -15,8 +16,6 @@ import net.minecraft.world.IBlockReader; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import javax.annotation.ParametersAreNonnullByDefault; - @ParametersAreNonnullByDefault public class ValveHandleBlock extends HandCrankBlock { private final boolean inCreativeTab; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java index 37d55f9d8..e50c9bd55 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java @@ -24,10 +24,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.Difficulty; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java index 4e407038a..47cbabe5d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.contraptions.components.deployer; +import javax.annotation.ParametersAreNonnullByDefault; + import com.simibubi.create.AllItems; import com.simibubi.create.AllShapes; import com.simibubi.create.AllTileEntities; @@ -8,6 +10,7 @@ import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; +import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.player.PlayerEntity; @@ -23,9 +26,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class DeployerBlock extends DirectionalAxisKineticBlock implements ITE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java index 3e14a7b89..55c436b45 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerFakePlayer.java @@ -29,7 +29,6 @@ import net.minecraft.util.EntityDamageSource; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java index 62c998801..d6f3e9c8d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerHandler.java @@ -6,34 +6,30 @@ import static net.minecraftforge.eventbus.api.Event.Result.DENY; import java.util.ArrayList; import java.util.List; -import com.simibubi.create.foundation.utility.BlockHelper; -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.block.*; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.Enchantments; -import net.minecraft.entity.ai.attributes.Attribute; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.server.management.PlayerInteractionManager; -import net.minecraft.stats.Stats; -import net.minecraft.tileentity.BeehiveTileEntity; -import net.minecraft.tileentity.TileEntity; import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.Multimap; import com.simibubi.create.content.contraptions.components.deployer.DeployerTileEntity.Mode; import com.simibubi.create.content.curiosities.tools.SandPaperItem; +import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; +import net.minecraft.advancements.CriteriaTriggers; +import net.minecraft.block.AbstractFireBlock; import net.minecraft.block.BeehiveBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.enchantment.Enchantments; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.inventory.EquipmentSlotType; @@ -45,6 +41,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundNBT; +import net.minecraft.server.management.PlayerInteractionManager; +import net.minecraft.stats.Stats; +import net.minecraft.tileentity.BeehiveTileEntity; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java index 4ef7829a6..798687296 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerRenderer.java @@ -23,9 +23,7 @@ import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.client.renderer.RenderType; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; @@ -34,7 +32,9 @@ import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; import net.minecraft.world.World; public class DeployerRenderer extends SafeTileEntityRenderer { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java index d4b1e9f73..74d771d7e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/AirCurrent.java @@ -32,11 +32,11 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.math.vector.Vector3i; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3i; import net.minecraft.world.World; public class AirCurrent { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanTileEntity.java index ed8b5e1e9..f2b9e6996 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanTileEntity.java @@ -6,8 +6,8 @@ import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlo import com.simibubi.create.content.logistics.block.chute.ChuteTileEntity; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.config.CKinetics; - import com.simibubi.create.foundation.utility.BlockHelper; + import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.properties.BlockStateProperties; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineTileEntity.java index f35b87823..54aa3e3a3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineTileEntity.java @@ -2,8 +2,8 @@ package com.simibubi.create.content.contraptions.components.flywheel.engine; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.config.AllConfigs; - import com.simibubi.create.foundation.utility.BlockHelper; + import net.minecraft.block.AbstractFurnaceBlock; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java index 444d03391..ebbda2284 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerTileEntity.java @@ -32,9 +32,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; - import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.items.IItemHandler; public class MechanicalMixerTileEntity extends BasinOperatingTileEntity { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java index 2570524ca..6d67d393e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.contraptions.components.saw; +import javax.annotation.ParametersAreNonnullByDefault; + import com.simibubi.create.AllShapes; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock; @@ -8,6 +10,7 @@ import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; + import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -29,8 +32,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class SawBlock extends DirectionalAxisKineticBlock implements ITE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java index 2409faab5..ce25648f7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java @@ -16,7 +16,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderType; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; @@ -24,6 +23,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.util.Rotation; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Vector3f; public class SawRenderer extends SafeTileEntityRenderer { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementTraits.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementTraits.java index 1f44316bb..663821555 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementTraits.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/BlockMovementTraits.java @@ -19,8 +19,8 @@ import com.simibubi.create.content.contraptions.components.structureMovement.pis import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyBlock; import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyTileEntity; import com.simibubi.create.content.logistics.block.redstone.RedstoneLinkBlock; - import com.simibubi.create.foundation.utility.BlockHelper; + import net.minecraft.block.AbstractPressurePlateBlock; import net.minecraft.block.AbstractRailBlock; import net.minecraft.block.BellBlock; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java index 985c73685..265dc264e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java @@ -17,7 +17,6 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; -import com.simibubi.create.foundation.utility.BlockHelper; import org.apache.commons.lang3.tuple.MutablePair; import org.apache.commons.lang3.tuple.Pair; @@ -42,6 +41,7 @@ import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateBlock; import com.simibubi.create.content.logistics.block.redstone.RedstoneContactBlock; import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.VecHelper; @@ -59,8 +59,8 @@ import net.minecraft.block.SlimeBlock; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.entity.Entity; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.ListNBT; import net.minecraft.nbt.NBTUtil; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java index de82b9a3f..a78665c7f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java @@ -9,13 +9,12 @@ import java.util.Iterator; import java.util.List; import java.util.stream.Stream; -import com.simibubi.create.AllMovementBehaviours; import org.apache.commons.lang3.mutable.MutableBoolean; import org.apache.commons.lang3.mutable.MutableObject; import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableSet; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllMovementBehaviours; import com.simibubi.create.content.contraptions.components.actors.BlockBreakingMovementBehaviour; import com.simibubi.create.content.contraptions.components.structureMovement.sync.ClientMotionPacket; import com.simibubi.create.foundation.collision.ContinuousOBBCollider.ContinuousSeparationManifold; @@ -37,11 +36,11 @@ import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.ReuseableStream; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.IBooleanFunction; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraft.world.gen.feature.template.Template.BlockInfo; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntity.java index 9c3b9f9c2..e619e3f92 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionEntity.java @@ -11,7 +11,6 @@ import java.util.UUID; import javax.annotation.Nullable; -import net.minecraft.entity.projectile.ProjectileEntity; import org.apache.commons.lang3.tuple.MutablePair; import com.simibubi.create.AllEntityTypes; @@ -38,6 +37,7 @@ import net.minecraft.entity.item.HangingEntity; import net.minecraft.entity.item.minecart.AbstractMinecartEntity; import net.minecraft.entity.item.minecart.FurnaceMinecartEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.ProjectileEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionInteractionHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionInteractionHandler.java index c8c5bcc08..433e1a004 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionInteractionHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionInteractionHandler.java @@ -14,8 +14,8 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.gen.feature.template.Template.BlockInfo; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRenderer.java index 3bc1b0b72..a9d2a119d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionRenderer.java @@ -21,12 +21,12 @@ import net.minecraft.client.renderer.BlockModelRenderer; import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.world.LightType; import net.minecraft.world.World; import net.minecraft.world.gen.feature.template.Template.BlockInfo; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementContext.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementContext.java index fd60631e6..a869c5ead 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementContext.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/MovementContext.java @@ -8,7 +8,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraft.world.gen.feature.template.Template.BlockInfo; -import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.util.Constants.NBT; public class MovementContext { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingTileEntity.java index c8a0ede48..57e6dc613 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingTileEntity.java @@ -1,6 +1,5 @@ package com.simibubi.create.content.contraptions.components.structureMovement.bearing; -import net.minecraft.block.BlockState; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.content.contraptions.base.KineticTileEntity; @@ -10,6 +9,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.bea import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.ServerSpeedProvider; +import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java index 296dc0d18..7c34773c5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java @@ -2,7 +2,6 @@ package com.simibubi.create.content.contraptions.components.structureMovement.gl import javax.annotation.Nullable; -import net.minecraft.world.server.ServerWorld; import org.apache.commons.lang3.Validate; import com.simibubi.create.AllEntityTypes; @@ -45,6 +44,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; +import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java index 4624ca2f9..e3b36e10c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java @@ -31,6 +31,8 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; +import net.minecraft.loot.LootContext; +import net.minecraft.loot.LootParameters; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.BooleanProperty; import net.minecraft.state.EnumProperty; @@ -48,16 +50,14 @@ import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.loot.LootContext; -import net.minecraft.loot.LootParameters; public class CartAssemblerBlock extends AbstractRailBlock implements ITE, IWrenchable, ISpecialBlockItemRequirement { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerTileEntity.java index 4e98a97be..8586cf008 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerTileEntity.java @@ -9,13 +9,14 @@ import com.simibubi.create.foundation.tileEntity.behaviour.CenteredSideValueBoxT import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.INamedIconOptions; import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollOptionBehaviour; +import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.state.properties.RailShape; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction.Axis; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.vector.Vector3d; public class CartAssemblerTileEntity extends SmartTileEntity { private static final int assemblyCooldown = 8; @@ -55,7 +56,7 @@ public class CartAssemblerTileEntity extends SmartTileEntity { if (d.getAxis() .isVertical()) return false; - if (!state.has(CartAssemblerBlock.RAIL_SHAPE)) + if (!BlockHelper.hasBlockStateProperty(state, CartAssemblerBlock.RAIL_SHAPE)) return false; RailShape railShape = state.get(CartAssemblerBlock.RAIL_SHAPE); return (d.getAxis() == Axis.X) == (railShape == RailShape.NORTH_SOUTH); @@ -63,7 +64,7 @@ public class CartAssemblerTileEntity extends SmartTileEntity { } @Override - protected Vec3d getSouthLocation() { + protected Vector3d getSouthLocation() { return VecHelper.voxelSpace(8, 8, 18); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/ItemHandlerModifiableFromIInventory.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/ItemHandlerModifiableFromIInventory.java index f0eae3e70..3dd313411 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/ItemHandlerModifiableFromIInventory.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/ItemHandlerModifiableFromIInventory.java @@ -1,14 +1,14 @@ package com.simibubi.create.content.contraptions.components.structureMovement.mounted; +import javax.annotation.Nonnull; +import javax.annotation.ParametersAreNonnullByDefault; + import mcp.MethodsReturnNonnullByDefault; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemHandlerHelper; -import javax.annotation.Nonnull; -import javax.annotation.ParametersAreNonnullByDefault; - @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java index 29dee066e..574e1a505 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java @@ -4,19 +4,21 @@ import static com.simibubi.create.content.contraptions.components.structureMovem import java.util.List; -import com.simibubi.create.foundation.utility.BlockHelper; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.components.structureMovement.AllContraptionTypes; import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; import com.simibubi.create.content.contraptions.components.structureMovement.mounted.CartAssemblerTileEntity.CartMovementMode; +import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.block.BlockState; +import net.minecraft.entity.Entity; import net.minecraft.entity.item.minecart.AbstractMinecartEntity; +import net.minecraft.inventory.IInventory; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.RailShape; @@ -25,12 +27,9 @@ import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraft.world.gen.feature.template.Template.BlockInfo; -import net.minecraft.entity.Entity; -import net.minecraft.inventory.IInventory; import net.minecraftforge.items.wrapper.CombinedInvWrapper; public class MountedContraption extends Contraption { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java index 25148136c..a0eb4546c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java @@ -25,10 +25,10 @@ import net.minecraft.util.IStringSerializable; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.common.Tags; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java index f0e1545ec..6d3b1d754 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java @@ -1,16 +1,19 @@ package com.simibubi.create.content.contraptions.components.structureMovement.piston; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isExtensionPole; + import com.simibubi.create.AllBlocks; import com.simibubi.create.AllShapes; import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState; import com.simibubi.create.foundation.block.ProperDirectionalBlock; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.IWaterLoggable; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemStack; import net.minecraft.state.EnumProperty; @@ -26,8 +29,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.World; -import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isExtensionPole; - public class MechanicalPistonHeadBlock extends ProperDirectionalBlock implements IWaterLoggable { public static final EnumProperty TYPE = BlockStateProperties.PISTON_TYPE; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java index b5c005a73..bfd5b1e41 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java @@ -1,16 +1,21 @@ package com.simibubi.create.content.contraptions.components.structureMovement.piston; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isExtensionPole; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isPiston; +import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.isPistonHead; + import com.simibubi.create.AllShapes; -import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.*; +import com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.PistonState; import com.simibubi.create.content.contraptions.wrench.IWrenchable; import com.simibubi.create.foundation.block.ProperDirectionalBlock; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.IWaterLoggable; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.item.BlockItemUseContext; import net.minecraft.state.StateContainer.Builder; import net.minecraft.state.properties.BlockStateProperties; @@ -24,8 +29,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.World; -import static com.simibubi.create.content.contraptions.components.structureMovement.piston.MechanicalPistonBlock.*; - public class PistonExtensionPoleBlock extends ProperDirectionalBlock implements IWrenchable, IWaterLoggable { public PistonExtensionPoleBlock(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java index aa342f454..b99397256 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java @@ -6,13 +6,14 @@ import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.base.HorizontalAxisKineticBlock; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.BlockHelper; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.IWaterLoggable; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemStack; import net.minecraft.state.EnumProperty; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyTileEntity.java index 55ec5624b..a412d3283 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyTileEntity.java @@ -8,13 +8,13 @@ import com.simibubi.create.content.contraptions.components.structureMovement.pis import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.tileEntity.behaviour.CenteredSideValueBoxTransform; import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; - import com.simibubi.create.foundation.utility.BlockHelper; + import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.IWaterLoggable; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntityType; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartTrain.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartTrain.java index f5e75eec1..8e3cbf39e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartTrain.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartTrain.java @@ -151,7 +151,7 @@ public class MinecartTrain { continue; if (stall) { - minecartCoupling.asCouple().forEach(ame -> ame.setMotion(Vec3d.ZERO)); + minecartCoupling.asCouple().forEach(ame -> ame.setMotion(Vector3d.ZERO)); continue; } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java index 05d2a3503..cb092ceff 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.contraptions.components.tracks; +import javax.annotation.Nonnull; + import net.minecraft.block.AbstractRailBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -13,8 +15,8 @@ import net.minecraft.state.EnumProperty; import net.minecraft.state.Property; import net.minecraft.state.StateContainer.Builder; import net.minecraft.state.properties.RailShape; -import net.minecraft.util.NonNullList; import net.minecraft.util.Direction.Axis; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; @@ -23,8 +25,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import javax.annotation.Nonnull; - public class ReinforcedRailBlock extends AbstractRailBlock { public static Property RAIL_SHAPE = diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java index 0ae961ef9..756ab2199 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java @@ -17,9 +17,9 @@ import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java index 3b5442ba7..07a9b9f2b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.contraptions.components.waterwheel; +import javax.annotation.ParametersAreNonnullByDefault; + import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock; @@ -11,8 +13,8 @@ import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.item.BlockItemUseContext; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; @@ -25,8 +27,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import javax.annotation.ParametersAreNonnullByDefault; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class WaterWheelBlock extends HorizontalKineticBlock implements ITE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidNetwork.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidNetwork.java index 9fcdb4b3e..32aad3077 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidNetwork.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidNetwork.java @@ -10,7 +10,6 @@ import java.util.Map; import java.util.Set; import com.google.common.collect.ImmutableList; -import com.simibubi.create.content.contraptions.KineticDebugger; import com.simibubi.create.foundation.utility.BlockFace; import com.simibubi.create.foundation.utility.Pair; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPropagator.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPropagator.java index 59826a7b5..c17099546 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPropagator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidPropagator.java @@ -5,7 +5,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.simibubi.create.foundation.utility.BlockHelper; import org.apache.commons.lang3.mutable.MutableObject; import com.simibubi.create.AllBlocks; @@ -15,7 +14,7 @@ import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeBlock; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.utility.BlockFace; -import com.simibubi.create.foundation.utility.Debug; +import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.outliner.Outline.OutlineParams; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidReactions.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidReactions.java index 6f0aefa79..0aa9e93c7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidReactions.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/FluidReactions.java @@ -5,8 +5,8 @@ import com.simibubi.create.foundation.utility.BlockHelper; import net.minecraft.block.Blocks; import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java index 4e9a911aa..6e08e78ea 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java @@ -9,8 +9,8 @@ import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.block.BlockState; import net.minecraft.block.FlowingFluidBlock; import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java index a6bed287b..8cb253f03 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java @@ -14,8 +14,8 @@ import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.IWaterLoggable; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemUseContext; import net.minecraft.network.DebugPacketSender; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java index e0ad1da7e..04b8078be 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java @@ -17,8 +17,8 @@ import net.minecraft.block.BlockState; import net.minecraft.block.IWaterLoggable; import net.minecraft.block.SixWayBlock; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemUseContext; import net.minecraft.network.DebugPacketSender; @@ -32,8 +32,8 @@ import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockDisplayReader; +import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.TickPriority; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveTileEntity.java index b3d3efc27..ea877bc2c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveTileEntity.java @@ -8,6 +8,7 @@ import com.simibubi.create.content.contraptions.fluids.FluidPipeAttachmentBehavi import com.simibubi.create.content.contraptions.fluids.FluidPipeBehaviour; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.LerpedFloat; import com.simibubi.create.foundation.utility.LerpedFloat.Chaser; @@ -18,7 +19,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.world.ILightReader; +import net.minecraft.world.IBlockDisplayReader; import net.minecraftforge.fluids.FluidStack; public class FluidValveTileEntity extends KineticTileEntity { @@ -28,7 +29,8 @@ public class FluidValveTileEntity extends KineticTileEntity { public FluidValveTileEntity(TileEntityType tileEntityTypeIn) { super(tileEntityTypeIn); pointer = LerpedFloat.linear() - .startWithValue(0).chase(0, 0, Chaser.LINEAR); + .startWithValue(0) + .chase(0, 0, Chaser.LINEAR); } @Override @@ -38,20 +40,20 @@ public class FluidValveTileEntity extends KineticTileEntity { pointer.chase(speed > 0 ? 1 : 0, getChaseSpeed(), Chaser.LINEAR); sendData(); } - + @Override public void tick() { super.tick(); pointer.tickChaser(); - + if (world.isRemote) return; - + BlockState blockState = getBlockState(); if (!(blockState.getBlock() instanceof FluidValveBlock)) return; boolean stateOpen = blockState.get(FluidValveBlock.ENABLED); - + if (stateOpen && pointer.getValue() == 0) { switchToBlockState(world, pos, blockState.with(FluidValveBlock.ENABLED, false)); return; @@ -73,8 +75,8 @@ public class FluidValveTileEntity extends KineticTileEntity { } @Override - protected void read(CompoundNBT compound, boolean clientPacket) { - super.read(compound, clientPacket); + protected void fromTag(BlockState state, CompoundNBT compound, boolean clientPacket) { + super.fromTag(state, compound, clientPacket); pointer.readNBT(compound.getCompound("Pointer"), clientPacket); } @@ -97,11 +99,11 @@ public class FluidValveTileEntity extends KineticTileEntity { @Override public boolean canTransferToward(FluidStack fluid, BlockState state, Direction direction, boolean inbound) { - if (state.has(FluidValveBlock.ENABLED) && state.get(FluidValveBlock.ENABLED)) + if (BlockHelper.hasBlockStateProperty(state, FluidValveBlock.ENABLED) && state.get(FluidValveBlock.ENABLED)) return super.canTransferToward(fluid, state, direction, inbound); return false; } - + } class ValvePipeAttachmentBehaviour extends FluidPipeAttachmentBehaviour { @@ -111,7 +113,8 @@ public class FluidValveTileEntity extends KineticTileEntity { } @Override - public AttachmentTypes getAttachment(ILightReader world, BlockPos pos, BlockState state, Direction direction) { + public AttachmentTypes getAttachment(IBlockDisplayReader world, BlockPos pos, BlockState state, + Direction direction) { AttachmentTypes attachment = super.getAttachment(world, pos, state, direction); BlockState facingState = world.getBlockState(pos.offset(direction)); diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java index ac10a550d..de94addc8 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleConfigScreen.java @@ -1,19 +1,20 @@ package com.simibubi.create.content.contraptions.goggles; +import java.util.ArrayList; +import java.util.List; + import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.gui.AbstractSimiScreen; import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.foundation.utility.Lang; + import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; -import java.util.ArrayList; -import java.util.List; - public class GoggleConfigScreen extends AbstractSimiScreen { private int offsetX; diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java index 098eb7745..b9a7056a2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java @@ -1,10 +1,13 @@ package com.simibubi.create.content.contraptions.goggles; +import java.util.ArrayList; +import java.util.List; + import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.gui.GuiGameElement; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.world.ClientWorld; @@ -21,9 +24,6 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import java.util.ArrayList; -import java.util.List; - @EventBusSubscriber(value = Dist.CLIENT) public class GoggleOverlayRenderer { diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java index cafff466e..a97ee29dd 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveGoggleInformation.java @@ -1,10 +1,10 @@ package com.simibubi.create.content.contraptions.goggles; -import net.minecraft.util.text.ITextComponent; - import java.text.DecimalFormat; import java.util.List; +import net.minecraft.util.text.ITextComponent; + /* * Implement this Interface in the TileEntity class that wants to add info to the screen * */ diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveHoveringInformation.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveHoveringInformation.java index cbcd50863..e4531bc91 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveHoveringInformation.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/IHaveHoveringInformation.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.contraptions.goggles; -import net.minecraft.util.text.ITextComponent; - import java.util.List; +import net.minecraft.util.text.ITextComponent; + /* * Implement this Interface in the TileEntity class that wants to add info to the screen * */ diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java b/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java index c29b790a1..a14893e78 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticle.java @@ -20,7 +20,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; public class AirFlowParticle extends SimpleAnimatedParticle { diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/AirParticle.java b/src/main/java/com/simibubi/create/content/contraptions/particle/AirParticle.java index fbb081449..ffe3e0e39 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/AirParticle.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/AirParticle.java @@ -14,7 +14,6 @@ import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; public class AirParticle extends SimpleAnimatedParticle { diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java b/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java index aca7739ff..f50fdf30d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticle.java @@ -1,6 +1,5 @@ package com.simibubi.create.content.contraptions.particle; -import net.minecraft.client.world.ClientWorld; import org.lwjgl.opengl.GL11; import com.mojang.blaze3d.platform.GlStateManager; @@ -15,10 +14,10 @@ import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.world.ClientWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; public class CubeParticle extends Particle { diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticle.java b/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticle.java index 974d13ba9..44dcdaa9a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticle.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/HeaterParticle.java @@ -10,7 +10,6 @@ import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.SimpleAnimatedParticle; import net.minecraft.client.world.ClientWorld; import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java b/src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java index fcbb058b7..957879125 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java +++ b/src/main/java/com/simibubi/create/content/contraptions/particle/RotationIndicatorParticle.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.world.ClientWorld; import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; public class RotationIndicatorParticle extends SimpleAnimatedParticle { diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinMovementBehaviour.java index 39b6f3d3b..b1f487ae7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinMovementBehaviour.java @@ -1,17 +1,18 @@ package com.simibubi.create.content.contraptions.processing; +import java.util.HashMap; +import java.util.Map; + import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.foundation.utility.VecHelper; + import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraftforge.items.ItemStackHandler; -import java.util.HashMap; -import java.util.Map; - public class BasinMovementBehaviour extends MovementBehaviour { public Map getOrReadInventory(MovementContext context) { Map map = new HashMap<>(); @@ -30,14 +31,14 @@ public class BasinMovementBehaviour extends MovementBehaviour { public void tick(MovementContext context) { super.tick(context); if (context.temporaryData == null || (boolean) context.temporaryData) { - Vec3d facingVec = VecHelper.rotate(new Vec3d(Direction.UP.getDirectionVec()), context.rotation.x, context.rotation.y, context.rotation.z); + Vector3d facingVec = VecHelper.rotate(Vector3d.of(Direction.UP.getDirectionVec()), context.rotation.x, context.rotation.y, context.rotation.z); facingVec.normalize(); if (Direction.getFacingFromVector(facingVec.x, facingVec.y, facingVec.z) == Direction.DOWN) dump(context, facingVec); } } - private void dump(MovementContext context, Vec3d facingVec) { + private void dump(MovementContext context, Vector3d facingVec) { getOrReadInventory(context).forEach((key, itemStackHandler) -> { for (int i = 0; i < itemStackHandler.getSlots(); i++) { if (itemStackHandler.getStackInSlot(i).isEmpty()) diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinRenderer.java index 1e0482853..73f93d8d0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/BasinRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/BasinRenderer.java @@ -11,13 +11,13 @@ import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java index f8b307df7..d4d5a50dc 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.ITag; -import net.minecraft.tags.Tag; import net.minecraft.util.IItemProvider; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java index 8c2870ae6..7d0efeddc 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/processing/burner/BlazeBurnerBlock.java @@ -19,6 +19,13 @@ import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; +import net.minecraft.loot.ConstantRange; +import net.minecraft.loot.ItemLootEntry; +import net.minecraft.loot.LootPool; +import net.minecraft.loot.LootTable; +import net.minecraft.loot.conditions.BlockStateProperty; +import net.minecraft.loot.conditions.ILootCondition.IBuilder; +import net.minecraft.loot.conditions.SurvivesExplosion; import net.minecraft.state.EnumProperty; import net.minecraft.state.Property; import net.minecraft.state.StateContainer.Builder; @@ -35,13 +42,6 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.loot.ConstantRange; -import net.minecraft.loot.ItemLootEntry; -import net.minecraft.loot.LootPool; -import net.minecraft.loot.LootTable; -import net.minecraft.loot.conditions.BlockStateProperty; -import net.minecraft.loot.conditions.ILootCondition.IBuilder; -import net.minecraft.loot.conditions.SurvivesExplosion; @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java index 4bda0b981..c67db6829 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/InstructionSpeedModifiers.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.simibubi.create.foundation.utility.Lang; + import net.minecraft.util.text.ITextComponent; public enum InstructionSpeedModifiers { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java index 8c0e03ae2..5ebd4fa50 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.contraptions.relays.advanced.sequencer; +import java.util.Vector; + import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.gui.AbstractSimiScreen; @@ -18,8 +20,6 @@ import net.minecraft.nbt.ListNBT; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import java.util.Vector; - public class SequencedGearshiftScreen extends AbstractSimiScreen { private final ItemStack renderedItem = AllBlocks.SEQUENCED_GEARSHIFT.asStack(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencerInstructions.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencerInstructions.java index 61708774d..e454125b5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencerInstructions.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencerInstructions.java @@ -5,6 +5,7 @@ import java.util.List; import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.utility.Lang; + import net.minecraft.util.text.ITextComponent; public enum SequencerInstructions { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java index e6349013d..a7b2f99e4 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java @@ -33,6 +33,7 @@ import net.minecraft.item.DyeColor; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; +import net.minecraft.loot.LootParameters; import net.minecraft.pathfinding.PathNodeType; import net.minecraft.state.BooleanProperty; import net.minecraft.state.EnumProperty; @@ -57,7 +58,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraft.loot.LootParameters; import net.minecraft.world.gen.DebugChunkGenerator; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java index 7e74053f8..93aa5a852 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltRenderer.java @@ -24,16 +24,16 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.settings.GraphicsFanciness; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.client.settings.GraphicsFanciness; import net.minecraft.entity.Entity; import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.math.vector.Vector3i; public class BeltRenderer extends SafeTileEntityRenderer { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java index 4066fba07..572fc124d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltShapes.java @@ -11,10 +11,10 @@ import com.simibubi.create.foundation.utility.VoxelShaper; import net.minecraft.block.BlockState; import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.IBooleanFunction; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.util.math.vector.Vector3d; public class BeltShapes { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorHandler.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorHandler.java index feb9b25ab..cab69fc94 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/item/BeltConnectorHandler.java @@ -7,8 +7,8 @@ import java.util.Random; import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock; import com.simibubi.create.foundation.config.AllConfigs; - import com.simibubi.create.foundation.utility.BlockHelper; + import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltFunnelInteractionHandler.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltFunnelInteractionHandler.java index d14e87002..d74c69900 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltFunnelInteractionHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltFunnelInteractionHandler.java @@ -5,8 +5,8 @@ import com.simibubi.create.content.logistics.block.funnel.BeltFunnelBlock; import com.simibubi.create.content.logistics.block.funnel.FunnelTileEntity; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.inventory.InvManipulationBehaviour; - import com.simibubi.create.foundation.utility.BlockHelper; + import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java index aa3e3333f..a5d859afd 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltInventory.java @@ -22,7 +22,6 @@ import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemS import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.ServerSpeedProvider; -import net.minecraft.block.Block; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java index ebbd51edb..cfb74196c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java @@ -9,9 +9,9 @@ import java.util.List; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.content.contraptions.relays.belt.BeltPart; import com.simibubi.create.content.contraptions.relays.belt.BeltSlope; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltTunnelInteractionHandler.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltTunnelInteractionHandler.java index 0ad9792fd..d7ff62dff 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltTunnelInteractionHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltTunnelInteractionHandler.java @@ -2,8 +2,8 @@ package com.simibubi.create.content.contraptions.relays.belt.transport; import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; import com.simibubi.create.content.contraptions.relays.belt.BeltHelper; -import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.content.contraptions.relays.belt.BeltSlope; +import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelTileEntity; import com.simibubi.create.content.logistics.block.belts.tunnel.BrassTunnelBlock; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java index ba3ff93bc..df23098c2 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/CogWheelBlock.java @@ -4,10 +4,11 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllShapes; import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlock; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java index 8feb77850..a37530281 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/ShaftBlock.java @@ -6,14 +6,15 @@ import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock; import com.simibubi.create.content.contraptions.relays.encased.EncasedShaftBlock; + import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.IWaterLoggable; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlock.java index 66db8fd9f..5d2484520 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/AdjustablePulleyBlock.java @@ -12,7 +12,6 @@ import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; import net.minecraft.world.World; public class AdjustablePulleyBlock extends EncasedBeltBlock implements ITE { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java index 553dc46bf..c2b6f16e0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedShaftBlock.java @@ -4,9 +4,9 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.base.CasingBlock; import com.simibubi.create.content.contraptions.base.KineticTileEntity; - import com.simibubi.create.foundation.utility.Lang; import com.tterrag.registrate.util.entry.BlockEntry; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlock.java index a5adff8da..6e5656dac 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeBlock.java @@ -13,9 +13,7 @@ import com.simibubi.create.foundation.utility.worldWrappers.WrappedWorld; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; -import net.minecraft.block.material.MaterialColor; import net.minecraft.item.BlockItemUseContext; import net.minecraft.particles.RedstoneParticleData; import net.minecraft.tileentity.TileEntity; @@ -25,9 +23,9 @@ import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeShaper.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeShaper.java index cdab69a68..b07ded5bb 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeShaper.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/GaugeShaper.java @@ -6,8 +6,8 @@ import com.simibubi.create.AllShapes; import com.simibubi.create.foundation.utility.VoxelShaper; import net.minecraft.util.Direction; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.vector.Vector3d; public class GaugeShaper extends VoxelShaper { diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java index cc5fe3178..e0bc95006 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/SpeedGaugeTileEntity.java @@ -2,7 +2,6 @@ package com.simibubi.create.content.contraptions.relays.gauge; import java.util.List; -import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel; import com.simibubi.create.content.contraptions.goggles.GogglesItem; import com.simibubi.create.foundation.advancement.AllTriggers; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java index db3f2a82d..eb6a925c3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gauge/StressGaugeTileEntity.java @@ -2,7 +2,6 @@ package com.simibubi.create.content.contraptions.relays.gauge; import java.util.List; -import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.IRotate.StressImpact; import com.simibubi.create.content.contraptions.goggles.IHaveGoggleInformation; import com.simibubi.create.foundation.item.ItemDescription; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlock.java index d024e2808..bb867e1a0 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/gearbox/GearboxBlock.java @@ -13,6 +13,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; +import net.minecraft.loot.LootContext.Builder; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; @@ -21,7 +22,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; -import net.minecraft.loot.LootContext.Builder; public class GearboxBlock extends RotatedPillarKineticBlock { diff --git a/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItem.java b/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItem.java index 839d6ec74..1673d855c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItem.java @@ -1,13 +1,13 @@ package com.simibubi.create.content.contraptions.wrench; +import javax.annotation.Nonnull; + import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; -import javax.annotation.Nonnull; - public class WrenchItem extends Item { public WrenchItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItemRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItemRenderer.java index 731d39ef4..3b34f244a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/wrench/WrenchItemRenderer.java @@ -6,8 +6,8 @@ import com.simibubi.create.foundation.item.PartialItemModelRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.vector.Vector3f; public class WrenchItemRenderer extends CustomRenderedItemModelRenderer { diff --git a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java index 66ef8f1a1..8e8cb277e 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java @@ -21,7 +21,10 @@ import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.BeaconTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; -import net.minecraft.util.math.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceContext.BlockMode; import net.minecraft.util.math.RayTraceContext.FluidMode; import net.minecraft.util.math.vector.Vector3d; diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandItem.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandItem.java index 116bcce47..be5496d19 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandItem.java @@ -5,6 +5,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; + import com.simibubi.create.content.curiosities.symmetry.mirror.CrossPlaneMirror; import com.simibubi.create.content.curiosities.symmetry.mirror.EmptyMirror; import com.simibubi.create.content.curiosities.symmetry.mirror.PlaneMirror; @@ -30,16 +32,14 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.ISelectionContext; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.network.PacketDistributor; -import javax.annotation.Nonnull; - public class SymmetryWandItem extends Item { public static final String SYMMETRY = "symmetry"; diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java index dbe80940c..6e051f50c 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java +++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryWandScreen.java @@ -1,7 +1,6 @@ package com.simibubi.create.content.curiosities.symmetry; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.content.curiosities.symmetry.mirror.CrossPlaneMirror; import com.simibubi.create.content.curiosities.symmetry.mirror.EmptyMirror; import com.simibubi.create.content.curiosities.symmetry.mirror.PlaneMirror; @@ -19,12 +18,12 @@ import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.networking.NbtPacket; import com.simibubi.create.foundation.utility.Lang; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Hand; import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.network.PacketDistributor; diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/client/SymmetryWandItemRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/client/SymmetryWandItemRenderer.java index 745cbd369..7d76c4e60 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/client/SymmetryWandItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/client/SymmetryWandItemRenderer.java @@ -6,9 +6,9 @@ import com.simibubi.create.foundation.item.PartialItemModelRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Vector3f; public class SymmetryWandItemRenderer extends CustomRenderedItemModelRenderer { diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItemRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItemRenderer.java index 7267c3c65..e05be2b0d 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItemRenderer.java @@ -6,8 +6,8 @@ import com.simibubi.create.foundation.item.PartialItemModelRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.vector.Vector3f; public class DeforesterItemRenderer extends CustomRenderedItemModelRenderer { diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItem.java b/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItem.java index e2009bc4c..4f7963014 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItem.java @@ -1,5 +1,7 @@ package com.simibubi.create.content.curiosities.tools; +import javax.annotation.ParametersAreNonnullByDefault; + import com.simibubi.create.foundation.utility.VecHelper; import mcp.MethodsReturnNonnullByDefault; @@ -25,8 +27,6 @@ import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; -import javax.annotation.ParametersAreNonnullByDefault; - @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault public class SandPaperItem extends Item { diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItemRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItemRenderer.java index e05110ba9..6fe251e91 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/SandPaperItemRenderer.java @@ -1,7 +1,6 @@ package com.simibubi.create.content.curiosities.tools; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.foundation.block.render.CustomRenderedItemModel; import com.simibubi.create.foundation.utility.AnimationTickHolder; @@ -9,15 +8,15 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.model.ItemCameraTransforms; -import net.minecraft.util.math.vector.Quaternion; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Quaternion; +import net.minecraft.util.math.vector.Vector3f; public class SandPaperItemRenderer extends ItemStackTileEntityRenderer { diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java index 5bd25476d..5bba1ec8c 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperItem.java @@ -2,6 +2,8 @@ package com.simibubi.create.content.curiosities.zapper; import java.util.List; +import javax.annotation.Nonnull; + import com.simibubi.create.AllSoundEvents; import com.simibubi.create.foundation.item.ItemDescription; import com.simibubi.create.foundation.networking.AllPackets; @@ -42,8 +44,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.network.PacketDistributor; -import javax.annotation.Nonnull; - public abstract class ZapperItem extends Item { public ZapperItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java index 35b24c9d7..df41262ef 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperRenderHandler.java @@ -13,7 +13,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.AbstractClientPlayerEntity; import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.renderer.FirstPersonRenderer; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.client.renderer.entity.PlayerRenderer; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.world.ClientWorld; @@ -25,6 +24,7 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderHandEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java index c2f8659c2..3d55f1922 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/ZapperScreen.java @@ -3,7 +3,6 @@ package com.simibubi.create.content.curiosities.zapper; import java.util.Vector; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.foundation.gui.AbstractSimiScreen; import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.AllIcons; diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java index 903a8d572..777c081d3 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java @@ -40,7 +40,6 @@ import net.minecraft.util.math.RayTraceContext.BlockMode; import net.minecraft.util.math.RayTraceContext.FluidMode; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java index 0b39d9c64..cf2ccad01 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItemRenderer.java @@ -19,11 +19,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.LightTexture; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.item.ItemStack; import net.minecraft.util.HandSide; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Vector3f; public class BlockzapperItemRenderer extends ZapperItemRenderer { diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java index b3943bbba..c2b7beb19 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/CylinderBrush.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import net.minecraft.util.text.ITextComponent; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.foundation.utility.Lang; @@ -16,6 +15,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.text.ITextComponent; public class CylinderBrush extends Brush { diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItemRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItemRenderer.java index 01e0b3d18..89b6aeb84 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItemRenderer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperItemRenderer.java @@ -12,10 +12,10 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.LightTexture; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.item.ItemStack; import net.minecraft.util.HandSide; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Vector3f; public class WorldshaperItemRenderer extends ZapperItemRenderer { diff --git a/src/main/java/com/simibubi/create/content/logistics/InWorldProcessing.java b/src/main/java/com/simibubi/create/content/logistics/InWorldProcessing.java index 1866e54a2..03c450852 100644 --- a/src/main/java/com/simibubi/create/content/logistics/InWorldProcessing.java +++ b/src/main/java/com/simibubi/create/content/logistics/InWorldProcessing.java @@ -21,8 +21,8 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.CampfireBlock; import net.minecraft.entity.item.ItemEntity; -import net.minecraft.fluid.Fluids; import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.BlastingRecipe; import net.minecraft.item.crafting.FurnaceRecipe; diff --git a/src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java b/src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java index 12f57a01f..b43dab86a 100644 --- a/src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java +++ b/src/main/java/com/simibubi/create/content/logistics/RedstoneLinkNetworkHandler.java @@ -6,12 +6,12 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import com.simibubi.create.foundation.utility.WorldHelper; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.Create; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.tileEntity.behaviour.linked.LinkBehaviour; +import com.simibubi.create.foundation.utility.WorldHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverBlock.java deleted file mode 100644 index 542cb1830..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverBlock.java +++ /dev/null @@ -1,171 +0,0 @@ -package com.simibubi.create.content.logistics.block.belts.observer; - -import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllTileEntities; -import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; -import com.simibubi.create.content.contraptions.relays.belt.BeltPart; -import com.simibubi.create.content.contraptions.relays.belt.BeltSlope; -import com.simibubi.create.content.contraptions.wrench.IWrenchable; -import com.simibubi.create.foundation.block.ITE; -import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; -import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; -import com.simibubi.create.foundation.utility.Lang; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.HorizontalBlock; -import net.minecraft.block.material.PushReaction; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.item.ItemUseContext; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.EnumProperty; -import net.minecraft.state.StateContainer.Builder; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; - -public class BeltObserverBlock extends HorizontalBlock - implements ITE, IWrenchable { - - public static final BooleanProperty POWERED = BlockStateProperties.POWERED; - public static final BooleanProperty BELT = BooleanProperty.create("belt"); - public static final EnumProperty MODE = EnumProperty.create("mode", Mode.class); - - public BeltObserverBlock(Properties properties) { - super(properties); - setDefaultState(getDefaultState().with(POWERED, false).with(BELT, false)); - } - - @Override - public TileEntity createTileEntity(BlockState state, IBlockReader world) { - return AllTileEntities.BELT_OBSERVER.create(); - } - - @Override - public PushReaction getPushReaction(BlockState state) { - return PushReaction.BLOCK; - } - - @Override - public boolean hasTileEntity(BlockState state) { - return true; - } - - @Override - public BlockState updatePostPlacement(BlockState stateIn, Direction facing, BlockState facingState, IWorld worldIn, - BlockPos currentPos, BlockPos facingPos) { - if (facing == stateIn.get(HORIZONTAL_FACING)) - stateIn = stateIn.with(BELT, shouldHaveExtension(stateIn, worldIn, currentPos)); - return stateIn; - } - - @Override - protected void fillStateContainer(Builder builder) { - builder.add(POWERED, HORIZONTAL_FACING, BELT, MODE); - super.fillStateContainer(builder); - } - - private boolean shouldHaveExtension(BlockState state, IWorld world, BlockPos pos) { - Direction direction = state.get(HORIZONTAL_FACING); - BlockState blockState = world.getBlockState(pos.offset(direction)); - - if (!AllBlocks.BELT.has(blockState)) - return false; - if (blockState.get(BeltBlock.SLOPE) != BeltSlope.HORIZONTAL) - return false; - if (blockState.get(BeltBlock.PART) != BeltPart.MIDDLE) - return false; - if (blockState.get(BeltBlock.HORIZONTAL_FACING).getAxis() == direction.getAxis()) - return false; - - return true; - } - - @Override - public BlockState getStateForPlacement(BlockItemUseContext context) { - BlockState state = getDefaultState(); - - Direction preferredFacing = null; - for (Direction face : Direction.values()) { - if (face.getAxis().isVertical()) - continue; - - BlockState blockState = context.getWorld().getBlockState(context.getPos().offset(face)); - if (AllBlocks.BELT.has(blockState) - && blockState.get(BlockStateProperties.HORIZONTAL_FACING).getAxis() != face.getAxis() - && blockState.get(BeltBlock.SLOPE) == BeltSlope.HORIZONTAL) - if (preferredFacing == null) - preferredFacing = face; - else { - preferredFacing = null; - break; - } - } - - if (preferredFacing != null) { - state = state.with(HORIZONTAL_FACING, preferredFacing); - } else if (context.getFace().getAxis().isHorizontal()) { - state = state.with(HORIZONTAL_FACING, context.getFace()); - } else { - state = state.with(HORIZONTAL_FACING, context.getPlacementHorizontalFacing()); - } - - state = state.with(BELT, shouldHaveExtension(state, context.getWorld(), context.getPos())); - - return state; - } - - @Override - public boolean canProvidePower(BlockState state) { - return state.get(POWERED); - } - - @Override - public int getWeakPower(BlockState blockState, IBlockReader blockAccess, BlockPos pos, Direction side) { - return canProvidePower(blockState) ? 15 : 0; - } - - @Override - public boolean canConnectRedstone(BlockState state, IBlockReader world, BlockPos pos, Direction side) { - return side != state.get(HORIZONTAL_FACING).getOpposite(); - } - - @Override - public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) { - if (state.hasTileEntity() && state.getBlock() != newState.getBlock()) { - TileEntityBehaviour.destroy(worldIn, pos, FilteringBehaviour.TYPE); - worldIn.removeTileEntity(pos); - } - } - - @Override - public ActionResultType onWrenched(BlockState state, ItemUseContext context) { - World world = context.getWorld(); - if (!world.isRemote) { - world.setBlockState(context.getPos(), state.with(POWERED, false).cycle(MODE), 3); - world.notifyNeighborsOfStateChange(context.getPos(), this); - } - return ActionResultType.SUCCESS; - } - - public enum Mode implements IStringSerializable { - DETECT, PULSE, EJECT, SPLIT; - - @Override - public String getString() { - return Lang.asId(name()); - } - } - - @Override - public Class getTileEntityClass() { - return BeltObserverTileEntity.class; - } - -} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverTileEntity.java deleted file mode 100644 index 99c1c84d6..000000000 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/observer/BeltObserverTileEntity.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.simibubi.create.content.logistics.block.belts.observer; - -import java.util.List; - -import com.simibubi.create.content.contraptions.relays.belt.BeltHelper; -import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; -import com.simibubi.create.content.logistics.block.belts.observer.BeltObserverBlock.Mode; -import com.simibubi.create.foundation.tileEntity.SmartTileEntity; -import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; -import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; - -import net.minecraft.block.BlockState; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.tileentity.TileEntityType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; - -public class BeltObserverTileEntity extends SmartTileEntity { - - private FilteringBehaviour filtering; - public int turnOffTicks = 0; - - public BeltObserverTileEntity(TileEntityType type) { - super(type); - setLazyTickRate(20); - } - - @Override - public void addBehaviours(List behaviours) { - filtering = new FilteringBehaviour(this, new BeltObserverFilterSlot()).moveText(new Vector3d(0, 5, 0)); - behaviours.add(filtering); - } - - @Override - public void tick() { - super.tick(); - if (turnOffTicks > 0) { - turnOffTicks--; - if (turnOffTicks == 0) - world.getPendingBlockTicks().scheduleTick(pos, getBlockState().getBlock(), 1); - } - - if (!isActive()) - return; - if (getBlockState().get(BeltObserverBlock.MODE) != Mode.DETECT) - return; - - BlockPos targetPos = pos.offset(getBlockState().get(BeltObserverBlock.HORIZONTAL_FACING)); - - BeltTileEntity beltTE = BeltHelper.getSegmentTE(world, targetPos); - if (beltTE == null) - return; - BeltTileEntity controllerTE = beltTE.getControllerTE(); - if (controllerTE == null) - return; - - controllerTE.getInventory().applyToEachWithin(beltTE.index + .5f, .45f, stack -> { - if (filtering.test(stack.stack) && turnOffTicks != 6) { - world.setBlockState(pos, getBlockState().with(BeltObserverBlock.POWERED, true)); - world.notifyNeighborsOfStateChange(pos, getBlockState().getBlock()); - resetTurnOffCooldown(); - } - return null; - }); - - } - - private boolean isActive() { - return getBlockState().get(BeltObserverBlock.BELT); - } - - public void resetTurnOffCooldown() { - turnOffTicks = 6; - } - - @Override - public void write(CompoundNBT compound, boolean clientPacket) { - compound.putInt("TurnOff", turnOffTicks); - super.write(compound, clientPacket); - } - - @Override - protected void fromTag(BlockState state, CompoundNBT compound, boolean clientPacket) { - turnOffTicks = compound.getInt("TurnOff"); - super.fromTag(state, compound, clientPacket); - } - -} diff --git a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelTileEntity.java index dd8efec04..c212f0fee 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/belts/tunnel/BrassTunnelTileEntity.java @@ -8,7 +8,6 @@ import java.util.Set; import javax.annotation.Nullable; -import com.simibubi.create.foundation.utility.BlockHelper; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlocks; @@ -23,11 +22,11 @@ import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBe import com.simibubi.create.foundation.tileEntity.behaviour.filtering.SidedFilteringBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.INamedIconOptions; import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollOptionBehaviour; +import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.NBTHelper; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java index 6b15d9b36..a31e37f7c 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelBlock.java @@ -30,9 +30,9 @@ import net.minecraft.util.Direction.AxisDirection; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.IWorldReader; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java index f0cccf810..e07ed12a0 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java @@ -22,7 +22,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ContentObserverTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/ContentObserverTileEntity.java index 83759928b..f8db685a2 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/ContentObserverTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/ContentObserverTileEntity.java @@ -15,7 +15,7 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.vector.Vector3d; public class ContentObserverTileEntity extends SmartTileEntity { @@ -31,7 +31,7 @@ public class ContentObserverTileEntity extends SmartTileEntity { @Override public void addBehaviours(List behaviours) { - filtering = new FilteringBehaviour(this, new FilteredDetectorFilterSlot()).moveText(new Vec3d(0, 5, 0)); + filtering = new FilteringBehaviour(this, new FilteredDetectorFilterSlot()).moveText(new Vector3d(0, 5, 0)); behaviours.add(filtering); observedInventory = new InvManipulationBehaviour(this, InterfaceProvider.towardBlockFacing()).bypassSidedness(); @@ -100,9 +100,9 @@ public class ContentObserverTileEntity extends SmartTileEntity { } @Override - protected void read(CompoundNBT compound, boolean clientPacket) { + protected void fromTag(BlockState state, CompoundNBT compound, boolean clientPacket) { + super.fromTag(state, compound, clientPacket); turnOffTicks = compound.getInt("TurnOff"); - super.read(compound, clientPacket); } } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java index 449ef6cce..53b23aec9 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/NixieTubeBlock.java @@ -14,9 +14,9 @@ import net.minecraft.state.StateContainer.Builder; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactBlock.java index 6f4286162..5815f778b 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/RedstoneContactBlock.java @@ -2,10 +2,14 @@ package com.simibubi.create.content.logistics.block.redstone; import java.util.Random; +import javax.annotation.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; + import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.wrench.IWrenchable; import com.simibubi.create.foundation.block.ProperDirectionalBlock; +import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.item.BlockItemUseContext; @@ -19,10 +23,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class RedstoneContactBlock extends ProperDirectionalBlock implements IWrenchable { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchScreen.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchScreen.java index 294ef6e69..cb1bd6519 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchScreen.java @@ -3,7 +3,6 @@ package com.simibubi.create.content.logistics.block.redstone; import static com.simibubi.create.foundation.gui.AllGuiTextures.STOCKSWITCH; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.logistics.packet.ConfigureStockswitchPacket; import com.simibubi.create.foundation.gui.AbstractSimiScreen; @@ -19,7 +18,6 @@ import com.simibubi.create.foundation.utility.LerpedFloat.Chaser; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java index 567fefeaf..5b5d303a9 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/AttributeFilterScreen.java @@ -2,7 +2,6 @@ package com.simibubi.create.content.logistics.item.filter; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/ItemAttribute.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/ItemAttribute.java index 6cf9ca7c1..fe95d1d0f 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/ItemAttribute.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/ItemAttribute.java @@ -9,7 +9,6 @@ import java.util.function.BiPredicate; import java.util.function.Predicate; import java.util.stream.Collectors; -import net.minecraft.util.text.TranslationTextComponent; import org.apache.commons.lang3.StringUtils; import com.google.common.base.Predicates; @@ -17,7 +16,6 @@ import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.content.logistics.InWorldProcessing; import com.simibubi.create.foundation.utility.Lang; -import net.minecraft.client.resources.I18n; import net.minecraft.inventory.IInventory; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; @@ -28,6 +26,7 @@ import net.minecraft.item.crafting.IRecipeType; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.AbstractFurnaceTileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java b/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java index 356f690ef..3e888e291 100644 --- a/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java +++ b/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPartial.java @@ -13,8 +13,8 @@ import com.tterrag.registrate.providers.RegistrateRecipeProvider; import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.nullness.NonnullType; -import net.minecraft.block.Block; import net.minecraft.block.AbstractBlock.Properties; +import net.minecraft.block.Block; import net.minecraft.block.SlabBlock; import net.minecraft.block.StairsBlock; import net.minecraft.block.WallBlock; @@ -23,7 +23,6 @@ import net.minecraft.item.Item; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ITag; import net.minecraft.tags.ItemTags; -import net.minecraft.tags.Tag; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ModelFile; diff --git a/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPatterns.java b/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPatterns.java index 55ecf229c..4fa8d9b7d 100644 --- a/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPatterns.java +++ b/src/main/java/com/simibubi/create/content/palettes/PaletteBlockPatterns.java @@ -24,8 +24,8 @@ import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import com.tterrag.registrate.util.nullness.NonNullFunction; -import net.minecraft.block.Block; import net.minecraft.block.AbstractBlock.Properties; +import net.minecraft.block.Block; import net.minecraft.block.RotatedPillarBlock; import net.minecraft.client.renderer.RenderType; import net.minecraft.data.ShapedRecipeBuilder; diff --git a/src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java b/src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java index e961548c5..b4ebcb6a2 100644 --- a/src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java +++ b/src/main/java/com/simibubi/create/content/schematics/ClientSchematicLoader.java @@ -27,7 +27,6 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; @OnlyIn(Dist.CLIENT) public class ClientSchematicLoader { diff --git a/src/main/java/com/simibubi/create/content/schematics/ItemRequirement.java b/src/main/java/com/simibubi/create/content/schematics/ItemRequirement.java index 7d75df83a..e19db3378 100644 --- a/src/main/java/com/simibubi/create/content/schematics/ItemRequirement.java +++ b/src/main/java/com/simibubi/create/content/schematics/ItemRequirement.java @@ -5,14 +5,25 @@ import java.util.Arrays; import java.util.List; import com.simibubi.create.foundation.utility.BlockHelper; -import net.minecraft.block.*; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.FarmlandBlock; +import net.minecraft.block.GrassPathBlock; +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; import net.minecraft.entity.item.BoatEntity; import net.minecraft.entity.item.ItemFrameEntity; import net.minecraft.entity.item.minecart.AbstractMinecartEntity; -import net.minecraft.item.*; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.SlabType; diff --git a/src/main/java/com/simibubi/create/content/schematics/block/LaunchedItem.java b/src/main/java/com/simibubi/create/content/schematics/block/LaunchedItem.java index f523499c0..5bda2bde9 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/LaunchedItem.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/LaunchedItem.java @@ -7,8 +7,8 @@ import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; import com.simibubi.create.content.contraptions.relays.belt.BeltPart; import com.simibubi.create.content.contraptions.relays.belt.item.BeltConnectorItem; import com.simibubi.create.content.contraptions.relays.elementary.ShaftBlock; - import com.simibubi.create.foundation.utility.BlockHelper; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java index cb816c27e..b5cc90f3f 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableScreen.java @@ -1,5 +1,11 @@ package com.simibubi.create.content.schematics.block; +import static com.simibubi.create.foundation.gui.AllGuiTextures.SCHEMATIC_TABLE; +import static com.simibubi.create.foundation.gui.AllGuiTextures.SCHEMATIC_TABLE_PROGRESS; + +import java.nio.file.Paths; +import java.util.List; + import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlocks; @@ -14,21 +20,15 @@ import com.simibubi.create.foundation.gui.widgets.Label; import com.simibubi.create.foundation.gui.widgets.ScrollInput; import com.simibubi.create.foundation.gui.widgets.SelectionScrollInput; import com.simibubi.create.foundation.utility.Lang; + import net.minecraft.client.gui.IHasContainer; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.Util; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; -import java.nio.file.Paths; -import java.util.List; - -import static com.simibubi.create.foundation.gui.AllGuiTextures.SCHEMATIC_TABLE; -import static com.simibubi.create.foundation.gui.AllGuiTextures.SCHEMATIC_TABLE_PROGRESS; - public class SchematicTableScreen extends AbstractSimiContainerScreen implements IHasContainer { diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java index c613b93b7..9bd236b71 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonRenderer.java @@ -14,7 +14,6 @@ import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; @@ -23,6 +22,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; import net.minecraftforge.client.model.data.EmptyModelData; public class SchematicannonRenderer extends SafeTileEntityRenderer { diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java index 56c7a3ffa..e2fef7e11 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonScreen.java @@ -1,5 +1,13 @@ package com.simibubi.create.content.schematics.block; +import static net.minecraft.util.text.TextFormatting.DARK_PURPLE; +import static net.minecraft.util.text.TextFormatting.GRAY; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Vector; + import com.google.common.collect.ImmutableList; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlocks; @@ -28,14 +36,6 @@ import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Vector; - -import static net.minecraft.util.text.TextFormatting.DARK_PURPLE; -import static net.minecraft.util.text.TextFormatting.GRAY; - public class SchematicannonScreen extends AbstractSimiContainerScreen { private static final AllGuiTextures BG_BOTTOM = AllGuiTextures.SCHEMATICANNON_BOTTOM; @@ -318,41 +318,7 @@ public class SchematicannonScreen extends AbstractSimiContainerScreen= fuelX && mouseY >= fuelY && mouseX <= fuelX + AllGuiTextures.SCHEMATICANNON_FUEL.width - && mouseY <= fuelY + AllGuiTextures.SCHEMATICANNON_FUEL.height) { - container.getTileEntity(); - - double fuelUsageRate = te.getFuelUsageRate(); - int shotsLeft = (int) (te.fuelLevel / fuelUsageRate); - int shotsLeftWithItems = (int) (shotsLeft - + te.inventory.getStackInSlot(4).getCount() * (te.getFuelAddedByGunPowder() / fuelUsageRate)); - - List tooltip = new ArrayList<>(); - float f = te.hasCreativeCrate ? 100 : te.fuelLevel * 100; - tooltip.add(Lang.translate(_gunpowderLevel, "" + (int) f)); - if (!te.hasCreativeCrate) - tooltip.add(Lang.translate(_shotsRemaining, "" + TextFormatting.BLUE + shotsLeft).formatted(GRAY)); - if (shotsLeftWithItems != shotsLeft) - tooltip - .add(Lang.translate(_shotsRemainingWithBackup, "" + TextFormatting.BLUE + shotsLeftWithItems).formatted(GRAY)); - - renderTooltip(matrixStack, tooltip, mouseX, mouseY); -=======*/ - AllGuiTextures.SCHEMATICANNON_FUEL_CREATIVE.draw(this, guiLeft + 20 + 36, guiTop + 19); + AllGuiTextures.SCHEMATICANNON_FUEL_CREATIVE.draw(matrixStack, this, guiLeft + 20 + 36, guiTop + 19); return; } client.getTextureManager() @@ -375,23 +341,21 @@ public class SchematicannonScreen extends AbstractSimiContainerScreen= missingBlockX && mouseY >= missingBlockY && mouseX <= missingBlockX + 16 - /* -<<<<<<< HEAD && mouseY <= missingBlockY + 16) { renderTooltip(matrixStack, te.missingItem, mouseX, mouseY); } @@ -401,15 +365,6 @@ public class SchematicannonScreen extends AbstractSimiContainerScreen= paperX && mouseY >= paperY && mouseX <= paperX + 16 && mouseY <= paperY + 16) { renderTooltip(matrixStack, listPrinter, mouseX, mouseY); } -=======*/ - && mouseY <= missingBlockY + 16) { - renderTooltip(matrixStack, te.missingItem, mouseX, mouseY); - } - } - - int paperX = guiLeft + 132, paperY = guiTop + 19; - if (mouseX >= paperX && mouseY >= paperY && mouseX <= paperX + 16 && mouseY <= paperY + 16) - renderTooltip(matrixStack, listPrinter, mouseX, mouseY); super.renderWindowForeground(matrixStack, mouseX, mouseY, partialTicks); } diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java index 93b324573..1ab044ace 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java @@ -23,8 +23,8 @@ import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.ItemHelper.ExtractionCountMode; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; - import com.simibubi.create.foundation.utility.BlockHelper; + import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.PistonHeadBlock; diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java index d22bd935f..855c02498 100644 --- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java @@ -4,7 +4,6 @@ import java.util.Collections; import java.util.List; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllItems; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.gui.AbstractSimiScreen; @@ -25,7 +24,6 @@ import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.gen.feature.template.PlacementSettings; public class SchematicEditScreen extends AbstractSimiScreen { diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicPromptScreen.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicPromptScreen.java index df3617635..50c739b99 100644 --- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicPromptScreen.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicPromptScreen.java @@ -1,7 +1,10 @@ package com.simibubi.create.content.schematics.client; +import static com.simibubi.create.foundation.gui.AllGuiTextures.ADJUSTABLE_CRATE; + import org.lwjgl.glfw.GLFW; +import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllItems; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.gui.AbstractSimiScreen; @@ -12,13 +15,15 @@ import com.simibubi.create.foundation.utility.Lang; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; public class SchematicPromptScreen extends AbstractSimiScreen { - private final String title = Lang.translate("schematicAndQuill.title"); - private final String convertLabel = Lang.translate("schematicAndQuill.convert"); - private final String abortLabel = Lang.translate("action.discard"); - private final String confirmLabel = Lang.translate("action.saveToFile"); + private final ITextComponent title = Lang.translate("schematicAndQuill.title"); + private final ITextComponent convertLabel = Lang.translate("schematicAndQuill.convert"); + private final ITextComponent abortLabel = Lang.translate("action.discard"); + private final ITextComponent confirmLabel = Lang.translate("action.saveToFile"); private TextFieldWidget nameField; private IconButton confirm; @@ -31,7 +36,7 @@ public class SchematicPromptScreen extends AbstractSimiScreen { AllGuiTextures background = AllGuiTextures.SCHEMATIC_PROMPT; setWindowSize(background.width, background.height + 30); - nameField = new TextFieldWidget(font, guiLeft + 49, guiTop + 26, 131, 10, ""); + nameField = new TextFieldWidget(textRenderer, guiLeft + 49, guiTop + 26, 131, 10, StringTextComponent.EMPTY); nameField.setTextColor(-1); nameField.setDisabledTextColour(-1); nameField.setEnableBackgroundDrawing(false); @@ -57,9 +62,9 @@ public class SchematicPromptScreen extends AbstractSimiScreen { } @Override - public void renderWindow(int mouseX, int mouseY, float partialTicks) { - AllGuiTextures.SCHEMATIC_PROMPT.draw(this, guiLeft, guiTop); - font.drawStringWithShadow(title, guiLeft + (sWidth / 2) - (font.getStringWidth(title) / 2), guiTop + 3, + protected void renderWindow(MatrixStack ms, int mouseX, int mouseY, float partialTicks) { + AllGuiTextures.SCHEMATIC_PROMPT.draw(ms, this, guiLeft, guiTop); + textRenderer.drawWithShadow(ms, title, guiLeft + (sWidth / 2) - (textRenderer.getWidth(title) / 2), guiTop + 3, 0xffffff); itemRenderer.renderItemIntoGUI(AllItems.SCHEMATIC.asStack(), guiLeft + 22, guiTop + 23); } diff --git a/src/main/java/com/simibubi/create/content/schematics/client/tools/Tools.java b/src/main/java/com/simibubi/create/content/schematics/client/tools/Tools.java index 26f9ea1eb..24ce26e67 100644 --- a/src/main/java/com/simibubi/create/content/schematics/client/tools/Tools.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/tools/Tools.java @@ -6,6 +6,7 @@ import java.util.List; import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.utility.Lang; + import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; diff --git a/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java b/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java index 0f7571a0a..4703bd099 100644 --- a/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java +++ b/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java @@ -7,6 +7,8 @@ import java.nio.file.Paths; import java.nio.file.StandardOpenOption; import java.util.List; +import javax.annotation.Nonnull; + import org.apache.commons.io.IOUtils; import com.simibubi.create.AllItems; @@ -41,8 +43,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.thread.SidedThreadGroups; -import javax.annotation.Nonnull; - public class SchematicItem extends Item { public SchematicItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/events/ClientEvents.java b/src/main/java/com/simibubi/create/events/ClientEvents.java index 0f2cd4873..a212ad594 100644 --- a/src/main/java/com/simibubi/create/events/ClientEvents.java +++ b/src/main/java/com/simibubi/create/events/ClientEvents.java @@ -30,10 +30,13 @@ import com.simibubi.create.foundation.utility.AnimationTickHolder; import com.simibubi.create.foundation.utility.ServerSpeedProvider; import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.entity.Pose; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; @@ -62,9 +65,16 @@ public class ClientEvents { return; AnimationTickHolder.tick(); - + if (!isGameActive()) return; + + ClientPlayerEntity player = Minecraft.getInstance().player; + AxisAlignedBB bb = player.getBoundingBox(Pose.CROUCHING).shrink(1.0E-7D); +// Stream blockCollisions = world.getBlockCollisions(player, bb); +// Debug.debugChat(blockCollisions.count() + ""); +// blockCollisions.forEach(vs -> Debug.debugChat(vs.toString())); +// Debug.debugChat("" + blockCollisions.allMatch(VoxelShape::isEmpty)); CreateClient.schematicSender.tick(); CreateClient.schematicAndQuillHandler.tick(); diff --git a/src/main/java/com/simibubi/create/foundation/advancement/AllTriggers.java b/src/main/java/com/simibubi/create/foundation/advancement/AllTriggers.java index 9de978031..905a3b926 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/AllTriggers.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/AllTriggers.java @@ -10,7 +10,6 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import net.minecraft.world.World; public class AllTriggers { diff --git a/src/main/java/com/simibubi/create/foundation/advancement/KineticBlockTrigger.java b/src/main/java/com/simibubi/create/foundation/advancement/KineticBlockTrigger.java index bf7ea17d6..f6f2ef19b 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/KineticBlockTrigger.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/KineticBlockTrigger.java @@ -4,8 +4,6 @@ import java.util.Arrays; import java.util.List; import java.util.function.Supplier; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; import com.simibubi.create.Create; diff --git a/src/main/java/com/simibubi/create/foundation/advancement/SimpleTrigger.java b/src/main/java/com/simibubi/create/foundation/advancement/SimpleTrigger.java index 3ef8c5add..df46a0c0a 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/SimpleTrigger.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/SimpleTrigger.java @@ -3,7 +3,6 @@ package com.simibubi.create.foundation.advancement; import java.util.List; import java.util.function.Supplier; -import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import net.minecraft.advancements.criterion.EntityPredicate; diff --git a/src/main/java/com/simibubi/create/foundation/block/ITE.java b/src/main/java/com/simibubi/create/foundation/block/ITE.java index b0db0ef93..11a9826cf 100644 --- a/src/main/java/com/simibubi/create/foundation/block/ITE.java +++ b/src/main/java/com/simibubi/create/foundation/block/ITE.java @@ -4,12 +4,11 @@ import java.util.function.Consumer; import com.simibubi.create.Create; import com.simibubi.create.foundation.config.AllConfigs; - import com.simibubi.create.foundation.utility.WorldHelper; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.DimensionType; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; diff --git a/src/main/java/com/simibubi/create/foundation/collision/ContinuousOBBCollider.java b/src/main/java/com/simibubi/create/foundation/collision/ContinuousOBBCollider.java index 25b5fef39..62ed41191 100644 --- a/src/main/java/com/simibubi/create/foundation/collision/ContinuousOBBCollider.java +++ b/src/main/java/com/simibubi/create/foundation/collision/ContinuousOBBCollider.java @@ -1,10 +1,10 @@ package com.simibubi.create.foundation.collision; -import net.minecraft.util.math.vector.Vector3d; - import static java.lang.Math.abs; import static java.lang.Math.signum; +import net.minecraft.util.math.vector.Vector3d; + public class ContinuousOBBCollider extends OBBCollider { diff --git a/src/main/java/com/simibubi/create/foundation/collision/OBBCollider.java b/src/main/java/com/simibubi/create/foundation/collision/OBBCollider.java index f5c09f232..e636911a1 100644 --- a/src/main/java/com/simibubi/create/foundation/collision/OBBCollider.java +++ b/src/main/java/com/simibubi/create/foundation/collision/OBBCollider.java @@ -1,11 +1,11 @@ package com.simibubi.create.foundation.collision; -import net.minecraft.util.math.vector.Vector3d; - import static com.simibubi.create.foundation.collision.CollisionDebugger.showDebugLine; import static java.lang.Math.abs; import static java.lang.Math.signum; +import net.minecraft.util.math.vector.Vector3d; + public class OBBCollider { diff --git a/src/main/java/com/simibubi/create/foundation/command/AllCommands.java b/src/main/java/com/simibubi/create/foundation/command/AllCommands.java index e726181f4..e78fed99e 100644 --- a/src/main/java/com/simibubi/create/foundation/command/AllCommands.java +++ b/src/main/java/com/simibubi/create/foundation/command/AllCommands.java @@ -1,6 +1,7 @@ package com.simibubi.create.foundation.command; import com.mojang.brigadier.CommandDispatcher; + import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; diff --git a/src/main/java/com/simibubi/create/foundation/command/ChunkUtil.java b/src/main/java/com/simibubi/create/foundation/command/ChunkUtil.java index f88e9ab3d..52e687cf5 100644 --- a/src/main/java/com/simibubi/create/foundation/command/ChunkUtil.java +++ b/src/main/java/com/simibubi/create/foundation/command/ChunkUtil.java @@ -1,5 +1,12 @@ package com.simibubi.create.foundation.command; +import java.util.EnumSet; +import java.util.LinkedList; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import net.minecraft.util.math.ChunkPos; import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.gen.Heightmap; @@ -7,12 +14,6 @@ import net.minecraft.world.server.ChunkHolder; import net.minecraft.world.server.ServerChunkProvider; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.util.EnumSet; -import java.util.LinkedList; -import java.util.List; public class ChunkUtil { private static final Logger LOGGER = LogManager.getLogger("Create/ChunkUtil"); diff --git a/src/main/java/com/simibubi/create/foundation/command/ChunkUtilCommand.java b/src/main/java/com/simibubi/create/foundation/command/ChunkUtilCommand.java index 48272f723..c470ea90c 100644 --- a/src/main/java/com/simibubi/create/foundation/command/ChunkUtilCommand.java +++ b/src/main/java/com/simibubi/create/foundation/command/ChunkUtilCommand.java @@ -2,6 +2,7 @@ package com.simibubi.create.foundation.command; import com.mojang.brigadier.builder.ArgumentBuilder; import com.simibubi.create.Create; + import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; import net.minecraft.command.arguments.ColumnPosArgument; diff --git a/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigPacket.java b/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigPacket.java index 45d17d4b4..6932543e3 100644 --- a/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigPacket.java +++ b/src/main/java/com/simibubi/create/foundation/command/ConfigureConfigPacket.java @@ -1,18 +1,20 @@ package com.simibubi.create.foundation.command; +import java.util.function.Consumer; +import java.util.function.Supplier; + +import org.apache.logging.log4j.LogManager; + import com.simibubi.create.content.contraptions.goggles.GoggleConfigScreen; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.gui.ScreenOpener; import com.simibubi.create.foundation.networking.SimplePacketBase; + import net.minecraft.network.PacketBuffer; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.network.NetworkEvent; -import org.apache.logging.log4j.LogManager; - -import java.util.function.Consumer; -import java.util.function.Supplier; public class ConfigureConfigPacket extends SimplePacketBase { diff --git a/src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java b/src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java index 632782c06..9497a7de6 100644 --- a/src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java +++ b/src/main/java/com/simibubi/create/foundation/command/OverlayConfigCommand.java @@ -2,6 +2,7 @@ package com.simibubi.create.foundation.command; import com.mojang.brigadier.builder.ArgumentBuilder; import com.simibubi.create.foundation.networking.AllPackets; + import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; import net.minecraft.entity.player.ServerPlayerEntity; diff --git a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java index ba14dfc39..a5e507516 100644 --- a/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java +++ b/src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java @@ -24,8 +24,8 @@ import com.tterrag.registrate.util.nullness.NonNullFunction; import com.tterrag.registrate.util.nullness.NonNullSupplier; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; -import net.minecraft.block.Block; import net.minecraft.block.AbstractBlock.Properties; +import net.minecraft.block.Block; import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.renderer.model.IBakedModel; diff --git a/src/main/java/com/simibubi/create/foundation/data/NamedTag.java b/src/main/java/com/simibubi/create/foundation/data/NamedTag.java index 6217b1160..066552663 100644 --- a/src/main/java/com/simibubi/create/foundation/data/NamedTag.java +++ b/src/main/java/com/simibubi/create/foundation/data/NamedTag.java @@ -1,14 +1,15 @@ package com.simibubi.create.foundation.data; +import java.util.Collections; +import java.util.List; + +import javax.annotation.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; + import mcp.MethodsReturnNonnullByDefault; import net.minecraft.tags.ITag; import net.minecraft.util.ResourceLocation; -import javax.annotation.Nullable; -import javax.annotation.ParametersAreNonnullByDefault; -import java.util.Collections; -import java.util.List; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class NamedTag implements ITag.INamedTag { diff --git a/src/main/java/com/simibubi/create/foundation/data/SharedProperties.java b/src/main/java/com/simibubi/create/foundation/data/SharedProperties.java index 246dc6abe..f685c4368 100644 --- a/src/main/java/com/simibubi/create/foundation/data/SharedProperties.java +++ b/src/main/java/com/simibubi/create/foundation/data/SharedProperties.java @@ -1,7 +1,6 @@ package com.simibubi.create.foundation.data; import mcp.MethodsReturnNonnullByDefault; - import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/simibubi/create/foundation/data/WindowGen.java b/src/main/java/com/simibubi/create/foundation/data/WindowGen.java index 179343daf..08b641868 100644 --- a/src/main/java/com/simibubi/create/foundation/data/WindowGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/WindowGen.java @@ -23,8 +23,8 @@ import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import com.tterrag.registrate.util.nullness.NonNullConsumer; import com.tterrag.registrate.util.nullness.NonNullFunction; -import net.minecraft.block.Block; import net.minecraft.block.AbstractBlock.Properties; +import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.WoodType; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index d9a767717..feb359af9 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -29,7 +29,6 @@ import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.ITag; import net.minecraft.tags.ItemTags; -import net.minecraft.tags.Tag; import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.Tags; diff --git a/src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java b/src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java index 00420513f..d8c0d3fd6 100644 --- a/src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java +++ b/src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java @@ -9,14 +9,13 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.JsonSyntaxException; - import com.simibubi.create.foundation.data.NamedTag; + import net.minecraft.fluid.Fluid; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.PacketBuffer; import net.minecraft.tags.FluidTags; import net.minecraft.tags.ITag; -import net.minecraft.tags.Tag; import net.minecraft.util.JSONUtils; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java b/src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java index eb46cbed5..23d8a0624 100644 --- a/src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java @@ -19,10 +19,10 @@ import net.minecraft.inventory.container.PlayerContainer; import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; import net.minecraft.util.Direction.AxisDirection; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.math.vector.Vector3i; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3i; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java b/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java index 25eb146f8..cbb9bb645 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java +++ b/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java @@ -19,7 +19,12 @@ import net.minecraft.block.Blocks; import net.minecraft.block.FireBlock; import net.minecraft.block.FlowingFluidBlock; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.Atlases; +import net.minecraft.client.renderer.BlockRendererDispatcher; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.world.ClientWorld; diff --git a/src/main/java/com/simibubi/create/foundation/gui/TextInputPromptScreen.java b/src/main/java/com/simibubi/create/foundation/gui/TextInputPromptScreen.java deleted file mode 100644 index 376472d79..000000000 --- a/src/main/java/com/simibubi/create/foundation/gui/TextInputPromptScreen.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.simibubi.create.foundation.gui; - -import java.util.function.Consumer; - -import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import org.lwjgl.glfw.GLFW; - -import com.simibubi.create.foundation.utility.Lang; - -import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.gui.widget.button.Button; - -public class TextInputPromptScreen extends AbstractSimiScreen { - - private final ITextComponent defaultConfirm = Lang.translate("action.confirm"); - private final ITextComponent defaultAbort = Lang.translate("action.abort"); - - private Consumer callback; - private Consumer abortCallback; - - private TextFieldWidget nameField; - private Button confirm; - private Button abort; - - private ITextComponent buttonTextConfirm; - private ITextComponent buttonTextAbort; - private ITextComponent title; - - private boolean confirmed; - - public TextInputPromptScreen(Consumer callBack, Consumer abortCallback) { - super(); - this.callback = callBack; - this.abortCallback = abortCallback; - - buttonTextConfirm = defaultConfirm; - buttonTextAbort = defaultAbort; - confirmed = false; - } - - @Override - public void init() { - super.init(); - setWindowSize(AllGuiTextures.TEXT_INPUT.width, AllGuiTextures.TEXT_INPUT.height + 30); - - this.nameField = new TextFieldWidget(textRenderer, guiLeft + 33, guiTop + 26, 128, 8, StringTextComponent.EMPTY); - this.nameField.setTextColor(-1); - this.nameField.setDisabledTextColour(-1); - this.nameField.setEnableBackgroundDrawing(false); - this.nameField.setMaxStringLength(35); - this.nameField.changeFocus(true); - - confirm = new Button(guiLeft - 5, guiTop + 50, 100, 20, buttonTextConfirm, button -> { - callback.accept(nameField.getText()); - confirmed = true; - client.displayGuiScreen(null); - }); - - abort = new Button(guiLeft + 100, guiTop + 50, 100, 20, buttonTextAbort, button -> { - client.displayGuiScreen(null); - }); - - widgets.add(confirm); - widgets.add(abort); - widgets.add(nameField); - } - - @Override - public void renderWindow(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { - AllGuiTextures.TEXT_INPUT.draw(matrixStack, this, guiLeft, guiTop); - textRenderer.draw(matrixStack, title, guiLeft + (sWidth / 2) - (textRenderer.getWidth(title) / 2), guiTop + 11, - AllGuiTextures.FONT_COLOR); - } - - @Override - public void removed() { - if (!confirmed) - abortCallback.accept(nameField.getText()); - super.removed(); - } - - public void setButtonTextConfirm(ITextComponent buttonTextConfirm) { - this.buttonTextConfirm = buttonTextConfirm; - } - - public void setButtonTextAbort(ITextComponent buttonTextAbort) { - this.buttonTextAbort = buttonTextAbort; - } - - public void setTitle(ITextComponent title) { - this.title = title; - } - - @Override - public boolean keyPressed(int keyCode, int p_keyPressed_2_, int p_keyPressed_3_) { - if (keyCode == GLFW.GLFW_KEY_ENTER) { - confirm.onPress(); - return true; - } - if (keyCode == 256 && this.shouldCloseOnEsc()) { - this.onClose(); - return true; - } - return nameField.keyPressed(keyCode, p_keyPressed_2_, p_keyPressed_3_); - } - -} diff --git a/src/main/java/com/simibubi/create/foundation/gui/ToolSelectionScreen.java b/src/main/java/com/simibubi/create/foundation/gui/ToolSelectionScreen.java index 1fbeb89ec..3ffd47160 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/ToolSelectionScreen.java +++ b/src/main/java/com/simibubi/create/foundation/gui/ToolSelectionScreen.java @@ -11,11 +11,9 @@ import com.simibubi.create.foundation.utility.Lang; import net.minecraft.client.MainWindow; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.screen.Screen; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; public class ToolSelectionScreen extends Screen { diff --git a/src/main/java/com/simibubi/create/foundation/gui/widgets/AbstractSimiWidget.java b/src/main/java/com/simibubi/create/foundation/gui/widgets/AbstractSimiWidget.java index ada29fae0..149c25fb8 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widgets/AbstractSimiWidget.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widgets/AbstractSimiWidget.java @@ -4,6 +4,7 @@ import java.util.LinkedList; import java.util.List; import com.mojang.blaze3d.matrix.MatrixStack; + import net.minecraft.client.gui.widget.Widget; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/com/simibubi/create/foundation/gui/widgets/IconButton.java b/src/main/java/com/simibubi/create/foundation/gui/widgets/IconButton.java index 7f66463c1..83049c1de 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widgets/IconButton.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widgets/IconButton.java @@ -4,6 +4,7 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.AllIcons; + import net.minecraft.util.text.ITextComponent; public class IconButton extends AbstractSimiWidget { diff --git a/src/main/java/com/simibubi/create/foundation/gui/widgets/Indicator.java b/src/main/java/com/simibubi/create/foundation/gui/widgets/Indicator.java index a28b4edcb..25df71cb1 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/widgets/Indicator.java +++ b/src/main/java/com/simibubi/create/foundation/gui/widgets/Indicator.java @@ -3,6 +3,7 @@ package com.simibubi.create.foundation.gui.widgets; import com.google.common.collect.ImmutableList; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.foundation.gui.AllGuiTextures; + import net.minecraft.util.text.ITextComponent; public class Indicator extends AbstractSimiWidget { diff --git a/src/main/java/com/simibubi/create/foundation/item/PartialItemModelRenderer.java b/src/main/java/com/simibubi/create/foundation/item/PartialItemModelRenderer.java index d5779c3ab..2d11e69d3 100644 --- a/src/main/java/com/simibubi/create/foundation/item/PartialItemModelRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/item/PartialItemModelRenderer.java @@ -6,7 +6,6 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.foundation.renderState.RenderTypes; -import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.ItemRenderer; diff --git a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java index 6dec1a9e7..67d233f5b 100644 --- a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java +++ b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import com.mojang.bridge.game.Language; import com.simibubi.create.AllItems; @@ -38,13 +39,22 @@ public class TooltipHelper { public static IFormattableTextComponent holdShift(Palette color, boolean highlighted) { TextFormatting colorFormat = highlighted ? color.hColor : color.color; - return Lang.translate("tooltip.holdKey", DARK_GRAY).append(Lang.translate("tooltip.keyShift").formatted(colorFormat)); + return Lang.translate("tooltip.holdKey", DARK_GRAY) + .append(Lang.translate("tooltip.keyShift") + .formatted(colorFormat)); } public static List cutString(ITextComponent s, TextFormatting defaultColor, TextFormatting highlightColor) { return cutString(s.getUnformattedComponentText(), defaultColor, highlightColor, 0); } + public static List cutStringToComponents(ITextComponent s, TextFormatting defaultColor, + TextFormatting highlightColor) { + return cutString(s.getUnformattedComponentText(), defaultColor, highlightColor, 0).stream() + .map(ITextComponent::of) + .collect(Collectors.toList()); + } + public static List cutString(String s, TextFormatting defaultColor, TextFormatting highlightColor, int indent) { String lineStart = defaultColor.toString(); @@ -97,8 +107,8 @@ public class TooltipHelper { checkLocale(); ClientPlayerEntity player = Minecraft.getInstance().player; - boolean hasGlasses = player != null - && AllItems.GOGGLES.isIn(player.getItemStackFromSlot(EquipmentSlotType.HEAD)); + boolean hasGlasses = + player != null && AllItems.GOGGLES.isIn(player.getItemStackFromSlot(EquipmentSlotType.HEAD)); if (hasGlasses != gogglesMode) { gogglesMode = hasGlasses; diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/SyncedTileEntity.java b/src/main/java/com/simibubi/create/foundation/tileEntity/SyncedTileEntity.java index beda6786c..d16146759 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/SyncedTileEntity.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/SyncedTileEntity.java @@ -1,5 +1,7 @@ package com.simibubi.create.foundation.tileEntity; +import javax.annotation.ParametersAreNonnullByDefault; + import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; @@ -8,8 +10,6 @@ import net.minecraft.network.play.server.SUpdateTileEntityPacket; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; -import javax.annotation.ParametersAreNonnullByDefault; - @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault public abstract class SyncedTileEntity extends TileEntity { diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBox.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBox.java index d98ce4678..1bfd4cfcd 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBox.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBox.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBoxTransform.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBoxTransform.java index f73f150b7..f5d132732 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBoxTransform.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/ValueBoxTransform.java @@ -2,11 +2,11 @@ package com.simibubi.create.foundation.tileEntity.behaviour; import java.util.function.Function; -import com.simibubi.create.foundation.utility.BlockHelper; import org.apache.commons.lang3.tuple.Pair; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.foundation.utility.AngleHelper; +import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.MatrixStacker; import com.simibubi.create.foundation.utility.VecHelper; diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/edgeInteraction/EdgeInteractionHandler.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/edgeInteraction/EdgeInteractionHandler.java index a0ee70745..8d7febe9a 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/edgeInteraction/EdgeInteractionHandler.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/edgeInteraction/EdgeInteractionHandler.java @@ -7,7 +7,6 @@ import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.RaycastHelper; -import net.minecraft.block.Block; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResultType; diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringRenderer.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringRenderer.java index fac2c18ec..75e929410 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/filtering/FilteringRenderer.java @@ -26,7 +26,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/InvManipulationBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/InvManipulationBehaviour.java index eeecbff6c..d27d779bf 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/InvManipulationBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/inventory/InvManipulationBehaviour.java @@ -13,8 +13,8 @@ import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.BehaviourType; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.utility.BlockFace; - import com.simibubi.create.foundation.utility.BlockHelper; + import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.state.properties.BlockStateProperties; diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/BulkScrollValueBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/BulkScrollValueBehaviour.java index 7a4dc7936..245dab41f 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/BulkScrollValueBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/BulkScrollValueBehaviour.java @@ -5,6 +5,7 @@ import java.util.function.Function; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; + import net.minecraft.util.text.ITextComponent; public class BulkScrollValueBehaviour extends ScrollValueBehaviour { diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollOptionBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollOptionBehaviour.java index 8fc70eda2..2756fa313 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollOptionBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollOptionBehaviour.java @@ -2,6 +2,7 @@ package com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.behaviour.ValueBoxTransform; + import net.minecraft.util.text.ITextComponent; public class ScrollOptionBehaviour & INamedIconOptions> extends ScrollValueBehaviour { diff --git a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java index 50882f9ea..bc608cc8a 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/BlockHelper.java @@ -2,23 +2,25 @@ package com.simibubi.create.foundation.utility; import java.util.function.Consumer; -import net.minecraft.block.Blocks; -import net.minecraft.client.world.ClientWorld; -import net.minecraft.item.Items; -import net.minecraft.state.Property; -import net.minecraft.tags.BlockTags; +import javax.annotation.Nullable; + import org.apache.commons.lang3.mutable.MutableInt; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; import net.minecraft.client.particle.DiggingParticle; import net.minecraft.client.particle.ParticleManager; +import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.FluidState; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.state.Property; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.SlabType; +import net.minecraft.tags.BlockTags; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; @@ -31,8 +33,6 @@ import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import javax.annotation.Nullable; - public class BlockHelper { @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/com/simibubi/create/foundation/utility/DyeHelper.java b/src/main/java/com/simibubi/create/foundation/utility/DyeHelper.java index 9378a2bbd..71e8eb98d 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/DyeHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/DyeHelper.java @@ -3,7 +3,6 @@ package com.simibubi.create.foundation.utility; import net.minecraft.block.Blocks; import net.minecraft.item.DyeColor; import net.minecraft.item.Item; -import net.minecraft.tags.Tag; import net.minecraft.util.IItemProvider; import net.minecraftforge.common.Tags; diff --git a/src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java b/src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java index 74a949ac1..26decc098 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java +++ b/src/main/java/com/simibubi/create/foundation/utility/MatrixStacker.java @@ -2,9 +2,9 @@ package com.simibubi.create.foundation.utility; import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.math.vector.Vector3i; public class MatrixStacker { diff --git a/src/main/java/com/simibubi/create/foundation/utility/ShadowRenderHelper.java b/src/main/java/com/simibubi/create/foundation/utility/ShadowRenderHelper.java index b0e2b4c64..aa903ce29 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/ShadowRenderHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/ShadowRenderHelper.java @@ -13,8 +13,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IWorldReader; /** diff --git a/src/main/java/com/simibubi/create/foundation/utility/SuperByteBuffer.java b/src/main/java/com/simibubi/create/foundation/utility/SuperByteBuffer.java index a59e976dd..b66d3b15f 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/SuperByteBuffer.java +++ b/src/main/java/com/simibubi/create/foundation/utility/SuperByteBuffer.java @@ -12,11 +12,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.BufferBuilder.DrawState; import net.minecraft.client.renderer.GLAllocation; -import net.minecraft.util.math.vector.Matrix4f; -import net.minecraft.util.math.vector.Vector4f; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector4f; import net.minecraft.world.LightType; import net.minecraft.world.World; diff --git a/src/main/java/com/simibubi/create/foundation/utility/TileEntityRenderHelper.java b/src/main/java/com/simibubi/create/foundation/utility/TileEntityRenderHelper.java index dbda9ebfd..1fc14fd8c 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/TileEntityRenderHelper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/TileEntityRenderHelper.java @@ -8,8 +8,6 @@ import com.simibubi.create.foundation.config.AllConfigs; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.util.math.vector.Matrix4f; -import net.minecraft.util.math.vector.Vector4f; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; @@ -17,6 +15,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.crash.ReportedException; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector4f; import net.minecraft.world.World; public class TileEntityRenderHelper { diff --git a/src/main/java/com/simibubi/create/foundation/utility/VoxelShaper.java b/src/main/java/com/simibubi/create/foundation/utility/VoxelShaper.java index 588e62adf..afd16c702 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/VoxelShaper.java +++ b/src/main/java/com/simibubi/create/foundation/utility/VoxelShaper.java @@ -11,9 +11,9 @@ import net.minecraft.block.Block; import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; import net.minecraft.util.Direction.AxisDirection; -import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; +import net.minecraft.util.math.vector.Vector3d; public class VoxelShaper { diff --git a/src/main/java/com/simibubi/create/foundation/utility/outliner/Outline.java b/src/main/java/com/simibubi/create/foundation/utility/outliner/Outline.java index 5d7041a9d..d71b18283 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/outliner/Outline.java +++ b/src/main/java/com/simibubi/create/foundation/utility/outliner/Outline.java @@ -15,11 +15,11 @@ import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.MatrixStacker; import com.simibubi.create.foundation.utility.VecHelper; -import net.minecraft.util.math.vector.Matrix3f; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.util.Direction; import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Matrix3f; import net.minecraft.util.math.vector.Vector3d; public abstract class Outline { diff --git a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedServerWorld.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedServerWorld.java index cf885a6b0..ec967e3d7 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedServerWorld.java +++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedServerWorld.java @@ -3,6 +3,8 @@ package com.simibubi.create.foundation.utility.worldWrappers; import java.util.Collections; import java.util.List; +import javax.annotation.ParametersAreNonnullByDefault; + import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -28,8 +30,6 @@ import net.minecraft.world.storage.MapData; import net.minecraft.world.storage.SaveFormat; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import javax.annotation.ParametersAreNonnullByDefault; - @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class WrappedServerWorld extends ServerWorld { diff --git a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedWorld.java b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedWorld.java index 7dd5e0956..4533e8840 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedWorld.java +++ b/src/main/java/com/simibubi/create/foundation/utility/worldWrappers/WrappedWorld.java @@ -4,6 +4,8 @@ import java.util.Collections; import java.util.List; import java.util.function.Predicate; +import javax.annotation.ParametersAreNonnullByDefault; + import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -26,8 +28,6 @@ import net.minecraft.world.chunk.AbstractChunkProvider; import net.minecraft.world.storage.ISpawnWorldInfo; import net.minecraft.world.storage.MapData; -import javax.annotation.ParametersAreNonnullByDefault; - @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault public class WrappedWorld extends World { diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java b/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java index 3f2647e13..b6d3686a3 100644 --- a/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java @@ -4,21 +4,17 @@ import static net.minecraft.world.biome.Biome.Category.DESERT; import static net.minecraft.world.biome.Biome.Category.OCEAN; import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; import java.util.Optional; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.palettes.AllPaletteBlocks; import com.simibubi.create.foundation.utility.Lang; -import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.Biomes; import net.minecraft.world.biome.Biome.Category; +import net.minecraft.world.biome.Biomes; import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.event.world.BiomeLoadingEvent; -import net.minecraftforge.registries.ForgeRegistries; public enum AllWorldFeatures { diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java b/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java index e46e8f609..83bc447ab 100644 --- a/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/OxidizingBlock.java @@ -1,7 +1,12 @@ package com.simibubi.create.foundation.worldgen; +import java.util.LinkedList; +import java.util.OptionalDouble; +import java.util.Random; + import com.simibubi.create.content.curiosities.tools.SandPaperItem; import com.simibubi.create.foundation.utility.BlockHelper; + import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; @@ -16,10 +21,6 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import java.util.LinkedList; -import java.util.OptionalDouble; -import java.util.Random; - public class OxidizingBlock extends Block { public static final IntegerProperty OXIDIZATION = IntegerProperty.create("oxidization", 0, 7);