From fb1d74944a7e762999e28d54d7f5adaad5970fc8 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Wed, 17 Dec 2014 23:23:02 -0800 Subject: [PATCH] Adding Cables; Slowing the animations down a little on Gears --- .../com/cricketcraft/chisel/init/ModBlocks.java | 3 ++- src/main/resources/assets/chisel/lang/en_US.lang | 2 +- .../textures/blocks/technical/cables-ctm.png | Bin 0 -> 6420 bytes .../chisel/textures/blocks/technical/cables.png | Bin 0 -> 4373 bytes .../technical/spinningStuffAnim-ctm.png.mcmeta | 2 +- .../technical/spinningStuffAnim.png.mcmeta | 2 +- 6 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/cables-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/cables.png diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 5f6c8547..d244797e 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1473,10 +1473,11 @@ public class ModBlocks { technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.4.desc"), 4, "technical/fanFast"); technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.5.desc"), 5, "technical/pipesSmall"); technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.6.desc"), 6, "technical/fanStill"); - technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.7.desc"), 7, "technical/vent"); // I need help making this thing accept the CTM :( + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.7.desc"), 7, "technical/vent"); technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.8.desc"), 8, "technical/ventGlowing"); technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.9.desc"), 9, "technical/insulation"); technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.10.desc"), 10, "technical/spinningStuffAnim"); + technical.carverHelper.addVariation(StatCollector.translateToLocal("tile.technical.11.desc"), 11, "technical/cables"); technical.carverHelper.register(technical, "technical"); Carving.chisel.registerOre("technical", "technical"); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 151d12d7..81a299e8 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -139,7 +139,7 @@ tile.technical.7.desc=Vents tile.technical.8.desc=Glowing Vents tile.technical.9.desc=Insulation tile.technical.10.desc=Gears and Flywheels -tile.technical.11.desc=Wires +tile.technical.11.desc=Cables tile.technical.12.desc=Broken Panels on Scaffolds tile.technical.13.desc=Grate tile.technical.14.desc=Malfunctioning Fan diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/cables-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/cables-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..7ac9f92345e5131488d43309cbea4beb38547d3b GIT binary patch literal 6420 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