diff --git a/build.gradle b/build.gradle index 391da333..9756c92b 100644 --- a/build.gradle +++ b/build.gradle @@ -165,3 +165,5 @@ curse { displayName = "Chisel 2 - ${mod_version}" additionalArtifact deobfJar, sourcesJar, apiJar } + +sourceSets { main { output.resourcesDir = output.classesDir } } diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 351a89f0..5294fdb3 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2143,7 +2143,15 @@ public enum Features { stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.14.desc", 14, "stonebrick/ornatepanel"); stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.15.desc", 15, "stonebrick/poison"); stonebricksmooth.carverHelper.registerAll(stonebricksmooth, "stonebricksmooth"); - Carving.chisel.registerOre("stonebricksmooth", "stonebricksmooth"); + + BlockCarvable stonebricksmooth2 = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(1.5F).setResistance(10.0F) + .setStepSound(Block.soundTypeStone); + stonebricksmooth2.carverHelper.addVariation("tile.stonebricksmooth2.0.desc", 0, "stonebrick2/masonryPlain"); + stonebricksmooth2.carverHelper.addVariation("tile.stonebricksmooth2.1.desc", 1, "stonebrick2/masonryFelsic"); + stonebricksmooth2.carverHelper.addVariation("tile.stonebricksmooth2.2.desc", 2, "stonebrick2/masonryMafic"); + stonebricksmooth2.carverHelper.addVariation("tile.stonebricksmooth2.3.desc", 3, "stonebrick2/masonryMixed"); + stonebricksmooth2.carverHelper.registerAll(stonebricksmooth2, "stonebricksmooth2"); + Carving.chisel.registerOre("stonebricksmooth2", "stonebricksmooth"); } }, diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 6ab01dcc..782950ee 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -238,12 +238,12 @@ tile.technical.15.desc=Rusty Grate tile.chisel.technical2.name=Transparent Technical Block #Metal Blocks -tile.metalOre.0.desc = Caution Stripes -tile.metalOre.1.desc = Shipping Crate -tile.metalOre.2.desc = Thermal -tile.metalOre.3.desc = An Old Relic from the land of Oneteufyv -tile.metalOre.4.desc = Egregiously Bordered Block -tile.metalOre.5.desc = Fancy Bolted Plating +tile.metalOre.0.desc=Caution Stripes +tile.metalOre.1.desc=Shipping Crate +tile.metalOre.2.desc=Thermal +tile.metalOre.3.desc=An Old Relic from the land of Oneteufyv +tile.metalOre.4.desc=Egregiously Bordered Block +tile.metalOre.5.desc=Fancy Bolted Plating #Present Chest tile.chisel.present.name=Present Box diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/malfunctionFan-top.png b/src/main/resources/assets/chisel/textures/blocks/technical/malfunctionFan-top.png new file mode 100644 index 00000000..5838a689 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/malfunctionFan-top.png differ