diff --git a/changelog b/changelog index c56eec7c..e54be4ec 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,18 @@ +2.3.10: +New +- Added ARRRRRRR-cane stone blocks +- Added Factory varients using some old textures that were lying around +- Added Chrono Glass Variant +Changes +- Chiseled Torches now work as Forge microparts +- AntiBlocks will not allow mobs to spawn on them (like half blocks, or glass) +Fixes +- Fixed the Mossy configuration to properly disable/enable whether the player +can chisel cobble into mossy cobble, etc. +- Fixed a crash on dedicated servers +- Fixed an bug that allowed item duplication. We're sorry server ops :( +- Improved block loading performance significantly! + 2.3.9: API - Fixed issue where Chisel would crash if a user sent any message to the IMC diff --git a/gradle.properties b/gradle.properties index 2dc8b113..359f6427 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -mod_version=2.3.9 +mod_version=2.3.10 minecraft_version=1.7.10 forge_version=10.13.2.1291 diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 3e453156..a9afef52 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -162,7 +162,11 @@ public enum Features { arcane.carverHelper.addVariation("tile.arcane.4.desc", 4, "arcane/runesGlow"); arcane.carverHelper.addVariation("tile.arcane.5.desc", 5, "arcane/bigBrick"); arcane.carverHelper.addVariation("tile.arcane.6.desc", 6, "arcane/conduitGlowAnim"); - arcane.carverHelper.addVariation("tile.arcane.7.desc", 7, "arcane/BorderBrain"); + arcane.carverHelper.addVariation("tile.arcane.7.desc", 7, "arcane/BorderBrain"); + arcane.carverHelper.addVariation("tile.arcane.8.desc", 8, "arcane/ArcaneBorder"); + arcane.carverHelper.addVariation("tile.arcane.9.desc", 9, "arcane/arcaneMatrix"); + arcane.carverHelper.addVariation("tile.arcane.10.desc", 10, "arcane/thaumcraftLogo"); + arcane.carverHelper.addVariation("tile.arcane.11.desc", 11, "arcane/entropiedEntritchRock"); arcane.carverHelper.registerAll(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 5b39ddef..e907c22e 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -194,7 +194,10 @@ tile.arcane.4.desc=Glowing Symbols tile.arcane.5.desc=Bricks tile.arcane.6.desc=Temporal Conduit tile.arcane.7.desc=Braaainz -tile.arcane.8.desc=Spatial Conduit +tile.arcane.8.desc=Infernally Arcane +tile.arcane.9.desc=Nasty Nazca Lines +tile.arcane.10.desc=Fine Thaumaturge's Emblem +tile.arcane.11.desc=Cracked Rock leaking Eldritch Glow #Thaumium tile.chisel.thaumium.name=Thaumium Block diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/ArcaneBorder-ctm.png b/src/main/resources/assets/chisel/textures/blocks/arcane/ArcaneBorder-ctm.png new file mode 100644 index 00000000..391e2985 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/ArcaneBorder-ctm.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/ArcaneBorder.png b/src/main/resources/assets/chisel/textures/blocks/arcane/ArcaneBorder.png new file mode 100644 index 00000000..a5e8b5ae Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/ArcaneBorder.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneMatrix-v9.png b/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneMatrix-v9.png new file mode 100644 index 00000000..5b0720ce Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneMatrix-v9.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/entropiedEntritchRock-v9.png b/src/main/resources/assets/chisel/textures/blocks/arcane/entropiedEntritchRock-v9.png new file mode 100644 index 00000000..ad560d38 Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/entropiedEntritchRock-v9.png differ diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneBigBrick-ctm.png b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/arcaneBigBrick-ctm.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/arcaneBigBrick-ctm.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/arcaneBigBrick-ctm.png diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneBigBrick.png b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/arcaneBigBrick.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/arcaneBigBrick.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/arcaneBigBrick.png diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneBrick-ctmh.png b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/arcaneBrick-ctmh.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/arcaneBrick-ctmh.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/arcaneBrick-ctmh.png diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneRunes-r9.png b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/arcaneRunes-r9.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/arcaneRunes-r9.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/arcaneRunes-r9.png diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/arcaneRunesGlow-r9.png b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/arcaneRunesGlow-r9.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/arcaneRunesGlow-r9.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/arcaneRunesGlow-r9.png diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/arcane_stone.png b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/arcane_stone.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/arcane_stone.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/arcane_stone.png diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/conduitAnim.png b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/conduitAnim.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/conduitAnim.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/conduitAnim.png diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/conduitAnim.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/conduitAnim.png.mcmeta similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/conduitAnim.png.mcmeta rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/conduitAnim.png.mcmeta diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/largetile.png b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/largetile.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/largetile.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/largetile.png diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/runes-r9.png b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/runes-r9.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/runes-r9.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/runes-r9.png diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/runesGlow-r9.png b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/runesGlow-r9.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/runesGlow-r9.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/runesGlow-r9.png diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/runesGlow-v9.png b/src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/runesGlow-v9.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/arcane/runesGlow-v9.png rename to src/main/resources/assets/chisel/textures/blocks/arcane/oldFiles/runesGlow-v9.png diff --git a/src/main/resources/assets/chisel/textures/blocks/arcane/thaumcraftLogo-v9.png b/src/main/resources/assets/chisel/textures/blocks/arcane/thaumcraftLogo-v9.png new file mode 100644 index 00000000..24509cee Binary files /dev/null and b/src/main/resources/assets/chisel/textures/blocks/arcane/thaumcraftLogo-v9.png differ