diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 2ad979b5..f7310edc 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2002,6 +2002,9 @@ public enum Features { purpur.carverHelper.addVariation("tile.purpur.5.desc", 5, "end_purpur/prismaticPurpur"); purpur.carverHelper.addVariation("tile.purpur.6.desc", 6, "end_purpur/purpurBricks"); purpur.carverHelper.addVariation("tile.purpur.7.desc", 7, "end_purpur/purpurCobble"); + purpur.carverHelper.addVariation("tile.purpur.8.desc", 8, "end_purpur/arcanePurpur"); + purpur.carverHelper.addVariation("tile.purpur.9.desc", 9, "end_purpur/purpurLargeTile"); + purpur.carverHelper.addVariation("tile.purpur.10.desc", 10, "end_purpur/purpurOrnate"); purpur.carverHelper.registerAll(purpur, "purpur"); Carving.chisel.registerOre("purpur", "purpur"); @@ -2471,10 +2474,11 @@ public enum Features { technical4.carverHelper.addVariation("tile.technical4.1.desc", 1, "technical/new/weatheredOrangePanels"); technical4.carverHelper.addVariation("tile.technical4.2.desc", 2, "technical/new/Sturdy"); technical4.carverHelper.addVariation("tile.technical4.3.desc", 3, "technical/new/MegaCell"); - technical4.carverHelper.addVariation("tile.technical4.4.desc", 4, "technical/new/test/ExhaustPlating", new SubmapManagerCombinedCTM(4, "technical/new/test/ExhaustPlating", TextureType.R4)); + technical4.carverHelper.addVariation("tile.technical4.4.desc", 4, "technical/new/ExhaustPlating"/*, new SubmapManagerCombinedCTM(4, "technical/new/test/ExhaustPlating", TextureType.R4)*/); technical4.carverHelper.addVariation("tile.technical4.5.desc", 5, "technical/new/MakeshiftPanels"); - technical4.carverHelper.addVariation("tile.technical4.6.desc", 6, "technical/new/TapeDrive"); - technical4.carverHelper.addVariation("tile.technical4.7.desc", 7, "technical/new/Piping"); + technical4.carverHelper.addVariation("tile.technical4.6.desc", 6, "technical/new/Piping"); + //The animation is malfunctioning. :( + //technical4.carverHelper.addVariation("tile.technical4.7.desc", 7, "technical/new/TapeDrive"); technical4.carverHelper.registerBlock(technical4, "technical4"); technical4.carverHelper.registerVariations("technical"); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 31e39b4a..11545f65 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -258,6 +258,7 @@ tile.futura.1.desc=Glowing Screen with Cyan Borders tile.futura.2.desc=Applied Labyrinthic Neon Lines tile.futura.3.desc=Poptart Rainbow tile.futura.4.desc=Purple Applied Labyrinthic Neon Lines +tile.futura.5.desc=Psychedelic Poptart Rainbow.v02 tile.futuraCircuit.black.desc=Black tile.futuraCircuit.blue.desc=Blue tile.futuraCircuit.brown.desc=Brown @@ -367,9 +368,15 @@ tile.end_Stone.4.desc=Fancy Bricks tile.end_Stone.5.desc=End Stone Pillar tile.end_Stone.6.desc=Etched End Stone tile.end_Stone.7.desc=Prismatic End Stone +tile.end_Stone.8.desc=End Stone Chunk +tile.end_Stone.9.desc=Framed End Stone Chunk +tile.end_Stone.10.desc=Arcane Block of End Stone +tile.end_Stone.11.desc=Framed End Stone +tile.end_Stone.12.desc=Ornate End Stone +tile.end_Stone.13.desc=End Stone Large Tile #Purpur -tile.chisel.purpur.name=Purpur +tile.chisel.purpur.name=Purpur Block tile.purpur.0.desc=Medium Tiles tile.purpur.1.desc=Pillar tile.purpur.2.desc=Not Shulker @@ -378,6 +385,9 @@ tile.purpur.4.desc=Broken Small Tiles tile.purpur.5.desc=Prismatic Purpur tile.purpur.6.desc=Rough Bricks tile.purpur.7.desc=Cracked Surface +tile.purpur.8.desc=Arcane Block of Purpur +tile.purpur.9.desc=Purpur Large Tile +tile.purpur.10.desc=Ornate Purpur #Metal Blocks tile.chisel.aluminumblock.name=Block of Aluminum diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/arcanePurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/arcanePurpur.png new file mode 100644 index 00000000..d952275f Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/arcanePurpur.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png index a5229b3c..a919365b 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png index f7110c11..08674bbf 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurLargeTile.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurLargeTile.png new file mode 100644 index 00000000..ac3bc5b7 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurLargeTile.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurOrnate.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurOrnate.png new file mode 100644 index 00000000..78adad2e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurOrnate.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/tileBrokenPurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/tileBrokenPurpur.png index 4f378dd9..771e24d8 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/end_purpur/tileBrokenPurpur.png and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/tileBrokenPurpur.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png index 0a677464..38b70b2e 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png and b/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png b/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png index 9e831d9e..e4f340df 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png and b/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/chaoticBricks.png b/src/main/resources/assets/chisel/textures/blocks/endstone/chaoticBricks.png index f5ba5891..6f609005 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/endstone/chaoticBricks.png and b/src/main/resources/assets/chisel/textures/blocks/endstone/chaoticBricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endFrenchBricks.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endFrenchBricks.png index 1baf1887..85030ee1 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/endstone/endFrenchBricks.png and b/src/main/resources/assets/chisel/textures/blocks/endstone/endFrenchBricks.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-side.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-side.png index 3f8ccc19..f68a5da9 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-side.png and b/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png index 5bdf0a06..d5876b35 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png and b/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneChunk-v9.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneChunk-v9.png index b0cb0fac..6e4aff58 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneChunk-v9.png and b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneChunk-v9.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-side.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-side.png index c27e9c8c..1f0d0087 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-side.png and b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-side.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-top.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-top.png index c3e1ca58..712d2f88 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-top.png and b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-top.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneLargeTile.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneLargeTile.png index 0e5c0705..48e45b61 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneLargeTile.png and b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneLargeTile.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneOrnate.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneOrnate.png index cb059641..997310a5 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneOrnate.png and b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneOrnate.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/enderCircuit.png b/src/main/resources/assets/chisel/textures/blocks/endstone/enderCircuit.png index 8e427eba..44814ca5 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/endstone/enderCircuit.png and b/src/main/resources/assets/chisel/textures/blocks/endstone/enderCircuit.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/prismaticEndStone.png b/src/main/resources/assets/chisel/textures/blocks/endstone/prismaticEndStone.png index 2ef7e78f..5e63a01b 100644 Binary files a/src/main/resources/assets/chisel/textures/blocks/endstone/prismaticEndStone.png and b/src/main/resources/assets/chisel/textures/blocks/endstone/prismaticEndStone.png differ