diff --git a/gradle.properties b/gradle.properties index e6be616c..4b45ff9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ minecraft_version=1.7.10 forge_version=10.13.4.1481-1.7.10 ctmlib_version=1.2.0-9 -ccl_version=1.1.3.136 -ccc_version=1.0.6.43 -nei_version=1.0.4.107 +ccl_version=1.1.3.140 +ccc_version=1.0.7.46 +nei_version=1.0.5.111 waila_version=1.5.10 fmp_version=1.2.0.344 diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 6257e7b2..2ad979b5 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -714,6 +714,12 @@ public enum Features { end_Stone.carverHelper.addVariation("tile.end_Stone.5.desc", 5, "endstone/endPillar"); end_Stone.carverHelper.addVariation("tile.end_Stone.6.desc", 6, "endstone/endStoneEtched"); end_Stone.carverHelper.addVariation("tile.end_Stone.7.desc", 7, "endstone/prismaticEndStone"); + end_Stone.carverHelper.addVariation("tile.end_Stone.8.desc", 8, "endstone/endStoneChunk"); + end_Stone.carverHelper.addVariation("tile.end_Stone.9.desc", 9, "endstone/EnderFrame", new SubmapManagerCombinedCTM(9, "endstone/EnderFrame", TextureType.V9)); + end_Stone.carverHelper.addVariation("tile.end_Stone.10.desc", 10, "endstone/arcaneEndStone"); + end_Stone.carverHelper.addVariation("tile.end_Stone.11.desc", 11, "endstone/framedEndStone"); + end_Stone.carverHelper.addVariation("tile.end_Stone.12.desc", 12, "endstone/endstoneOrnate"); + end_Stone.carverHelper.addVariation("tile.end_Stone.13.desc", 13, "endstone/endstoneLargeTile"); end_Stone.carverHelper.registerAll(end_Stone, "end_Stone"); Carving.chisel.registerOre("end_Stone", "end_Stone"); } 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 a07a639b..9e831d9e 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/EnderFrame-0-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-0-ctm.png new file mode 100644 index 00000000..d178a56c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-0-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-0.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-0.png new file mode 100644 index 00000000..f10508a3 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-0.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-1-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-1-ctm.png new file mode 100644 index 00000000..b3205a12 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-1-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-1.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-1.png new file mode 100644 index 00000000..d1f95695 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-1.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-2-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-2-ctm.png new file mode 100644 index 00000000..46dca7cb Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-2-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-2.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-2.png new file mode 100644 index 00000000..dfc0caaa Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-2.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-3-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-3-ctm.png new file mode 100644 index 00000000..1c7d8151 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-3-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-3.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-3.png new file mode 100644 index 00000000..6d8183aa Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-3.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-4-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-4-ctm.png new file mode 100644 index 00000000..60501dfa Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-4-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-4.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-4.png new file mode 100644 index 00000000..0c73a02c Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-4.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-5-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-5-ctm.png new file mode 100644 index 00000000..23a65aa8 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-5-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-5.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-5.png new file mode 100644 index 00000000..f4dd277b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-5.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-6-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-6-ctm.png new file mode 100644 index 00000000..f0c74830 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-6-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-6.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-6.png new file mode 100644 index 00000000..dff943f4 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-6.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-7-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-7-ctm.png new file mode 100644 index 00000000..1b97f83e Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-7-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-7.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-7.png new file mode 100644 index 00000000..87451231 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-7.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-8-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-8-ctm.png new file mode 100644 index 00000000..9de1a119 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-8-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-8.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-8.png new file mode 100644 index 00000000..1ac06604 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-8.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/arcaneEndStone.png b/src/main/resources/assets/chisel/textures/blocks/endstone/arcaneEndStone.png new file mode 100644 index 00000000..5408057b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/arcaneEndStone.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 15140c09..f5ba5891 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 089cd8ec..1baf1887 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 94ac7259..3f8ccc19 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 60008c3a..5bdf0a06 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 new file mode 100644 index 00000000..b0cb0fac Binary files /dev/null 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 7410b52b..c27e9c8c 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 680dc919..c3e1ca58 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 new file mode 100644 index 00000000..0e5c0705 Binary files /dev/null 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 new file mode 100644 index 00000000..cb059641 Binary files /dev/null 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 0b38ce66..8e427eba 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/framedEndStone-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/framedEndStone-ctm.png new file mode 100644 index 00000000..2cf1db83 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/framedEndStone-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/framedEndStone.png b/src/main/resources/assets/chisel/textures/blocks/endstone/framedEndStone.png new file mode 100644 index 00000000..f66db79b Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/endstone/framedEndStone.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 4c7ada3a..2ef7e78f 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