diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index 041ae095..9f1989f0 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1719,8 +1719,8 @@ public class ModBlocks { arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.2.desc"), 2, "arcane/arcaneTile"); arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.3.desc"), 3, "arcane/arcaneRunes"); arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.4.desc"), 4, "arcane/arcaneRunesGlow"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.5.desc"), 5, "arcane/arcaneBigBrick"); - arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.6.desc"), 6, "arcane/conduitAnim"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.5.desc"), 5, "arcane/bigBrick"); + arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.6.desc"), 6, "arcane/conduitGlowAnim"); arcane.carverHelper.addVariation(StatCollector.translateToLocal("tile.arcane.7.desc"), 7, "arcane/BorderBrain"); arcane.carverHelper.register(arcane, "arcane"); Carving.chisel.registerOre("arcane", "arcane"); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index e88b4eb9..c2e70bed 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -80,8 +80,9 @@ tile.arcane.2.desc=Beveled Tile tile.arcane.3.desc=Engraved Symbols tile.arcane.4.desc=Glowing Symbols tile.arcane.5.desc=Bricks -tile.arcane.6.desc=Vis Conduit +tile.arcane.6.desc=Flux Conduit tile.arcane.7.desc=Braaainz +tile.arcane.8.desc=Controlled Conduit #Futura tile.futura.name=Futura Block diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/bigBrick-ctm.png b/src/main/resources/assets/chisel/textures/blocks/arcane/bigBrick-ctm.png new file mode 100644 index 00000000..9212040f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/bigBrick-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/bigBrick.png b/src/main/resources/assets/chisel/textures/blocks/arcane/bigBrick.png new file mode 100644 index 00000000..25f0aea5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/bigBrick.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/conduitGlowAnim-ctm.png b/src/main/resources/assets/chisel/textures/blocks/arcane/conduitGlowAnim-ctm.png new file mode 100644 index 00000000..7ab6072c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/conduitGlowAnim-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/conduitGlowAnim-ctm.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/arcane/conduitGlowAnim-ctm.png.mcmeta new file mode 100644 index 00000000..1a9420f9 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/arcane/conduitGlowAnim-ctm.png.mcmeta @@ -0,0 +1,19 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/conduitGlowAnim.png b/src/main/resources/assets/chisel/textures/blocks/arcane/conduitGlowAnim.png new file mode 100644 index 00000000..54073fd6 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/conduitGlowAnim.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/conduitGlowAnim.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/arcane/conduitGlowAnim.png.mcmeta new file mode 100644 index 00000000..1a9420f9 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/arcane/conduitGlowAnim.png.mcmeta @@ -0,0 +1,19 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file