Merge pull request #77 from seventh-june/master

Add new Metals and a new Moss blockset

Author: UltraProdigy

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

@@ -177,5 +177,21 @@ public final class ChiselBlocks {
     public static final BlockCarvable lantern = null;
     public static final BlockCarvable sheetmetal = null;
 
+    // June Additions
+    public static final BlockCarvable moss = null;
+    public static final BlockCarvableCarpet moss_carpet = null;
+    public static final BlockCarvable cobalt = null;
+    public static final BlockCarvable electrum = null;
+    public static final BlockCarvable invar = null;
+    public static final BlockCarvable nickel = null;
+    public static final BlockCarvable platinum = null;
+    public static final BlockCarvable wrought_iron = null;
+    public static final BlockCarvable stainless_steel = null;
+    public static final BlockCarvable titanium = null;
+    public static final BlockCarvable tungstensteel = null;
+    public static final BlockCarvable rpp = null;
+    public static final BlockCarvable iridium = null;
+    public static final BlockCarvable osmium = null;
+
     private ChiselBlocks() {}
 }

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

@@ -2727,5 +2727,51 @@ tile.sheetmetal.7.desc=Paneling (Rusty)
 tile.sheetmetal.8.desc=Plating (Rusty)
 tile.sheetmetal.9.desc=Treading (Rusty)
 
+#Moss
+tile.chisel.moss.name=Moss
+tile.moss.0.desc=Lush
+tile.moss.1.desc=Pale
+tile.moss.2.desc=Dark
+tile.moss.3.desc=Dry
+tile.moss.4.desc=Golden
+tile.moss.5.desc=Infused
+tile.moss.6.desc=Mutated
+tile.moss.7.desc=Scorched
+tile.moss.8.desc=Vivid
+tile.moss.9.desc=Peaty
+tile.moss.10.desc=Pink Sphagnum
+
+#Metals2
+tile.chisel.cobaltblock.name=Block of Cobalt
+tile.chisel.invarblock.name=Block of Invar
+tile.chisel.electrumblock.name=Block of Electrum
+tile.chisel.nickelblock.name=Block of Nickel
+tile.chisel.platinumblock.name=Block of Platinum
+tile.chisel.wroughtironblock.name=Block of Wrought Iron
+tile.chisel.stainlesssteelblock.name=Block of Stainless Steel
+tile.chisel.titaniumblock.name=Block of Titanium
+tile.chisel.tungstensteelblock.name=Block of Tungstensteel
+tile.chisel.rppblock.name=Block of Rhodium-Plated Palladium
+tile.chisel.iridiumblock.name=Block of Iridium
+tile.chisel.osmiumblock.name=Block of Osmium
+tile.numetalOre.0.desc=Egregious
+tile.numetalOre.1.desc=Bolted Casing
+tile.numetalOre.2.desc=Caution Stripes
+tile.numetalOre.3.desc=Shipping Crate
+tile.numetalOre.4.desc=Machinery
+tile.numetalOre.5.desc=Scaffolding
+tile.numetalOre.6.desc=Thermal
+
+
+tile.newmetalOre.0.desc=Machinery
+tile.newmetalOre.1.desc=Egregiously Modern
+tile.newetalOre.2.desc=Bolted Casing
+tile.newetalOre.3.desc=Caution Stripes
+tile.newetalOre.4.desc=Shipping Crate
+tile.newetalOre.5.desc=Egregious
+tile.newetalOre.6.desc=Scaffolding
+tile.newetalOre.7.desc=Thermal
+
+
 tile.chisel.amber.name=Block of Amber
 tile.chisel.bloodBrick.name=Bloodstone Brick

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

@@ -0,0 +1,9 @@
+{
+    "ctm": {
+        "ctm_version": 1,
+        "type": "ctm",
+        "textures": [
+            "chisel:block/metals/cobalt/badgreggy-ctm"
+        ]
+    }
+}

src/main/resources/assets/chisel/textures/blocks/metals/cobalt/badgreggy-ctm.png

@@ -0,0 +1,9 @@
+{
+    "ctm": {
+        "ctm_version": 1,
+        "type": "ctm",
+        "textures": [
+            "chisel:block/metals/cobalt/caution-ctm"
+        ]
+    }
+}