From b27c1cb160516772cc26d4d17987a254e7942136 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Mon, 5 Jan 2015 16:44:55 -0800 Subject: [PATCH] Commit stuff for MCBugtracker. --- .../cricketcraft/chisel/init/ModBlocks.java | 1 + .../resources/assets/chisel/lang/en_US.lang | 1 + .../textures/blocks/futura/controllerWIP.png | Bin 0 -> 6037 bytes .../blocks/futura/controllerWIP.png.mcmeta | 19 ++++++++++++++++++ 4 files changed, 21 insertions(+) create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP.png.mcmeta diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 1141802f..21484d19 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1608,6 +1608,7 @@ public class ModBlocks { futura = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ModTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.0.desc"), 0, "futura/screenMetallicWIP"); futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.1.desc"), 1, "futura/screenCyanWIP"); + futura.carverHelper.addVariation(StatCollector.translateToLocal("tile.futura.2.desc"), 2, "futura/controllerWIP"); futura.carverHelper.register(futura, "futura"); Carving.chisel.registerOre("futura", "futura"); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index fa42c9b6..dded201c 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -107,6 +107,7 @@ tile.arcane.8.desc=Spatial Conduit tile.futura.name=Futura Block tile.futura.0.desc=Glowing Screen with Metallic Borders tile.futura.1.desc=Glowing Screen with Cyan Borders +tile.futura.2.desc=Applied Labyrinthic Neon Lines #Waterstone tile.waterstone.name=Waterstone diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP.png b/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP.png new file mode 100644 index 0000000000000000000000000000000000000000..21bf3091d2f3f30d86175b4e333963de2efc4a9f GIT binary patch literal 6037 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP.png.mcmeta new file mode 100644 index 00000000..5081e3ee --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/futura/controllerWIP.png.mcmeta @@ -0,0 +1,19 @@ +{ + "animation": { + "width": 64, + "height": 48, + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + ] + } +} \ No newline at end of file