Merge remote-tracking branch 'seventh-june/master' into dev

Author: Dream-Master

src/main/java/team/chisel/Features.java

@@ -5120,8 +5120,8 @@ void addBlocks() {
             amber2.carverHelper.addVariation("tile.gemstones.8.desc", 8, "amber/amberSmooth");
             amber2.carverHelper.addVariation("tile.gemstones.9.desc", 9, "amber/amberSpiral");
             amber2.carverHelper.addVariation("tile.gemstones.10.desc", 10, "amber/amberTiles");
-            amber2.carverHelper.registerAll(amber2, "amber");
-            Carving.chisel.registerOre("amber", "amberBlock");
+            amber2.carverHelper.registerAll(amber2, "amber2");
+            Carving.chisel.registerOre("amber2", "amberBlock");
         }
     },
     JADE {
@@ -5316,6 +5316,30 @@ void addBlocks() {
             Carving.chisel.registerOre("onyx", "onyxBlock");
         }
     },
+    APATITE {
+
+        @Override
+        void addBlocks() {
+            BlockCarvable apatite = (BlockBeaconBase) new BlockBeaconBase()
+                .setCreativeTab(ChiselTabs.tabOtherChiselBlocks)
+                .setHardness(5.0F)
+                .setResistance(10.0F)
+                .setStepSound(Block.soundTypeMetal);
+            apatite.carverHelper.addVariation("tile.gemstones.0.desc", 0, "apatite/apatiteBismuth");
+            apatite.carverHelper.addVariation("tile.gemstones.1.desc", 1, "apatite/apatiteBordered");
+            apatite.carverHelper.addVariation("tile.gemstones.2.desc", 2, "apatite/apatiteCell");
+            apatite.carverHelper.addVariation("tile.gemstones.3.desc", 3, "apatite/apatiteFacet");
+            apatite.carverHelper.addVariation("tile.gemstones.4.desc", 4, "apatite/apatiteOrnate");
+            apatite.carverHelper.addVariation("tile.gemstones.5.desc", 5, "apatite/apatitePanel");
+            apatite.carverHelper.addVariation("tile.gemstones.6.desc", 6, "apatite/apatitePolished");
+            apatite.carverHelper.addVariation("tile.gemstones.7.desc", 7, "apatite/apatiteRaw");
+            apatite.carverHelper.addVariation("tile.gemstones.8.desc", 8, "apatite/apatiteSmooth");
+            apatite.carverHelper.addVariation("tile.gemstones.9.desc", 9, "apatite/apatiteSpiral");
+            apatite.carverHelper.addVariation("tile.gemstones.10.desc", 10, "apatite/apatiteTiles");
+            apatite.carverHelper.registerAll(apatite, "apatite");
+            Carving.chisel.registerOre("apatite", "apatiteBlock");
+        }
+    },
     PLASTICBLOCK {
 
         @Override

src/main/java/team/chisel/init/ChiselBlocks.java

@@ -213,6 +213,7 @@ public final class ChiselBlocks {
     public static final BlockCarvable labradorite = null;
     public static final BlockCarvable onyx = null;
     public static final BlockCarvable plasticblock = null;
+    public static final BlockCarvable apatite = null;
 
     private ChiselBlocks() {}
 }

src/main/resources/assets/chisel/lang/en_US.lang

@@ -2810,6 +2810,7 @@ tile.chisel.netherquartz.name=Block of Nether Quartz
 tile.chisel.labradorite.name=Block of Labradorite
 tile.chisel.onyx.name=Block of Onyx
 tile.chisel.plasticblock.name=Plastic
+tile.chisel.apatite.name=Topaz
 
 tile.gemstones.0.desc=Bismuth
 tile.gemstones.1.desc=Bordered