Merge branch 'dev' of https://github.com/Chisel-Team/Chisel-2.git into dev
No files matched your search
@@ -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");
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
After Width: | Height: | Size: 3.1 KiB |
|
After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 8.8 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |