From c6a96fd21c8261250a0146f09dc3b72badb42eff Mon Sep 17 00:00:00 2001 From: Drullkus Date: Mon, 26 Jan 2015 20:12:10 -0800 Subject: [PATCH] Stuff --- .../java/com/cricketcraft/chisel/Features.java | 5 +++-- src/main/resources/assets/chisel/lang/en_US.lang | 2 ++ .../chisel/textures/blocks/thaumium/lattice.png | Bin 0 -> 3362 bytes .../textures/blocks/thaumium/planks-ctm.png | Bin 0 -> 4544 bytes .../chisel/textures/blocks/thaumium/planks.png | Bin 0 -> 3334 bytes 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/thaumium/lattice.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/thaumium/planks-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/thaumium/planks.png diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index edbc2fdb..ef851980 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2107,7 +2107,6 @@ public enum Features { }, TEMPLE_BLOCK_MOSSY { - @Override void addBlocks() { BlockCarvable mossy_templeblock = (BlockCarvable) new BlockEldritch().setHardness(2.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setResistance(10F) @@ -2187,7 +2186,9 @@ public enum Features { thaumium.carverHelper.addVariation("tile.thaumium.0.desc", 0, "thaumium/ornate"); thaumium.carverHelper.addVariation("tile.thaumium.1.desc", 1, "thaumium/totem"); thaumium.carverHelper.addVariation("tile.thaumium.2.desc", 2, "thaumium/thaumiumBigBricks"); - thaumium.carverHelper.addVariation("tile.thaumium.3.desc", 3, "thaumium/small"); + thaumium.carverHelper.addVariation("tile.thaumium.3.desc", 3, "thaumium/small"); + thaumium.carverHelper.addVariation("tile.thaumium.4.desc", 4, "thaumium/lattice"); + thaumium.carverHelper.addVariation("tile.thaumium.5.desc", 5, "thaumium/planks"); thaumium.carverHelper.registerAll(thaumium, "thaumium"); Carving.chisel.registerOre("thaumium", "thaumium"); } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 1eaf045e..97b30bd6 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -142,6 +142,8 @@ tile.thaumium.0.desc=Ornate Pattern tile.thaumium.1.desc=Totem Faces tile.thaumium.2.desc=Bricks tile.thaumium.3.desc=Small Tiles +tile.thaumium.4.desc=Lattice +tile.thaumium.5.desc=Bounded Planks #Tallow tile.tallow.name=Block of Tallow diff --git a/src/main/resources/assets/chisel/textures/blocks/thaumium/lattice.png b/src/main/resources/assets/chisel/textures/blocks/thaumium/lattice.png new file mode 100644 index 0000000000000000000000000000000000000000..a6976957f6337cc1ce3fd562a9837eccd90bd966 GIT binary patch literal 3362 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