diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 5f1eb249..eed5a19a 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -2480,7 +2480,8 @@ public enum Features { .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/Piping"); - // The animation is malfunctioning. :( + technical4.carverHelper.addVariation("tile.technical4.7.desc", 7, "technical/new/concrete/concreteBlocks" , new SubmapManagerCombinedCTM(9, "technical/new/concrete/concreteBlocks", TextureType.R9)); + // 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 11545f65..b5a3311d 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -355,8 +355,9 @@ tile.technical4.2.desc=Sturdy tile.technical4.3.desc=MegaCell™ Battery tile.technical4.4.desc=Thermal Exhaust Plating tile.technical4.5.desc=Makeshift Plating -tile.technical4.6.desc=Tape Drive? (I'm too young for this.) -tile.technical4.7.desc=Pipe Dream +tile.technical4.6.desc=Pipe Dream +tile.technical4.7.desc=Worn Concrete +tile.technical4.16.desc=Tape Drive? (I'm too young for this.) #End Stone tile.chisel.end_Stone.name=End Stone diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-0-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-0-ctm.png new file mode 100644 index 00000000..271f2a32 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-0-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-0.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-0.png new file mode 100644 index 00000000..1212e336 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-0.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-1-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-1-ctm.png new file mode 100644 index 00000000..715b45ac Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-1-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-1.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-1.png new file mode 100644 index 00000000..5c597c0e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-2-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-2-ctm.png new file mode 100644 index 00000000..791f94c5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-2-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-2.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-2.png new file mode 100644 index 00000000..a8d82c37 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-3-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-3-ctm.png new file mode 100644 index 00000000..e5f871e2 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-3-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-3.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-3.png new file mode 100644 index 00000000..37986cb5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-4-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-4-ctm.png new file mode 100644 index 00000000..a9716c73 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-4-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-4.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-4.png new file mode 100644 index 00000000..1f7d1569 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-5-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-5-ctm.png new file mode 100644 index 00000000..d289a2e5 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-5-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-5.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-5.png new file mode 100644 index 00000000..5cc053b9 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-5.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-6-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-6-ctm.png new file mode 100644 index 00000000..945e56ad Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-6-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-6.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-6.png new file mode 100644 index 00000000..f2363d50 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-6.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-7-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-7-ctm.png new file mode 100644 index 00000000..39ba20da Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-7-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-7.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-7.png new file mode 100644 index 00000000..8f3dcfcf Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-7.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-8-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-8-ctm.png new file mode 100644 index 00000000..fec7621d Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-8-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-8.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-8.png new file mode 100644 index 00000000..3ab01023 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-8.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-ctm.png new file mode 100644 index 00000000..a9716c73 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks.png new file mode 100644 index 00000000..1f7d1569 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/technical/new/concrete/concreteBlocks.png differ