Resolve conflict

dependencies.gradle

@@ -9,7 +9,7 @@ dependencies {
     compile('com.github.GTNewHorizons:TecTech:5.0.22:dev')
     compile('com.github.GTNewHorizons:ForestryMC:4.4.12:dev')
     compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-96-GTNH:dev')
-    compile('com.github.GTNewHorizons:bartworks:0.5.71:dev')
+    compile('com.github.GTNewHorizons:bartworks:0.5.80:dev')
     compile('com.github.GTNewHorizons:BuildCraft:7.1.27:dev')
     compile('com.github.GTNewHorizons:NotEnoughItems:2.2.22:dev')
 

src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java

@@ -7,6 +7,7 @@
 
 import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
 import com.github.bartimaeusnek.bartworks.util.Pair;
+import net.minecraft.util.EnumChatFormatting;
 
 /*
  *
@@ -16,6 +17,9 @@
 @SuppressWarnings("unchecked")
 public class BotWerkstoffMaterialPool implements Runnable {
 
+    private static final String DEPRECATED =
+            EnumChatFormatting.DARK_RED + "Deprecated; Will be removed in the next update";
+
     public static final Werkstoff TungsticAcid = new Werkstoff(
             new short[] {0xf5, 0xf1, 0x16},
             "Tungstic Acid",
@@ -145,6 +149,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
     public static final Werkstoff LMP103S = new Werkstoff(
             new short[] {0xbf, 0x2f, 0xc2},
             "LMP-103S",
+            DEPRECATED,
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
@@ -279,6 +284,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
     public static final Werkstoff MonomethylhydrazineFuelMix = new Werkstoff(
             new short[] {0x78, 0xe3, 0xa7},
             "Monomethylhydrazine Fuel Mix",
+            DEPRECATED,
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
@@ -287,6 +293,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
     public static final Werkstoff UnsymmetricalDimethylhydrazineFuelMix = new Werkstoff(
             new short[] {0xc8, 0xff, 0x00},
             "Unsymmetrical Dimethylhydrazine Fuel Mix",
+            DEPRECATED,
             new Werkstoff.Stats(),
             COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),

src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java

@@ -36,6 +36,10 @@ public boolean isOpaqueCube() {
 
     public static final Block COOLANT_DELIVERY_CASING = new Casing("coolant_delivery");
 
+    public static final Block SHIELDED_ACCELERATOR_CASING = new Casing("shielded_accelerator");
+    ;
+
+
     public static void registerGTMTE() {
 
         DIGESTER = new Digester(10500, "Digester", "Digester").getStackForm(1L);
@@ -59,5 +63,8 @@ public static void registerTypical() {
         GameRegistry.registerBlock(ELECTRODE_CASING, ELECTRODE_CASING.getUnlocalizedName());
 
         GameRegistry.registerBlock(COOLANT_DELIVERY_CASING, COOLANT_DELIVERY_CASING.getUnlocalizedName());
+
+        GameRegistry.registerBlock(SHIELDED_ACCELERATOR_CASING, SHIELDED_ACCELERATOR_CASING.getUnlocalizedName());
+
     }
 }

src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java

@@ -1051,6 +1051,7 @@ public class WerkstoffMaterialPool implements Runnable {
                     .addMultipleIngotMetalWorkingItems()
                     .enforceUnification(),
             offsetID4 + 1,
+
             TextureSet.SET_METALLIC);
 
     public static void runInit() {