Updatemaster

4 files changed, 13 insertions, 13 deletions

diff --git a/src/main/java/com/sosnitzka/taiga/Fluids.java b/src/main/java/com/sosnitzka/taiga/Fluids.java
index 68f0b99..cdaa15d 100644
--- a/src/main/java/com/sosnitzka/taiga/Fluids.java
+++ b/src/main/java/com/sosnitzka/taiga/Fluids.java
@@ -41,7 +41,7 @@ public class Fluids {
     public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomite_fluid", 0xFF7fefa0, 900, 10,
             10000);
     public static BasicTinkerFluid solariumFluid = new BasicTinkerFluid("solarium_fluid", 0xFFfef864, 1500, 10, 2000);
-    public static BasicTinkerFluid nihiliteFluid = new BasicTinkerFluid("nihilite_fluid", 0xFF6645ba, 580, 10, 10000);
+    public static BasicTinkerFluid nihiliteFluid = new BasicTinkerFluid("nihalite_fluid", 0xFF6645ba, 580, 10, 10000);
     public static BasicTinkerFluid adamantFluid = new BasicTinkerFluid("adamant_fluid", 0xFFff8efe, 1650, 10, 10000);
     public static BasicTinkerFluid dyoniteFluid = new BasicTinkerFluid("dyonite_fluid", 0xFFffbd3f, 660, 10, 7000);
     public static BasicTinkerFluid nucleumFluid = new BasicTinkerFluid("nucleum_fluid", 0xFFe6ff40, 490, 10, 10000);
diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
index 12ed588..177a411 100644
--- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
+++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
@@ -83,7 +83,7 @@ public class MaterialTraits {
     public static Material ignitz = new Material("ignitz", TextFormatting.RED).addTrait(melting).addTrait(garishly, MaterialTypes.HANDLE);
     public static Material imperomite = new Material("imperomite", TextFormatting.DARK_RED).addTrait(hollow);
     public static Material solarium = new Material("solarium", TextFormatting.YELLOW).addTrait(superheavy).addTrait(crushing);
-    public static Material nihilite = new Material("nihilite", TextFormatting.DARK_GRAY).addTrait(souleater);
+    public static Material nihilite = new Material("nihalite", TextFormatting.DARK_GRAY).addTrait(souleater);
     public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(berserk);
     public static Material dyonite = new Material("dyonite", TextFormatting.GREEN).addTrait(tantrum);
     public static Material nucleum = new Material("nucleum", TextFormatting.YELLOW).addTrait(decay).addTrait(mutate);
diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java
index 2c6871f..e620f4f 100644
--- a/src/main/java/com/sosnitzka/taiga/TAIGA.java
+++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java
@@ -31,7 +31,7 @@ import static slimeknights.tconstruct.library.utils.HarvestLevels.*;
 public class TAIGA {
 
     public static final String MODID = "taiga";
-    public static final String VERSION = "@VERSION@";
+    public static final String VERSION = "1.3.1";
     public static final String GUIFACTORY = "com.sosnitzka.taiga.TAIGAGuiFactory";
     public static Logger logger;
 
@@ -118,7 +118,7 @@ public class TAIGA {
         integrateMaterial("Ignitz", ignitz, ignitzFluid, 350, 2f, 6.66f, .85f, 150, 250, COBALT, .8f, .8f, 3);
         integrateMaterial("Imperomite", imperomite, imperomiteFluid, 1350, 4.65f, 5.9f, 1.15f, -100, 150, DURANITE, 1.2f, 1.8f, 2);
         integrateMaterial("Solarium", solarium, solariumFluid, 1100, 24f, 7f, 1.25f, 150, 150, VIBRANIUM, .8f, 1.5f, 5);
-        integrateMaterial("Nihilite", nihilite, nihiliteFluid, 400, 2.8f, 4.50f, .77f, 350, 155, VALYRIUM, 1.5f, .8f, 3);
+        integrateMaterial("Nihalite", nihilite, nihiliteFluid, 400, 2.8f, 4.50f, .77f, 350, 155, VALYRIUM, 1.5f, .8f, 3);
         integrateMaterial("Adamant", adamant, adamantFluid, 1750, 6f, 6f, 2f, 0, 0, VIBRANIUM, .35f, 1.85f, 8);
         integrateMaterial("Dyonite", dyonite, dyoniteFluid, 900, 6.45f, 5f, 0.66f, -50, 250, DURANITE, 2, .9f, -1);
         integrateMaterial("Nucleum", nucleum, nucleumFluid, 505, 17.5f, 9.5f, 1.05f, 100, 125, VALYRIUM, shitty);
@@ -139,4 +139,4 @@ public class TAIGA {
         // Community Wishlist
         integrateOre("Dilithium", dilithiumFluid);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang
index e4054fe..9d9168c 100644
--- a/src/main/resources/assets/taiga/lang/en_US.lang
+++ b/src/main/resources/assets/taiga/lang/en_US.lang
@@ -25,7 +25,7 @@ material.tritonite.name=Tritonite
 material.ignitz.name=Ignitz
 material.imperomite.name=Imperomite
 material.solarium.name=Solarium
-material.nihilite.name=Nihilite
+material.nihalite.name=Nihalite
 material.adamant.name=Adamant
 material.dyonite.name=Dyonite
 material.nucleum.name=Nucleum
@@ -65,7 +65,7 @@ tile.tritonite_block.name=Tritonite Block
 tile.ignitz_block.name=Ignitz Block
 tile.imperomite_block.name=Imperomite Block
 tile.solarium_block.name=Solarium Block
-tile.nihilite_block.name=Nihilite Block
+tile.nihalite_block.name=Nihalite Block
 tile.adamant_block.name=Adamant Block
 tile.dyonite_block.name=Dyonite Block
 tile.nucleum_block.name=Nucleum Block
@@ -109,7 +109,7 @@ tile.tritonite_ore.name=Tritonite Ore
 tile.ignitz_ore.name=Ignitz Ore
 tile.imperomite_ore.name=Imperomite Ore
 tile.solarium_ore.name=Solarium Ore
-tile.nihilite_ore.name=Nihilite Ore
+tile.nihalite_ore.name=Nihalite Ore
 tile.adamant_ore.name=Adamant Ore
 tile.dyonite_ore.name=Dyonite Ore
 tile.nucleum_ore.name=Nucleum Ore
@@ -153,7 +153,7 @@ item.tritonite_nugget.name=Tritonite Nugget
 item.ignitz_nugget.name=Ignitz Nugget
 item.imperomite_nugget.name=Imperomite Nugget
 item.solarium_nugget.name=Solarium Nugget
-item.nihilite_nugget.name=Nihilite Nugget
+item.nihalite_nugget.name=Nihalite Nugget
 item.adamant_nugget.name=Adamant Nugget
 item.dyonite_nugget.name=Dyonite Nugget
 item.nucleum_nugget.name=Nucleum Nugget
@@ -195,7 +195,7 @@ item.tritonite_dust.name=Tritonite Dust
 item.ignitz_dust.name=Ignitz Dust
 item.imperomite_dust.name=Imperomite Dust
 item.solarium_dust.name=Solarium Dust
-item.nihilite_dust.name=Nihilite Dust
+item.nihalite_dust.name=Nihalite Dust
 item.adamant_dust.name=Adamant Dust
 item.dyonite_dust.name=Dyonite Dust
 item.nucleum_dust.name=Nucleum Dust
@@ -235,7 +235,7 @@ item.tritonite_ingot.name=Tritonite Ingot
 item.ignitz_ingot.name=Ignitz Ingot
 item.imperomite_ingot.name=Imperomite Ingot
 item.solarium_ingot.name=Solarium Ingot
-item.nihilite_ingot.name=Nihilite Ingot
+item.nihalite_ingot.name=Nihalite Ingot
 item.adamant_ingot.name=Adamant Ingot
 item.dyonite_ingot.name=Dyonite Ingot
 item.nucleum_ingot.name=Nucleum Ingot
@@ -275,7 +275,7 @@ fluid.tconstruct.tritonite_fluid.name=Tritonite Fluid
 fluid.tconstruct.ignitz_fluid.name=Ignitz Fluid
 fluid.tconstruct.imperomite_fluid.name=Imperomite Fluid
 fluid.tconstruct.solarium_fluid.name=Solarium Fluid
-fluid.tconstruct.nihilite_fluid.name=Nihilite Fluid
+fluid.tconstruct.nihalite_fluid.name=Nihalite Fluid
 fluid.tconstruct.adamant_fluid.name=Adamant Fluid
 fluid.tconstruct.dyonite_fluid.name=Dyonite Fluid
 fluid.tconstruct.nucleum_fluid.name=Nucleum Fluid
@@ -368,4 +368,4 @@ gui.taiga_configuration.mainTitle=TAIGA Configuration
 itemGroup.taiga_block=TAIGA Blocks
 itemGroup.taiga_item=TAIGA Items
 
-key.taiga.alt_action=Mod Tool
\ No newline at end of file
+key.taiga.alt_action=Mod Tool