diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index a9207e030c..10487dc868 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -367,7 +367,7 @@ category.general = General category.power = Power category.liquids = Liquids category.items = Items -category.crafting = Crafting +category.crafting = Input/Output category.shooting = Shooting category.optional = Optional Enhancements setting.animatedwater.name = Animated Water diff --git a/core/src/io/anuke/mindustry/editor/EditorTile.java b/core/src/io/anuke/mindustry/editor/EditorTile.java index eb4d9af6ba..52b3eef819 100644 --- a/core/src/io/anuke/mindustry/editor/EditorTile.java +++ b/core/src/io/anuke/mindustry/editor/EditorTile.java @@ -92,6 +92,7 @@ public class EditorTile extends Tile{ if(block.hasEntity()){ entity = block.newEntity(); + entity.health = block.health; entity.cons = new ConsumeModule(entity); if(block.hasItems) entity.items = new ItemModule(); if(block.hasLiquids) entity.liquids = new LiquidModule(); diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java index 4789dc5baa..5ab952ac37 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditor.java +++ b/core/src/io/anuke/mindustry/editor/MapEditor.java @@ -3,7 +3,6 @@ package io.anuke.mindustry.editor; import io.anuke.arc.collection.ObjectMap; import io.anuke.arc.files.FileHandle; import io.anuke.arc.math.Mathf; -import io.anuke.arc.util.Log; import io.anuke.arc.util.Pack; import io.anuke.arc.util.Structs; import io.anuke.mindustry.content.Blocks; @@ -210,7 +209,6 @@ public class MapEditor{ if(!isfloor){ byte link = tile.getLinkByte(); - Log.info("Remove linkd: " + tiles[x][y]); if(tile.block().isMultiblock()){ removeLinked(wx, wy);