forgot to fix it for the end as well -.-

fixed ores not generating in the nether #91
Break out of meteor generation if we are in a void dim 92; Added a file type to gitignore
2017-01-05 05:43:01 +01:00 · 2017-01-05 05:16:10 +01:00 · 2017-01-05 05:15:54 +01:00 · 2017-01-05 05:15:45 +01:00 · 2017-01-05 05:15:30 +01:00 · 2017-01-05 05:15:10 +01:00
61 changed files with 1444 additions and 887 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -172,6 +172,7 @@ gradle-app.setting
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties

+*.hprof

 # Forge
 run/
--- a/src/main/java/com/sosnitzka/taiga/Alloys.java
+++ b/src/main/java/com/sosnitzka/taiga/Alloys.java
@@ -13,31 +13,33 @@ public class Alloys {
     * Registers alloying in the smeltery
     */
    public static void register() {
+        registerTinkerAlloy(new FluidStack(terraxFluid, 2), new FluidStack(karmesineFluid, 1), new FluidStack(oviumFluid, 1), new FluidStack(jauxumFluid, 1));
        registerTinkerAlloy(new FluidStack(triberiumFluid, 1), new FluidStack(tiberiumFluid, 5), new FluidStack(basaltFluid, 1));
        registerTinkerAlloy(new FluidStack(fractumFluid, 2), new FluidStack(triberiumFluid, 3), new FluidStack(TinkerFluids.obsidian, 3), new FluidStack(abyssumFluid, 1));
        registerTinkerAlloy(new FluidStack(violiumFluid, 2), new FluidStack(auroriumFluid, 3), new FluidStack(TinkerFluids.ardite, 2));
        registerTinkerAlloy(new FluidStack(proxiiFluid, 3), new FluidStack(prometheumFluid, 3), new FluidStack(palladiumFluid, 3), new FluidStack(eezoFluid, 1));
-        registerTinkerAlloy(new FluidStack(tritoniteFluid, 2), new FluidStack(TinkerFluids.cobalt, 3), new FluidStack(karmesineFluid, 2));
-        registerTinkerAlloy(new FluidStack(ignitzFluid, 2), new FluidStack(TinkerFluids.ardite, 2), new FluidStack(karmesineFluid, 2), new FluidStack(osramFluid, 1));
+        registerTinkerAlloy(new FluidStack(tritoniteFluid, 2), new FluidStack(TinkerFluids.cobalt, 3), new FluidStack(terraxFluid, 2));
+        registerTinkerAlloy(new FluidStack(ignitzFluid, 2), new FluidStack(TinkerFluids.ardite, 2), new FluidStack(terraxFluid, 2), new FluidStack(osramFluid, 1));
        registerTinkerAlloy(new FluidStack(imperomiteFluid, 2), new FluidStack(duraniteFluid, 3), new FluidStack(prometheumFluid, 1), new FluidStack(abyssumFluid, 1));
        registerTinkerAlloy(new FluidStack(solariumFluid, 2), new FluidStack(valyriumFluid, 2), new FluidStack(uruFluid, 2), new FluidStack(nucleumFluid, 1));
        registerTinkerAlloy(new FluidStack(adamantFluid, 3), new FluidStack(vibraniumFluid, 1), new FluidStack(solariumFluid, 1), new FluidStack(ioxFluid, 3));
        registerTinkerAlloy(new FluidStack(nihiliteFluid, 1), new FluidStack(vibraniumFluid, 1), new FluidStack(solariumFluid, 1));
        registerTinkerAlloy(new FluidStack(seismumFluid, 4), new FluidStack(TinkerFluids.obsidian, 4), new FluidStack(triberiumFluid, 2), new FluidStack(eezoFluid, 1));
-        registerTinkerAlloy(new FluidStack(astriumFluid, 2), new FluidStack(karmesineFluid, 3), new FluidStack(auroriumFluid, 2));
+        registerTinkerAlloy(new FluidStack(astriumFluid, 2), new FluidStack(terraxFluid, 3), new FluidStack(auroriumFluid, 2));
        registerTinkerAlloy(new FluidStack(niobFluid, 3), new FluidStack(palladiumFluid, 3), new FluidStack(duraniteFluid, 1), new FluidStack(osramFluid, 1));
        registerTinkerAlloy(new FluidStack(yrdeenFluid, 3), new FluidStack(uruFluid, 3), new FluidStack(valyriumFluid, 3), new FluidStack(osramFluid, 1));
        registerTinkerAlloy(new FluidStack(yrdeenFluid, 3), new FluidStack(uruFluid, 3), new FluidStack(valyriumFluid, 3), new FluidStack(eezoFluid, 1));
        registerTinkerAlloy(new FluidStack(yrdeenFluid, 3), new FluidStack(uruFluid, 3), new FluidStack(valyriumFluid, 3), new FluidStack(abyssumFluid, 1));
        registerTinkerAlloy(new FluidStack(ioxFluid, 1), new FluidStack(eezoFluid, 2), new FluidStack(abyssumFluid, 2), new FluidStack(osramFluid, 2), new FluidStack(obsidioriteFluid, 9));
        registerTinkerAlloy(new FluidStack(ioxFluid, 1), new FluidStack(eezoFluid, 2), new FluidStack(abyssumFluid, 2), new FluidStack(osramFluid, 2), new FluidStack(meteoriteFluid, 9), new FluidStack(TinkerFluids.obsidian, 9));
-        registerTinkerAlloy(new FluidStack(lumixFluid, 1), new FluidStack(palladiumFluid, 1), new FluidStack(karmesineFluid, 1));
+        registerTinkerAlloy(new FluidStack(lumixFluid, 1), new FluidStack(palladiumFluid, 1), new FluidStack(terraxFluid, 1));
        registerTinkerAlloy(new FluidStack(obsidioriteFluid, 1), new FluidStack(meteoriteFluid, 1), new FluidStack(TinkerFluids.obsidian, 1));
        registerTinkerAlloy(new FluidStack(nucleumFluid, 3), new FluidStack(proxiiFluid, 3), new FluidStack(abyssumFluid, 1), new FluidStack(osramFluid, 1));
        registerTinkerAlloy(new FluidStack(nucleumFluid, 3), new FluidStack(imperomiteFluid, 3), new FluidStack(osramFluid, 1), new FluidStack(eezoFluid, 1));
        registerTinkerAlloy(new FluidStack(nucleumFluid, 3), new FluidStack(niobFluid, 3), new FluidStack(eezoFluid, 1), new FluidStack(abyssumFluid, 1));
        registerTinkerAlloy(new FluidStack(dyoniteFluid, 3), new FluidStack(triberiumFluid, 3), new FluidStack(fractumFluid, 1), new FluidStack(seismumFluid, 1), new FluidStack(osramFluid, 1));
        registerTinkerAlloy(new FluidStack(dyoniteFluid, 3), new FluidStack(tiberiumFluid, 12), new FluidStack(fractumFluid, 1), new FluidStack(seismumFluid, 1), new FluidStack(osramFluid, 1));
+        registerTinkerAlloy(new FluidStack(nitroniteFluid, 6), new FluidStack(magmaFluid, 6), new FluidStack(osramFluid, 1));

    }
 }
--- a/src/main/java/com/sosnitzka/taiga/Blocks.java
+++ b/src/main/java/com/sosnitzka/taiga/Blocks.java
@@ -23,58 +23,63 @@ public class Blocks {


    // blocks and ores spawned via worldgen
-    public static Block basaltBlock = new BasicBlock("basalt_block", Material.ROCK, 45.0f, 35.0f, DIAMOND, PREFIX_BLOCK);
+    public static Block basaltBlock = new BasicBlock("basalt_block", Material.ROCK, 20.0f, 35.0f, DIAMOND, PREFIX_BLOCK);
    public static Block tiberiumOre = new BlockTiberium();
-    public static Block auroriumOre = new BasicBlock("aurorium_ore", Material.ROCK, 13.0f, 12f, COBALT, 0.2f, PREFIX_ORE);
-    public static Block prometheumOre = new BasicBlock("prometheum_ore", Material.ROCK, 35.0f, 12f, DURANITE, 0.4f, PREFIX_ORE);
-    public static Block duraniteOre = new BasicBlock("duranite_ore", Material.ROCK, 80.0f, 70f, DURANITE, PREFIX_ORE);
-    public static Block valyriumOre = new BasicBlock("valyrium_ore", Material.ROCK, 60.0f, 50f, VALYRIUM, PREFIX_ORE);
-    public static Block vibraniumOre = new BasicBlock("vibranium_ore", Material.ROCK, 70.0f, 60f, VIBRANIUM, PREFIX_ORE);
-    public static Block karmesineOre = new BasicBlock("karmesine_ore", Material.ROCK, 13.0f, 10f, COBALT, PREFIX_ORE);
-    public static Block palladiumOre = new BasicBlock("palladium_ore", Material.ROCK, 25.0f, 15f, DURANITE, 0.4f, PREFIX_ORE);
-    public static Block uruOre = new BasicBlock("uru_ore", Material.ROCK, 25.0f, 15f, VALYRIUM, PREFIX_ORE);
-    public static Block osramOre = new BasicBlock("osram_ore", Material.ROCK, 45.0f, 35.0f, COBALT, PREFIX_ORE);
-    public static Block eezoOre = new BasicBlock("eezo_ore", Material.ROCK, 45.0f, 35.0f, COBALT, PREFIX_ORE);
-    public static Block abyssumOre = new BasicBlock("abyssum_ore", Material.ROCK, 45.0f, 35.0f, COBALT, PREFIX_ORE);
+    public static Block auroriumOre = new BasicBlock("aurorium_ore", Material.ROCK, 15.0f, 12f, COBALT, 0.2f, PREFIX_ORE);
+    public static Block prometheumOre = new BasicBlock("prometheum_ore", Material.ROCK, 20.0f, 12f, DURANITE, 0.4f, PREFIX_ORE);
+    public static Block duraniteOre = new BasicBlock("duranite_ore", Material.ROCK, 25.0f, 1000f, DURANITE, PREFIX_ORE);
+    public static Block valyriumOre = new BasicBlock("valyrium_ore", Material.ROCK, 35.0f, 2000f, VALYRIUM, PREFIX_ORE);
+    public static Block vibraniumOre = new BasicBlock("vibranium_ore", Material.ROCK, 40.0f, 3000f, VIBRANIUM, PREFIX_ORE);
+    public static Block karmesineOre = new BasicBlock("karmesine_ore", Material.ROCK, 10.0f, 10f, COBALT, PREFIX_ORE);
+    public static Block oviumOre = new BasicBlock("ovium_ore", Material.ROCK, 10.0f, 10f, COBALT, PREFIX_ORE);
+    public static Block jauxumOre = new BasicBlock("jauxum_ore", Material.ROCK, 10.0f, 10f, COBALT, PREFIX_ORE);
+    public static Block palladiumOre = new BasicBlock("palladium_ore", Material.ROCK, 25.0f, 150f, DURANITE, 0.4f, PREFIX_ORE);
+    public static Block uruOre = new BasicBlock("uru_ore", Material.ROCK, 35.0f, 500f, VALYRIUM, PREFIX_ORE);
+    public static Block osramOre = new BasicBlock("osram_ore", Material.ROCK, 15.0f, 35.0f, COBALT, PREFIX_ORE);
+    public static Block eezoOre = new BasicBlock("eezo_ore", Material.ROCK, 50.0f, 50000.0f, COBALT, PREFIX_ORE);
+    public static Block abyssumOre = new BasicBlock("abyssum_ore", Material.ROCK, 15.0f, 35.0f, COBALT, PREFIX_ORE);

-    // Ore Casts
-    public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.ROCK, 30.0f, 15f, STONE, 1f, PREFIX_BLOCK);
-    public static Block auroriumBlock = new BasicBlock("aurorium_block", Material.ROCK, 13.0f, 15f, COBALT, PREFIX_BLOCK);
-    public static Block prometheumBlock = new BasicBlock("prometheum_block", Material.ROCK, 35.0f, 15f, DURANITE, 0.5f, PREFIX_BLOCK);
-    public static Block duraniteBlock = new BasicBlock("duranite_block", Material.ROCK, 60.0f, 60f, DURANITE, PREFIX_BLOCK);
-    public static Block valyriumBlock = new BasicBlock("valyrium_block", Material.ROCK, 70.0f, 70f, VALYRIUM, PREFIX_BLOCK);
-    public static Block vibraniumBlock = new BasicBlock("vibranium_block", Material.ROCK, 80.0f, 80f, VIBRANIUM, PREFIX_BLOCK);
-    public static Block karmesineBlock = new BasicBlock("karmesine_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK);
-    public static Block palladiumBlock = new BasicBlock("palladium_block", Material.ROCK, 25.0f, 20f, DURANITE, 0.5f, PREFIX_BLOCK);
-    public static Block uruBlock = new BasicBlock("uru_block", Material.ROCK, 25.0f, 20f, VALYRIUM, PREFIX_BLOCK);
-    public static Block osramBlock = new BasicBlock("osram_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK);
-    public static Block abyssumBlock = new BasicBlock("abyssum_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK);
-    public static Block eezoBlock = new BasicBlock("eezo_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK);
+    // Ore Castsee
+    public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.ROCK, 10.0f, 15f, STONE, 1f, PREFIX_BLOCK);
+    public static Block auroriumBlock = new BasicBlock("aurorium_block", Material.ROCK, 15.0f, 15f, COBALT, PREFIX_BLOCK);
+    public static Block prometheumBlock = new BasicBlock("prometheum_block", Material.ROCK, 20.0f, 15f, DURANITE, 0.5f, PREFIX_BLOCK);
+    public static Block duraniteBlock = new BasicBlock("duranite_block", Material.ROCK, 20.0f, 800f, DURANITE, PREFIX_BLOCK);
+    public static Block valyriumBlock = new BasicBlock("valyrium_block", Material.ROCK, 20.0f, 1500f, VALYRIUM, PREFIX_BLOCK);
+    public static Block vibraniumBlock = new BasicBlock("vibranium_block", Material.ROCK, 20.0f, 3000f, VIBRANIUM, PREFIX_BLOCK);
+    public static Block karmesineBlock = new BasicBlock("karmesine_block", Material.ROCK, 10.0f, 12f, COBALT, PREFIX_BLOCK);
+    public static Block oviumBlock = new BasicBlock("ovium_block", Material.ROCK, 10.0f, 12f, COBALT, PREFIX_BLOCK);
+    public static Block jauxumBlock = new BasicBlock("jauxum_block", Material.ROCK, 10.0f, 12f, COBALT, PREFIX_BLOCK);
+    public static Block palladiumBlock = new BasicBlock("palladium_block", Material.ROCK, 25.0f, 150f, DURANITE, 0.5f, PREFIX_BLOCK);
+    public static Block uruBlock = new BasicBlock("uru_block", Material.ROCK, 30.0f, 500f, VALYRIUM, PREFIX_BLOCK);
+    public static Block osramBlock = new BasicBlock("osram_block", Material.ROCK, 15.0f, 12f, COBALT, PREFIX_BLOCK);
+    public static Block abyssumBlock = new BasicBlock("abyssum_block", Material.ROCK, 15.0f, 35f, COBALT, PREFIX_BLOCK);
+    public static Block eezoBlock = new BasicBlock("eezo_block", Material.ROCK, 20.0f, 1000f, COBALT, PREFIX_BLOCK);

-    public static Block triberiumBlock = new BasicBlock("triberium_block", Material.ROCK, 30.0f, 15f, OBSIDIAN, 1f, PREFIX_BLOCK);
-    public static Block fractumBlock = new BasicBlock("fractum_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK);
-    public static Block violiumBlock = new BasicBlock("violium_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK);
-    public static Block proxiiBlock = new BasicBlock("proxii_block", Material.ROCK, 25.0f, 25f, DURANITE, PREFIX_BLOCK);
-    public static Block tritoniteBlock = new BasicBlock("tritonite_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK);
-    public static Block ignitzBlock = new BasicBlock("ignitz_block", Material.ROCK, 23.0f, 20f, COBALT, PREFIX_BLOCK);
-    public static Block imperomiteBlock = new BasicBlock("imperomite_block", Material.ROCK, 25.0f, 25f, DURANITE, PREFIX_BLOCK);
+    public static Block terraxBlock = new BasicBlock("terrax_block", Material.ROCK, 10.0f, 15f, COBALT, PREFIX_BLOCK);
+    public static Block triberiumBlock = new BasicBlock("triberium_block", Material.ROCK, 15.0f, 15f, OBSIDIAN, 1f, PREFIX_BLOCK);
+    public static Block fractumBlock = new BasicBlock("fractum_block", Material.ROCK, 15.0f, 25f, COBALT, PREFIX_BLOCK);
+    public static Block violiumBlock = new BasicBlock("violium_block", Material.ROCK, 15.0f, 25f, COBALT, PREFIX_BLOCK);
+    public static Block proxiiBlock = new BasicBlock("proxii_block", Material.ROCK, 15.0f, 25f, DURANITE, PREFIX_BLOCK);
+    public static Block tritoniteBlock = new BasicBlock("tritonite_block", Material.ROCK, 15.0f, 25f, COBALT, PREFIX_BLOCK);
+    public static Block ignitzBlock = new BasicBlock("ignitz_block", Material.ROCK, 20.0f, 20f, COBALT, PREFIX_BLOCK);
+    public static Block imperomiteBlock = new BasicBlock("imperomite_block", Material.ROCK, 20.0f, 25f, DURANITE, PREFIX_BLOCK);
    public static Block solariumBlock = new BasicBlock("solarium_block", Material.ROCK, 25.0f, 25f, VIBRANIUM, PREFIX_BLOCK);
-    public static Block nihiliteBlock = new BasicBlock("nihilite_block", Material.ROCK, 25.0f, 25f, VALYRIUM, PREFIX_BLOCK);
+    public static Block nihiliteBlock = new BasicBlock("nihilite_block", Material.ROCK, 10.0f, 25f, VALYRIUM, PREFIX_BLOCK);
    public static Block adamantBlock = new BasicBlock("adamant_block", Material.ROCK, 25.0f, 25f, VIBRANIUM, PREFIX_BLOCK);
-    public static Block dyoniteBlock = new BasicBlock("dyonite_block", Material.ROCK, 25.0f, 25f, DURANITE, PREFIX_BLOCK);
-    public static Block nucleumBlock = new BasicBlock("nucleum_block", Material.ROCK, 25.0f, 25f, VALYRIUM, PREFIX_BLOCK);
-    public static Block lumixBlock = new BasicBlock("lumix_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK);
-    public static Block seismumBlock = new BasicBlock("seismum_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK);
-    public static Block astriumBlock = new BasicBlock("astrium_block", Material.ROCK, 25.0f, 25f, COBALT, PREFIX_BLOCK);
-    public static Block niobBlock = new BasicBlock("niob_block", Material.ROCK, 25.0f, 25f, DURANITE, PREFIX_BLOCK);
-    public static Block yrdeenBlock = new BasicBlock("yrdeen_block", Material.ROCK, 25.0f, 25f, VALYRIUM, PREFIX_BLOCK);
-    public static Block ioxBlock = new BasicBlock("iox_block", Material.ROCK, 25.0f, 25f, DURANITE, PREFIX_BLOCK);
+    public static Block dyoniteBlock = new BasicBlock("dyonite_block", Material.ROCK, 10.0f, 25f, DURANITE, PREFIX_BLOCK);
+    public static Block nucleumBlock = new BasicBlock("nucleum_block", Material.ROCK, 10.0f, 25f, VALYRIUM, PREFIX_BLOCK);
+    public static Block lumixBlock = new BasicBlock("lumix_block", Material.ROCK, 15.0f, 25f, COBALT, PREFIX_BLOCK);
+    public static Block seismumBlock = new BasicBlock("seismum_block", Material.ROCK, 15.0f, 25f, COBALT, PREFIX_BLOCK);
+    public static Block astriumBlock = new BasicBlock("astrium_block", Material.ROCK, 15.0f, 25f, COBALT, PREFIX_BLOCK);
+    public static Block niobBlock = new BasicBlock("niob_block", Material.ROCK, 15.0f, 25f, DURANITE, PREFIX_BLOCK);
+    public static Block yrdeenBlock = new BasicBlock("yrdeen_block", Material.ROCK, 15.0f, 25f, VALYRIUM, PREFIX_BLOCK);
+    public static Block ioxBlock = new BasicBlock("iox_block", Material.ROCK, 20.0f, 25f, DURANITE, PREFIX_BLOCK);


-    public static Block blockMeteoriteCobble = new BlockCobble("meteoritecobble_block", Material.ROCK, 35f, 10f, COBALT, 0.075f, PREFIX_BLOCK);
-    public static Block blockObsidioriteCobble = new BlockCobble("obsidioritecobble_block", Material.ROCK, 60f, 20f, DURANITE, 0.035f, PREFIX_BLOCK);
-    public static Block blockMeteorite = new BlockMeteoriteRock("meteorite_block", Material.ROCK, 70f, 2000f, COBALT, 0.15f, PREFIX_BLOCK, blockMeteoriteCobble.getDefaultState());
-    public static Block blockObsidiorite = new BlockMeteoriteRock("obsidiorite_block", Material.ROCK, 120f, 4000f, DURANITE, 0.2f, PREFIX_BLOCK, blockObsidioriteCobble.getDefaultState());
+    public static Block blockMeteoriteCobble = new BlockCobble("meteoritecobble_block", Material.ROCK, 20f, 10f, COBALT, 0.075f, PREFIX_BLOCK);
+    public static Block blockObsidioriteCobble = new BlockCobble("obsidioritecobble_block", Material.ROCK, 25f, 20f, DURANITE, 0.035f, PREFIX_BLOCK);
+    public static Block blockMeteorite = new BlockMeteoriteRock("meteorite_block", Material.ROCK, 40f, 2000f, COBALT, 0.15f, PREFIX_BLOCK, blockMeteoriteCobble.getDefaultState());
+    public static Block blockObsidiorite = new BlockMeteoriteRock("obsidiorite_block", Material.ROCK, 50f, 4000f, DURANITE, 0.2f, PREFIX_BLOCK, blockObsidioriteCobble.getDefaultState());


    /**
--- a/src/main/java/com/sosnitzka/taiga/Fluids.java
+++ b/src/main/java/com/sosnitzka/taiga/Fluids.java
@@ -3,6 +3,7 @@ package com.sosnitzka.taiga;

 import com.sosnitzka.taiga.generic.BasicTinkerFluid;
 import com.sosnitzka.taiga.util.Utils;
+import net.minecraftforge.fluids.FluidStack;
 import slimeknights.tconstruct.library.TinkerRegistry;
 import slimeknights.tconstruct.smeltery.block.BlockMolten;

@@ -15,11 +16,14 @@ public class Fluids {
    public static BasicTinkerFluid basaltFluid = new BasicTinkerFluid("basalt_fluid", 0xFFe4ddc3, 550, 10, 6000);
    public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium_fluid", 0xFF66f136, 400, 10, 8000);
    public static BasicTinkerFluid auroriumFluid = new BasicTinkerFluid("aurorium_fluid", 0xFFefae94, 750, 10, 10000);
-    public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum_fluid", 0xFF271c29, 850, 10, 10000);
-    public static BasicTinkerFluid duraniteFluid = new BasicTinkerFluid("duranite_fluid", 0xFFacddeb, 10000, 10, 10000);
-    public static BasicTinkerFluid valyriumFluid = new BasicTinkerFluid("valyrium_fluid", 0xFFe85c31, 1250, 10, 10000);
-    public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium_fluid", 0xFFbad2d9, 1400, 10, 10000);
+    public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum_fluid", 0xFF372c49, 850, 10, 10000);
+    public static BasicTinkerFluid duraniteFluid = new BasicTinkerFluid("duranite_fluid", 0xFFacddeb, 1400, 10, 10000);
+    public static BasicTinkerFluid valyriumFluid = new BasicTinkerFluid("valyrium_fluid", 0xFFe85c31, 1915, 10, 10000);
+    public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium_fluid", 0xFFbad2d9, 3050, 10, 10000);
    public static BasicTinkerFluid karmesineFluid = new BasicTinkerFluid("karmesine_fluid", 0xFFeb484a, 750, 10, 9000);
+    public static BasicTinkerFluid jauxumFluid = new BasicTinkerFluid("jauxum_fluid", 0xFF68c663, 750, 10, 9000);
+    public static BasicTinkerFluid oviumFluid = new BasicTinkerFluid("ovium_fluid", 0xFF7d77c3, 750, 10, 9000);
+    public static BasicTinkerFluid terraxFluid = new BasicTinkerFluid("terrax_fluid", 0xFFa5978e, 850, 10, 9000);
    public static BasicTinkerFluid palladiumFluid = new BasicTinkerFluid("palladium_fluid", 0xFFee8736, 690, 10, 10000);
    public static BasicTinkerFluid uruFluid = new BasicTinkerFluid("uru_fluid", 0xFFbfb9f0, 1200, 10, 10000);
    public static BasicTinkerFluid osramFluid = new BasicTinkerFluid("osram_fluid", 0xFFffbc90, 800, 10, 4000);
@@ -45,6 +49,8 @@ public class Fluids {
    public static BasicTinkerFluid ioxFluid = new BasicTinkerFluid("iox_fluid", 0xFF99323c, 900, 10, 10000);
    public static BasicTinkerFluid meteoriteFluid = new BasicTinkerFluid("meteorite_fluid", 0xFF374f3d, 950, 10, 7000);
    public static BasicTinkerFluid obsidioriteFluid = new BasicTinkerFluid("obsidiorite_fluid", 0xFF224853, 1050, 10, 7000);
+    public static BasicTinkerFluid magmaFluid = new BasicTinkerFluid("magma_fluid", 0xFFffc000, 2000, 10, 5000);
+    public static BasicTinkerFluid nitroniteFluid = new BasicTinkerFluid("nitronite_fluid", 0xFFCCFF00, 3100, 10, 5000);

    /**
     * Registers all materials' fluids <br>
@@ -80,7 +86,12 @@ public class Fluids {
     * Registers special smeltery recipes (not alloying)
     */
    static void registerfromItem() {
-        TinkerRegistry.registerMelting(Blocks.blockMeteoriteCobble, meteoriteFluid, 144);
+        TinkerRegistry.registerMelting(Blocks.blockMeteoriteCobble, meteoriteFluid, 288);
+        TinkerRegistry.registerMelting(Blocks.blockObsidiorite, meteoriteFluid, 288);
+        TinkerRegistry.registerMelting(net.minecraft.init.Blocks.MAGMA, magmaFluid, 288);
+
+        TinkerRegistry.registerSmelteryFuel(new FluidStack(magmaFluid, 50), 100);
+        TinkerRegistry.registerSmelteryFuel(new FluidStack(nitroniteFluid, 100), 500);
    }

 }
--- a/src/main/java/com/sosnitzka/taiga/Items.java
+++ b/src/main/java/com/sosnitzka/taiga/Items.java
@@ -45,6 +45,18 @@ public class Items {
    public static Item karmesineDust = new BasicItem("karmesine_dust", PREFIX_DUST);
    public static Item karmesineNugget = new BasicItem("karmesine_nugget", PREFIX_NUGGET);

+    public static Item oviumIngot = new BasicItem("ovium_ingot", PREFIX_INGOT);
+    public static Item oviumDust = new BasicItem("ovium_dust", PREFIX_DUST);
+    public static Item oviumNugget = new BasicItem("ovium_nugget", PREFIX_NUGGET);
+
+    public static Item jauxumIngot = new BasicItem("jauxum_ingot", PREFIX_INGOT);
+    public static Item jauxumDust = new BasicItem("jauxum_dust", PREFIX_DUST);
+    public static Item jauxumNugget = new BasicItem("jauxum_nugget", PREFIX_NUGGET);
+
+    public static Item terraxIngot = new BasicItem("terrax_ingot", PREFIX_INGOT);
+    public static Item terraxDust = new BasicItem("terrax_dust", PREFIX_DUST);
+    public static Item terraxNugget = new BasicItem("terrax_nugget", PREFIX_NUGGET);
+
    public static Item palladiumIngot = new BasicItem("palladium_ingot", PREFIX_INGOT);
    public static Item palladiumDust = new BasicItem("palladium_dust", PREFIX_DUST);
    public static Item palladiumNugget = new BasicItem("palladium_nugget", PREFIX_NUGGET);
--- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
+++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
@@ -51,6 +51,11 @@ public class MaterialTraits {
    public static final AbstractTrait ported = new TraitPorted();
    public static final AbstractTrait decay = new TraitDecay();
    public static final AbstractTrait whirl = new TraitWhirl();
+    public static final AbstractTrait superheavy = new TraitSuperHeavy();
+    public static final AbstractTrait dev = new TraitDevelopement();
+    public static final AbstractTrait carousel = new TraitCarousel();
+    public static final AbstractTrait beserk = new TraitBeserk();
+

    /**
     * Assign traits to related materials. <br>
@@ -66,11 +71,11 @@ public class MaterialTraits {
    public static Material duranite = new Material("duranite", TextFormatting.YELLOW).addTrait(analysing);
    public static Material valyrium = new Material("valyrium", TextFormatting.DARK_GRAY).addTrait(congenial);
    public static Material vibranium = new Material("vibranium", TextFormatting.GRAY).addTrait(resonance, MaterialTypes.HANDLE).addTrait(heroic, MaterialTypes.HEAD);
-    public static Material karmesine = new Material("karmesine", TextFormatting.RED).addTrait(slaughtering);
+    public static Material terrax = new Material("terrax", TextFormatting.DARK_GRAY).addTrait(slaughtering);
    public static Material palladium = new Material("palladium", TextFormatting.GOLD).addTrait(dark).addTrait(cursed);
    public static Material uru = new Material("uru", TextFormatting.DARK_RED).addTrait(diffuse);
    public static Material basalt = new Material("basalt", TextFormatting.WHITE).addTrait(softy);
-    public static Material eezo = new Material("eezo", TextFormatting.GOLD).addTrait(dissolving);
+    public static Material eezo = new Material("eezo", TextFormatting.GOLD).addTrait(dissolving).addTrait(superheavy);
    public static Material triberium = new Material("triberium", TextFormatting.GREEN).addTrait(fragile);
    public static Material fractum = new Material("fractum", TextFormatting.DARK_RED).addTrait(fracture);
    public static Material violium = new Material("violium", TextFormatting.DARK_PURPLE).addTrait(arcane);
@@ -78,9 +83,12 @@ public class MaterialTraits {
    public static Material tritonite = new Material("tritonite", TextFormatting.GOLD).addTrait(whirl);
    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(pulverizing);
-    public static Material nihilite = new Material("nihilite", TextFormatting.BLACK).addTrait(souleater);
-    public static Material adamant = new Material("adamant", TextFormatting.GOLD);
+    public static Material solarium = new Material("solarium", TextFormatting.YELLOW).addTrait(pulverizing).addTrait(superheavy);
+    public static Material nihilite = new Material("nihilite", TextFormatting.DARK_GRAY).addTrait(souleater);
+    /**
+     * With Dev
+     **/
+    public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(beserk); //.addTrait(dev);
    public static Material dyonite = new Material("dyonite", TextFormatting.GREEN).addTrait(tantrum);
    public static Material nucleum = new Material("nucleum", TextFormatting.YELLOW).addTrait(decay);
    public static Material lumix = new Material("lumix", TextFormatting.YELLOW).addTrait(bright, MaterialTypes.HANDLE).addTrait(glimmer, MaterialTypes.HEAD);
@@ -94,5 +102,8 @@ public class MaterialTraits {
    public static Material osram = new Material("osram", TextFormatting.GOLD);
    public static Material abyssum = new Material("abyssum", TextFormatting.GOLD);
    public static Material iox = new Material("iox", TextFormatting.RED);
+    public static Material ovium = new Material("ovium", TextFormatting.BLUE);
+    public static Material jauxum = new Material("jauxum", TextFormatting.YELLOW);
+    public static Material karmesine = new Material("karmesine", TextFormatting.RED);

 }
--- a/src/main/java/com/sosnitzka/taiga/TAIGA.java
+++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java
@@ -5,6 +5,7 @@ import com.sosnitzka.taiga.proxy.CommonProxy;
 import com.sosnitzka.taiga.recipes.CraftingRegistry;
 import com.sosnitzka.taiga.recipes.SmeltingRegistry;
 import com.sosnitzka.taiga.world.WorldGen;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.SidedProxy;
@@ -15,7 +16,6 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import slimeknights.tconstruct.library.MaterialIntegration;
 import slimeknights.tconstruct.library.materials.BowMaterialStats;
-import slimeknights.tconstruct.tools.TinkerMaterials;

 import java.util.List;

@@ -58,9 +58,9 @@ public class TAIGA {
        CraftingRegistry.register(); // Registers crafting recipes

        // Adds new harvest levels' names
-        harvestLevelNames.put(DURANITE, TinkerMaterials.bone.getTextColor() + "Duranite");
-        harvestLevelNames.put(VALYRIUM, TinkerMaterials.bone.getTextColor() + "Valyrium");
-        harvestLevelNames.put(VIBRANIUM, TinkerMaterials.blueslime.getTextColor() + "Vibranium");
+        harvestLevelNames.put(DURANITE, TextFormatting.DARK_GREEN + "Duranite");
+        harvestLevelNames.put(VALYRIUM, TextFormatting.GOLD + "Valyrium");
+        harvestLevelNames.put(VIBRANIUM, TextFormatting.DARK_PURPLE + "Vibranium");


        for (MaterialIntegration m : integrateList) {
@@ -90,10 +90,10 @@ public class TAIGA {
        integrateMaterial("Duranite", duranite, duraniteFluid, 1550, 3.2f, 3.2f, 1.16f, 100, 100, DURANITE, 0.3f, 1.4f, 2);
        integrateMaterial("Valyrium", valyrium, valyriumFluid, 1111, 5.37f, 4.8f, 1.30f, 100, 100, VALYRIUM, 1.1f, 1.2f, 4);
        integrateMaterial("Vibranium", vibranium, vibraniumFluid, 1235, 7.62f, 8.1f, 1.3f, 100, 100, VIBRANIUM, 1.1f, 1.8f, 4);
-        integrateMaterial("Karmesine", karmesine, karmesineFluid, 444, 4.77f, 2.9f, 0.8f, 100, 50, COBALT, shitty, true, true);
+        integrateMaterial("Terrax", terrax, terraxFluid, 444, 4.77f, 2.9f, 0.8f, 100, 50, COBALT, shitty, true, true);
        integrateMaterial("Palladium", palladium, palladiumFluid, 797, 4.35f, 6.8f, 1.3f, 130, -50, DURANITE, .5f, .2f, 3);
-        integrateMaterial("Uru", uru, uruFluid, 877, 2f, 8.2f, 1.5f, -50, 175, VALYRIUM, 1.3f, 0.8f, 6);
-        integrateMaterial("Eezo", eezo, eezoFluid, 50, 14f, 3.5f, .1f, 10, 10, COBALT, shitty, true, false);
+        integrateMaterial("Uru", uru, uruFluid, 877, 2f, 7.2f, 1.5f, -50, 175, VALYRIUM, 1.3f, 0.8f, 6);
+        integrateMaterial("Eezo", eezo, eezoFluid, 50, 23f, 3.5f, .1f, 10, 10, COBALT, shitty, true, false);
        integrateMaterial("Basalt", basalt, basaltFluid, 200, 3, 2.5f, 0.5f, -25, 25, STONE, shitty, true, false);
        integrateMaterial("Triberium", triberium, triberiumFluid, 223, 6.2f, 8.35f, 0.63f, 50, 50, DIAMOND, shitty, true, true);
        integrateMaterial("Fractum", fractum, fractumFluid, 538, 5.71f, 6.93f, 0.88f, 58, 117, DIAMOND, shitty);
@@ -102,11 +102,11 @@ public class TAIGA {
        integrateMaterial("Tritonite", tritonite, tritoniteFluid, 780, 8f, 3.3f, 1.45f, -25, 150, COBALT, shitty);
        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, 13.78f, 7f, 1.25f, 150, 150, VIBRANIUM, .8f, 1.5f, 5);
+        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("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, 15.5f, 9.5f, 1.05f, 100, 125, VALYRIUM, shitty);
+        integrateMaterial("Nucleum", nucleum, nucleumFluid, 505, 17.5f, 9.5f, 1.05f, 100, 125, VALYRIUM, shitty);
        integrateMaterial("Lumix", lumix, lumixFluid, 666, 3.84f, 3.92f, 0.85f, 250, 200, COBALT, .8f, 1.3f, 1);
        integrateMaterial("Seismum", seismum, seismumFluid, 780, 3.66f, 6.05f, .95f, 250, 50, COBALT, shitty);
        integrateMaterial("Astrium", astrium, astriumFluid, 750, 8.35f, 5.4f, 0.95f, -100, 200, COBALT, .7f, .8f, 2);
@@ -121,6 +121,9 @@ public class TAIGA {
        integrateOre("Osram", osramFluid);
        integrateOre("Abyssum", abyssumFluid);
        integrateOre("Iox", ioxFluid);
+        integrateOre("Karmesine", karmesineFluid);
+        integrateOre("Ovium", oviumFluid);
+        integrateOre("Jauxum", jauxumFluid);


    }
--- a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java
+++ b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java
@@ -13,36 +13,47 @@ import java.util.ArrayList;
 import java.util.List;

 public class TAIGAConfiguration {
+
    public static final String CATEGORY_NAME_GENERAL = "category_general";
    public static final String CATEGORY_NAME_ORE_GEN = "category_ore_gen";
-    public static final String CATEGORY_NAME_ORE_VAL = "category_ore_val";
-
-    public static double speedFactorGeneral;
-    public static double attackFactorGeneral;
-    public static double durabilityFactorGeneral;
-
-    public static double ironFactor;
-    public static double titaniteFactor;
-    public static double adamantiteFactor;
-    public static double arcaniteFactor;
-    public static double violiumFactor;
-    public static double bismuthFactor;
-    public static double eterniteFactor;
-    public static double ignititeFactor;
-    public static double karmesineFactor;
-    public static double meteoriteFactor;
-    public static double mindoriteFactor;
-    public static double mythrilFactor;
-    public static double palladiumFactor;
-    public static double prometheumFactor;
-    public static double tiberiumFactor;
-    public static double vibraniumFactor;
-    public static double rubiumFactor;
-    public static double basaltFactor;
-    public static double rottengroundFactor;
-    public static double ligniteFactor;

    public static boolean ironGen;
+    public static boolean endGen;
+
+    public static boolean tiberiumGen;
+    public static boolean prometheumGen;
+    public static boolean valyriumGen;
+    public static boolean osramGen;
+    public static boolean duraniteGen;
+    public static boolean basaltGen;
+    public static boolean eezoGen;
+    public static boolean karmesineGen;
+    public static boolean oviumGen;
+    public static boolean jauxumGen;
+    public static boolean vibraniumGen;
+    public static boolean uruGen;
+    public static boolean auroriumGen;
+    public static boolean palladiumGen;
+    public static boolean abyssumGen;
+
+
+    public static int IRON_VAL;
+    public static int TIBERIUM_VAL;
+    public static int PROMETHEUM_VAL;
+    public static int VALYRIUM_VAL;
+    public static int OSRAM_VAL;
+    public static int DURANITE_VAL;
+    public static int BASALT_VAL;
+    public static int EEZO_VAL;
+    public static int KARMESINE_VAL;
+    public static int OVIUM_VAL;
+    public static int JAUXUM_VAL;
+    public static int VIBRANIUM_VAL;
+    public static int URU_VAL;
+    public static int AURORIUM_VAL;
+    public static int PALLADIUM_VAL;
+    public static int ABYSSUM_VAL;
+
    private static Configuration config = null;

    public static void preInit() {
@@ -77,262 +88,199 @@ public class TAIGAConfiguration {
            config.load();
        }

-        /*
-         *  Declaration of general ore generation values: <br>
-         *  Activation of additional ores (iron/gold) <br>
-         *  Ore generation chance multiplier
-         */
+        final int RESFAC_MIN_VALUE = 0;
+        final int RESFAC_MAX_VALUE = 100;

-        final boolean GENERATION_DEFAULT_VALUE = true;
-        final double RESFAC_MIN_VALUE = 0;
-        final double RESFAC_MAX_VALUE = 9999;
-        final double RESFAC_DEFAULT_VALUE = 1.0;
+        final int IRON_DEFAULT = 20;
+        final int TIBERIUM_DEFAULT = 15;
+        final int PROMETHEUM_DEFAULT = 25;
+        final int VALYRIUM_DEFAULT = 10;
+        final int OSRAM_DEFAULT = 1;
+        final int DURANITE_DEFAULT = 1;
+        final int BASALT_DEFAULT = 10;
+        final int EEZO_DEFAULT = 3;
+        final int KARMESINE_DEFAULT = 8;
+        final int JAUXUM_DEFAULT = 8;
+        final int OVIUM_DEFAULT = 8;
+        final int VIBRANIUM_DEFAULT = 10;
+        final int URU_DEFAULT = 1;
+        final int AURORIUM_DEFAULT = 10;
+        final int PALLADIUM_DEFAULT = 10;
+        final int ABYSSUM_DEFAULT = 4;

-        Property slagIronSwitch = config.get(CATEGORY_NAME_GENERAL, "SlagIron Switch", GENERATION_DEFAULT_VALUE);
-        slagIronSwitch.setComment("Switch ore on/off");
-        slagIronSwitch.setLanguageKey("gui.taiga_configuration.gen_slagiron");
-        Property slagGoldSwitch = config.get(CATEGORY_NAME_GENERAL, "SlagGold Switch", GENERATION_DEFAULT_VALUE);
-        slagGoldSwitch.setComment("Switch ore on/off");
-        slagGoldSwitch.setLanguageKey("gui.taiga_configuration.gen_slaggold");
-        Property ironSwitch = config.get(CATEGORY_NAME_GENERAL, "Extra Iron Switch", GENERATION_DEFAULT_VALUE);
-        ironSwitch.setComment("Switch ore on/off");
+
+        Property ironSwitch = config.get(CATEGORY_NAME_GENERAL, "Additional Iron", false);
+        ironSwitch.setComment("Switch additional ore on/off");
        ironSwitch.setLanguageKey("gui.taiga_configuration.gen_iron");

+        Property endSwitch = config.get(CATEGORY_NAME_GENERAL, "Additional Endstone", true);
+        endSwitch.setComment("Switch additional endstone on/off");
+        endSwitch.setLanguageKey("gui.taiga_configuration.gen_end");
+
+        /*
+        Stuff which probably gonna come back
+
        Property durabilityFactorGeneralProp = config.get(CATEGORY_NAME_GENERAL, "Durability factor", RESFAC_DEFAULT_VALUE,
                "General multiplier for all TAIGA materials", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
        durabilityFactorGeneralProp.setLanguageKey("gui.taiga_configuration.durability_multiplier");
        durabilityFactorGeneralProp.setRequiresMcRestart(true);
-        Property speedFactorGeneralProp = config.get(CATEGORY_NAME_GENERAL, "Speed factor", RESFAC_DEFAULT_VALUE,
-                "General multiplier for all TAIGA materials", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        speedFactorGeneralProp.setLanguageKey("gui.taiga_configuration.speed_multiplier");
-        speedFactorGeneralProp.setRequiresMcRestart(true);
-        Property attackFactorGeneralProp = config.get(CATEGORY_NAME_GENERAL, "Attack factor", RESFAC_DEFAULT_VALUE,
-                "General multiplier for all TAIGA materials", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        attackFactorGeneralProp.setLanguageKey("gui.taiga_configuration.attack_multiplier");
-        attackFactorGeneralProp.setRequiresMcRestart(true);
+
+        */

        List<String> propOrderGeneral = new ArrayList<String>();
        propOrderGeneral.add(ironSwitch.getName());
-        propOrderGeneral.add(slagIronSwitch.getName());
-        propOrderGeneral.add(slagGoldSwitch.getName());
-        propOrderGeneral.add(durabilityFactorGeneralProp.getName());
-        propOrderGeneral.add(speedFactorGeneralProp.getName());
-        propOrderGeneral.add(attackFactorGeneralProp.getName());
+        propOrderGeneral.add(endSwitch.getName());
+        // propOrderGeneral.add(durabilityFactorGeneralProp.getName());
        config.setCategoryPropertyOrder(CATEGORY_NAME_GENERAL, propOrderGeneral);

        /*
         *  Declaration of specific ore generation values: <br>
         *  Generation chance multiplier
         */
-        Property ironFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Iron factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        ironFactorProp.setLanguageKey("gui.taiga_configuration.titanite_multiplier");
-        Property titaniteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Titanite factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        titaniteFactorProp.setLanguageKey("gui.taiga_configuration.titanite_multiplier");
-        Property adamantiteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Adamantite factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        adamantiteFactorProp.setLanguageKey("gui.taiga_configuration.adamantite_multiplier");
-        Property arcaniteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Arcanite factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        arcaniteFactorProp.setLanguageKey("gui.taiga_configuration.arcanite_multiplier");
-        Property violiumFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Violium factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        violiumFactorProp.setLanguageKey("gui.taiga_configuration.violium_multiplier");
-        Property bismuthFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Bismuth factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        bismuthFactorProp.setLanguageKey("gui.taiga_configuration.bismuth_multiplier");
-        Property eterniteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Eternite factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        eterniteFactorProp.setLanguageKey("gui.taiga_configuration.eternite_multiplier");
-        Property ignititeFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Ignitite factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        ignititeFactorProp.setLanguageKey("gui.taiga_configuration.ignitite_multiplier");
-        Property karmesineFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Karmesine factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        karmesineFactorProp.setLanguageKey("gui.taiga_configuration.karmesine_multiplier");
-        Property meteoriteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Meteorite factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        meteoriteFactorProp.setLanguageKey("gui.taiga_configuration.meteorite_multiplier");
-        Property mindoriteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Mindorite factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        mindoriteFactorProp.setLanguageKey("gui.taiga_configuration.mindorite_multiplier");
-        Property mythrilFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Mythril factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        mythrilFactorProp.setLanguageKey("gui.taiga_configuration.mythril_multiplier");
-        Property palladiumFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Palladium factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        palladiumFactorProp.setLanguageKey("gui.taiga_configuration.palladium_multiplier");
-        Property prometheumFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Prometheum factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        prometheumFactorProp.setLanguageKey("gui.taiga_configuration.prometheum_multiplier");
-        Property tiberiumFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Tiberium factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        tiberiumFactorProp.setLanguageKey("gui.taiga_configuration.tiberium_multiplier");
-        Property vibraniumFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Vibranium factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        vibraniumFactorProp.setLanguageKey("gui.taiga_configuration.vibranium_multiplier");
-        Property rubiumFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Rubium factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        rubiumFactorProp.setLanguageKey("gui.taiga_configuration.rubium_multiplier");
-        // RottenGround + Basalt
-        Property basaltFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Basalt factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        basaltFactorProp.setLanguageKey("gui.taiga_configuration.basalt_multiplier");
-        Property rottengroundFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "RottenGround factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        rottengroundFactorProp.setLanguageKey("gui.taiga_configuration.rottenground_multiplier");
-        Property ligniteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Lignite factor", RESFAC_DEFAULT_VALUE,
-                "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
-        ligniteFactorProp.setLanguageKey("gui.taiga_configuration.lignite_multiplier");
+
+
+        Property ironValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Iron", IRON_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        ironValueProp.setLanguageKey("gui.taiga_configuration.iron_multiplier");
+        Property basaltValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Basalt", BASALT_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        basaltValueProp.setLanguageKey("gui.taiga_configuration.basalt_multiplier");
+        Property tiberiumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Tiberium", TIBERIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        tiberiumValueProp.setLanguageKey("gui.taiga_configuration.tiberium_multiplier");
+        Property auroriumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Aurorium", AURORIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        auroriumValueProp.setLanguageKey("gui.taiga_configuration.aurorium_multiplier");
+        Property prometheumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Prometheum", PROMETHEUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        prometheumValueProp.setLanguageKey("gui.taiga_configuration.prometheum_multiplier");
+        Property duraniteValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Duranite", DURANITE_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        duraniteValueProp.setLanguageKey("gui.taiga_configuration.duranite_multiplier");
+        Property valyriumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Valyrium", VALYRIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        valyriumValueProp.setLanguageKey("gui.taiga_configuration.valyrium_multiplier");
+        Property vibraniumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Vibranium", VIBRANIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        vibraniumValueProp.setLanguageKey("gui.taiga_configuration.vibranium_multiplier");
+        Property karmesineValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Karmesine", KARMESINE_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        karmesineValueProp.setLanguageKey("gui.taiga_configuration.karmesine_multiplier");
+        Property oviumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Ovium", OVIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        oviumValueProp.setLanguageKey("gui.taiga_configuration.ovium_multiplier");
+        Property jauxumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Jauxum", JAUXUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        jauxumValueProp.setLanguageKey("gui.taiga_configuration.jauxum_multiplier");
+        Property palladiumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Palladium", PALLADIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        palladiumValueProp.setLanguageKey("gui.taiga_configuration.palladium_multiplier");
+        Property uruValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Uru", URU_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        uruValueProp.setLanguageKey("gui.taiga_configuration.uru_multiplier");
+        Property osramValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Osram", OSRAM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        osramValueProp.setLanguageKey("gui.taiga_configuration.osram_multiplier");
+        Property abyssumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Abyssum", ABYSSUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        abyssumValueProp.setLanguageKey("gui.taiga_configuration.abyssum_multiplier");
+        Property eezoValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Eezo", EEZO_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        eezoValueProp.setLanguageKey("gui.taiga_configuration.eezo_multiplier");
+

        List<String> propOrderOreGen = new ArrayList<String>();
-        propOrderOreGen.add(ironFactorProp.getName());
-        propOrderOreGen.add(ligniteFactorProp.getName());
-        propOrderOreGen.add(basaltFactorProp.getName());
-        propOrderOreGen.add(rottengroundFactorProp.getName());
-        propOrderOreGen.add(titaniteFactorProp.getName());
-        propOrderOreGen.add(adamantiteFactorProp.getName());
-        propOrderOreGen.add(arcaniteFactorProp.getName());
-        propOrderOreGen.add(violiumFactorProp.getName());
-        propOrderOreGen.add(bismuthFactorProp.getName());
-        propOrderOreGen.add(eterniteFactorProp.getName());
-        propOrderOreGen.add(ignititeFactorProp.getName());
-        propOrderOreGen.add(karmesineFactorProp.getName());
-        propOrderOreGen.add(meteoriteFactorProp.getName());
-        propOrderOreGen.add(mindoriteFactorProp.getName());
-        propOrderOreGen.add(mythrilFactorProp.getName());
-        propOrderOreGen.add(palladiumFactorProp.getName());
-        propOrderOreGen.add(prometheumFactorProp.getName());
-        propOrderOreGen.add(tiberiumFactorProp.getName());
-        propOrderOreGen.add(vibraniumFactorProp.getName());
-        propOrderOreGen.add(rubiumFactorProp.getName());
+        propOrderOreGen.add(ironValueProp.getName());
+        propOrderOreGen.add(basaltValueProp.getName());
+        propOrderOreGen.add(tiberiumValueProp.getName());
+        propOrderOreGen.add(auroriumValueProp.getName());
+        propOrderOreGen.add(prometheumValueProp.getName());
+        propOrderOreGen.add(duraniteValueProp.getName());
+        propOrderOreGen.add(valyriumValueProp.getName());
+        propOrderOreGen.add(vibraniumValueProp.getName());
+        propOrderOreGen.add(karmesineValueProp.getName());
+        propOrderOreGen.add(oviumValueProp.getName());
+        propOrderOreGen.add(jauxumValueProp.getName());
+        propOrderOreGen.add(palladiumValueProp.getName());
+        propOrderOreGen.add(uruValueProp.getName());
+        propOrderOreGen.add(osramValueProp.getName());
+        propOrderOreGen.add(abyssumValueProp.getName());
+        propOrderOreGen.add(eezoValueProp.getName());
        config.setCategoryPropertyOrder(CATEGORY_NAME_ORE_GEN, propOrderOreGen);


-        List<String> propOrderOreVal = new ArrayList<String>();
-        config.setCategoryPropertyOrder(CATEGORY_NAME_ORE_VAL, propOrderOreVal);
-
-
        if (readFieldsFromConfig) {
-            durabilityFactorGeneral = durabilityFactorGeneralProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (durabilityFactorGeneral > RESFAC_MAX_VALUE || durabilityFactorGeneral < RESFAC_MIN_VALUE) {
-                durabilityFactorGeneral = RESFAC_DEFAULT_VALUE;
+            ironGen = ironSwitch.getBoolean(false);
+            endGen = endSwitch.getBoolean(true);
+            IRON_VAL = ironValueProp.getInt(IRON_DEFAULT);
+            if (IRON_VAL > RESFAC_MAX_VALUE || IRON_VAL < RESFAC_MIN_VALUE) {
+                IRON_VAL = IRON_DEFAULT;
            }
-            speedFactorGeneral = speedFactorGeneralProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (speedFactorGeneral > RESFAC_MAX_VALUE || speedFactorGeneral < RESFAC_MIN_VALUE) {
-                speedFactorGeneral = RESFAC_DEFAULT_VALUE;
+            TIBERIUM_VAL = tiberiumValueProp.getInt(TIBERIUM_DEFAULT);
+            if (TIBERIUM_VAL > RESFAC_MAX_VALUE || TIBERIUM_VAL < RESFAC_MIN_VALUE) {
+                TIBERIUM_VAL = TIBERIUM_DEFAULT;
            }
-            attackFactorGeneral = attackFactorGeneralProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (attackFactorGeneral > RESFAC_MAX_VALUE || attackFactorGeneral < RESFAC_MIN_VALUE) {
-                attackFactorGeneral = RESFAC_DEFAULT_VALUE;
+            PROMETHEUM_VAL = prometheumValueProp.getInt(PROMETHEUM_DEFAULT);
+            if (PROMETHEUM_VAL > RESFAC_MAX_VALUE || PROMETHEUM_VAL < RESFAC_MIN_VALUE) {
+                PROMETHEUM_VAL = PROMETHEUM_DEFAULT;
            }
-            ironGen = ironSwitch.getBoolean(GENERATION_DEFAULT_VALUE);
-            ironFactor = ironFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (ironFactor > RESFAC_MAX_VALUE || ironFactor < RESFAC_MIN_VALUE) {
-                ironFactor = RESFAC_DEFAULT_VALUE;
+            VALYRIUM_VAL = valyriumValueProp.getInt(VALYRIUM_DEFAULT);
+            if (VALYRIUM_VAL > RESFAC_MAX_VALUE || VALYRIUM_VAL < RESFAC_MIN_VALUE) {
+                VALYRIUM_VAL = VALYRIUM_DEFAULT;
            }
-            titaniteFactor = titaniteFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (titaniteFactor > RESFAC_MAX_VALUE || titaniteFactor < RESFAC_MIN_VALUE) {
-                titaniteFactor = RESFAC_DEFAULT_VALUE;
+            OSRAM_VAL = osramValueProp.getInt(OSRAM_DEFAULT);
+            if (OSRAM_VAL > RESFAC_MAX_VALUE || OSRAM_VAL < RESFAC_MIN_VALUE) {
+                OSRAM_VAL = OSRAM_DEFAULT;
            }
-            adamantiteFactor = adamantiteFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (adamantiteFactor > RESFAC_MAX_VALUE || adamantiteFactor < RESFAC_MIN_VALUE) {
-                adamantiteFactor = RESFAC_DEFAULT_VALUE;
+            DURANITE_VAL = duraniteValueProp.getInt(DURANITE_DEFAULT);
+            if (DURANITE_VAL > RESFAC_MAX_VALUE || DURANITE_VAL < RESFAC_MIN_VALUE) {
+                DURANITE_VAL = DURANITE_DEFAULT;
            }
-            arcaniteFactor = arcaniteFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (arcaniteFactor > RESFAC_MAX_VALUE || arcaniteFactor < RESFAC_MIN_VALUE) {
-                arcaniteFactor = RESFAC_DEFAULT_VALUE;
+            BASALT_VAL = basaltValueProp.getInt(BASALT_DEFAULT);
+            if (BASALT_VAL > RESFAC_MAX_VALUE || BASALT_VAL < RESFAC_MIN_VALUE) {
+                BASALT_VAL = BASALT_DEFAULT;
            }
-            violiumFactor = violiumFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (violiumFactor > RESFAC_MAX_VALUE || violiumFactor < RESFAC_MIN_VALUE) {
-                violiumFactor = RESFAC_DEFAULT_VALUE;
+            EEZO_VAL = eezoValueProp.getInt(EEZO_DEFAULT);
+            if (EEZO_VAL > RESFAC_MAX_VALUE || EEZO_VAL < RESFAC_MIN_VALUE) {
+                EEZO_VAL = EEZO_DEFAULT;
            }
-            bismuthFactor = bismuthFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (bismuthFactor > RESFAC_MAX_VALUE || bismuthFactor < RESFAC_MIN_VALUE) {
-                bismuthFactor = RESFAC_DEFAULT_VALUE;
+            KARMESINE_VAL = karmesineValueProp.getInt(KARMESINE_DEFAULT);
+            if (KARMESINE_VAL > RESFAC_MAX_VALUE || KARMESINE_VAL < RESFAC_MIN_VALUE) {
+                KARMESINE_VAL = KARMESINE_DEFAULT;
            }
-            eterniteFactor = eterniteFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (eterniteFactor > RESFAC_MAX_VALUE || eterniteFactor < RESFAC_MIN_VALUE) {
-                eterniteFactor = RESFAC_DEFAULT_VALUE;
+            OVIUM_VAL = oviumValueProp.getInt(OVIUM_DEFAULT);
+            if (OVIUM_VAL > RESFAC_MAX_VALUE || OVIUM_VAL < RESFAC_MIN_VALUE) {
+                OVIUM_VAL = KARMESINE_DEFAULT;
            }
-            ignititeFactor = ignititeFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (ignititeFactor > RESFAC_MAX_VALUE || ignititeFactor < RESFAC_MIN_VALUE) {
-                ignititeFactor = RESFAC_DEFAULT_VALUE;
+            JAUXUM_VAL = jauxumValueProp.getInt(OVIUM_DEFAULT);
+            if (JAUXUM_VAL > RESFAC_MAX_VALUE || JAUXUM_VAL < RESFAC_MIN_VALUE) {
+                JAUXUM_VAL = JAUXUM_DEFAULT;
            }
-            karmesineFactor = karmesineFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (karmesineFactor > RESFAC_MAX_VALUE || karmesineFactor < RESFAC_MIN_VALUE) {
-                karmesineFactor = RESFAC_DEFAULT_VALUE;
+            VIBRANIUM_VAL = vibraniumValueProp.getInt(VIBRANIUM_DEFAULT);
+            if (VIBRANIUM_VAL > RESFAC_MAX_VALUE || VIBRANIUM_VAL < RESFAC_MIN_VALUE) {
+                VIBRANIUM_VAL = VIBRANIUM_DEFAULT;
            }
-            meteoriteFactor = meteoriteFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (meteoriteFactor > RESFAC_MAX_VALUE || meteoriteFactor < RESFAC_MIN_VALUE) {
-                meteoriteFactor = RESFAC_DEFAULT_VALUE;
+            URU_VAL = uruValueProp.getInt(URU_DEFAULT);
+            if (URU_VAL > RESFAC_MAX_VALUE || URU_VAL < RESFAC_MIN_VALUE) {
+                URU_VAL = URU_DEFAULT;
            }
-            mindoriteFactor = mindoriteFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (mindoriteFactor > RESFAC_MAX_VALUE || mindoriteFactor < RESFAC_MIN_VALUE) {
-                mindoriteFactor = RESFAC_DEFAULT_VALUE;
+            AURORIUM_VAL = auroriumValueProp.getInt(AURORIUM_DEFAULT);
+            if (AURORIUM_VAL > RESFAC_MAX_VALUE || AURORIUM_VAL < RESFAC_MIN_VALUE) {
+                AURORIUM_VAL = AURORIUM_DEFAULT;
            }
-            mythrilFactor = mythrilFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (mythrilFactor > RESFAC_MAX_VALUE || mythrilFactor < RESFAC_MIN_VALUE) {
-                mythrilFactor = RESFAC_DEFAULT_VALUE;
+            PALLADIUM_VAL = palladiumValueProp.getInt(PALLADIUM_DEFAULT);
+            if (PALLADIUM_VAL > RESFAC_MAX_VALUE || PALLADIUM_VAL < RESFAC_MIN_VALUE) {
+                PALLADIUM_VAL = PALLADIUM_DEFAULT;
            }
-            palladiumFactor = palladiumFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (palladiumFactor > RESFAC_MAX_VALUE || palladiumFactor < RESFAC_MIN_VALUE) {
-                palladiumFactor = RESFAC_DEFAULT_VALUE;
-            }
-            prometheumFactor = prometheumFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (prometheumFactor > RESFAC_MAX_VALUE || prometheumFactor < RESFAC_MIN_VALUE) {
-                prometheumFactor = RESFAC_DEFAULT_VALUE;
-            }
-            tiberiumFactor = tiberiumFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (tiberiumFactor > RESFAC_MAX_VALUE || tiberiumFactor < RESFAC_MIN_VALUE) {
-                tiberiumFactor = RESFAC_DEFAULT_VALUE;
-            }
-            vibraniumFactor = vibraniumFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (vibraniumFactor > RESFAC_MAX_VALUE || vibraniumFactor < RESFAC_MIN_VALUE) {
-                vibraniumFactor = RESFAC_DEFAULT_VALUE;
-            }
-            rubiumFactor = rubiumFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (rubiumFactor > RESFAC_MAX_VALUE || rubiumFactor < RESFAC_MIN_VALUE) {
-                rubiumFactor = RESFAC_DEFAULT_VALUE;
-            }
-            basaltFactor = basaltFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (basaltFactor > RESFAC_MAX_VALUE || basaltFactor < RESFAC_MIN_VALUE) {
-                basaltFactor = RESFAC_DEFAULT_VALUE;
-            }
-            rottengroundFactor = rottengroundFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (rottengroundFactor > RESFAC_MAX_VALUE || rottengroundFactor < RESFAC_MIN_VALUE) {
-                rottengroundFactor = RESFAC_DEFAULT_VALUE;
-            }
-            ligniteFactor = ligniteFactorProp.getDouble(RESFAC_DEFAULT_VALUE);
-            if (ligniteFactor > RESFAC_MAX_VALUE || ligniteFactor < RESFAC_MIN_VALUE) {
-                ligniteFactor = RESFAC_DEFAULT_VALUE;
+            ABYSSUM_VAL = abyssumValueProp.getInt(ABYSSUM_DEFAULT);
+            if (ABYSSUM_VAL > RESFAC_MAX_VALUE || ABYSSUM_VAL < RESFAC_MIN_VALUE) {
+                ABYSSUM_VAL = ABYSSUM_DEFAULT;
            }
        }

        ironSwitch.set(ironGen);
-        durabilityFactorGeneralProp.set(durabilityFactorGeneral);
-        speedFactorGeneralProp.set(speedFactorGeneral);
-        attackFactorGeneralProp.set(attackFactorGeneral);
-        titaniteFactorProp.set(titaniteFactor);
-        adamantiteFactorProp.set(adamantiteFactor);
-        arcaniteFactorProp.set(arcaniteFactor);
-        violiumFactorProp.set(violiumFactor);
-        bismuthFactorProp.set(bismuthFactor);
-        eterniteFactorProp.set(eterniteFactor);
-        ignititeFactorProp.set(ignititeFactor);
-        karmesineFactorProp.set(karmesineFactor);
-        meteoriteFactorProp.set(meteoriteFactor);
-        mindoriteFactorProp.set(mindoriteFactor);
-        mythrilFactorProp.set(mythrilFactor);
-        palladiumFactorProp.set(palladiumFactor);
-        prometheumFactorProp.set(prometheumFactor);
-        tiberiumFactorProp.set(tiberiumFactor);
-        vibraniumFactorProp.set(vibraniumFactor);
-        rubiumFactorProp.set(rubiumFactor);
-        basaltFactorProp.set(basaltFactor);
-        rottengroundFactorProp.set(rottengroundFactor);
-        ligniteFactorProp.set(ligniteFactor);
+        endSwitch.set(endGen);
+        ironValueProp.set(IRON_VAL);
+        tiberiumValueProp.set(TIBERIUM_VAL);
+        prometheumValueProp.set(PROMETHEUM_VAL);
+        valyriumValueProp.set(VALYRIUM_VAL);
+        osramValueProp.set(OSRAM_VAL);
+        duraniteValueProp.set(DURANITE_VAL);
+        basaltValueProp.set(BASALT_VAL);
+        eezoValueProp.set(EEZO_VAL);
+        karmesineValueProp.set(KARMESINE_VAL);
+        oviumValueProp.set(OVIUM_VAL);
+        jauxumValueProp.set(JAUXUM_VAL);
+        vibraniumValueProp.set(VIBRANIUM_VAL);
+        uruValueProp.set(URU_VAL);
+        auroriumValueProp.set(AURORIUM_VAL);
+        palladiumValueProp.set(PALLADIUM_VAL);
+        abyssumValueProp.set(ABYSSUM_VAL);
+

        if (config.hasChanged()) {
            config.save();
@@ -343,7 +291,7 @@ public class TAIGAConfiguration {
        @SubscribeEvent(priority = EventPriority.NORMAL)
        public void onEvent(ConfigChangedEvent.OnConfigChangedEvent event) {
            if (TAIGA.MODID.equals(event.getModID()) && !event.isWorldRunning()) {
-                if (event.getConfigID().equals(CATEGORY_NAME_GENERAL) || event.getConfigID().equals(CATEGORY_NAME_ORE_GEN) || event.getConfigID().equals(CATEGORY_NAME_ORE_VAL)) {
+                if (event.getConfigID().equals(CATEGORY_NAME_GENERAL) || event.getConfigID().equals(CATEGORY_NAME_ORE_GEN)) {
                    syncFromGUI();
                }
            }
--- a/src/main/java/com/sosnitzka/taiga/TAIGAGuiFactory.java
+++ b/src/main/java/com/sosnitzka/taiga/TAIGAGuiFactory.java
@@ -43,9 +43,8 @@ public class TAIGAGuiFactory implements IModGuiFactory {

        private static List<IConfigElement> getConfigElements() {
            List<IConfigElement> list = new ArrayList<IConfigElement>();
-            list.add(new DummyConfigElement.DummyCategoryElement("Basics configuration", "gui.taiga_configuration.ctgy.general", CategoryEntryGeneral.class));
-            list.add(new DummyConfigElement.DummyCategoryElement("Specific ore generation", "gui.taiga_configuration.ctgy.oregen", CategoryEntryOreGen.class));
-            //list.add(new DummyConfigElement.DummyCategoryElement("Specific ore values", "gui.taiga_configuration.ctgy.oreval", CategoryEntryOreVal.class));
+            list.add(new DummyConfigElement.DummyCategoryElement("Basic configuration", "gui.taiga_configuration.ctgy.general", CategoryEntryGeneral.class));
+            list.add(new DummyConfigElement.DummyCategoryElement("Ore specific settings", "gui.taiga_configuration.ctgy.oregen", CategoryEntryOreGen.class));
            return list;
        }

@@ -80,21 +79,5 @@ public class TAIGAGuiFactory implements IModGuiFactory {
                return new GuiConfig(this.owningScreen, propertiesOnThisScreen, this.owningScreen.modID, TAIGAConfiguration.CATEGORY_NAME_ORE_GEN, this.configElement.requiresWorldRestart() || this.owningScreen.allRequireWorldRestart, this.configElement.requiresMcRestart() || this.owningScreen.allRequireMcRestart, windowTitle);
            }
        }
-
-        public static class CategoryEntryOreVal extends GuiConfigEntries.CategoryEntry {
-            public CategoryEntryOreVal(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement prop) {
-                super(owningScreen, owningEntryList, prop);
-            }
-
-            @Override
-            protected GuiScreen buildChildScreen() {
-                Configuration configuration = TAIGAConfiguration.getConfig();
-                ConfigElement cat_general = new ConfigElement(configuration.getCategory(TAIGAConfiguration.CATEGORY_NAME_ORE_VAL));
-                List<IConfigElement> propertiesOnThisScreen = cat_general.getChildElements();
-                String windowTitle = configuration.toString();
-
-                return new GuiConfig(this.owningScreen, propertiesOnThisScreen, this.owningScreen.modID, TAIGAConfiguration.CATEGORY_NAME_ORE_VAL, this.configElement.requiresWorldRestart() || this.owningScreen.allRequireWorldRestart, this.configElement.requiresMcRestart() || this.owningScreen.allRequireMcRestart, windowTitle);
-            }
-        }
    }
 }
--- a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java
+++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java
@@ -21,7 +21,7 @@ import static slimeknights.tconstruct.library.utils.HarvestLevels.STONE;
 public class BlockTiberium extends BasicBlock {

    public BlockTiberium() {
-        super("tiberium_ore", Material.ROCK, 15.0f, 2.0f, STONE, 1.0F, PREFIX_ORE);
+        super("tiberium_ore", Material.ROCK, 10.0f, 2.0f, STONE, 1.0F, PREFIX_ORE);
    }

    @Override
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java
@@ -25,7 +25,7 @@ public class TraitAnalysing extends AbstractTrait {
    @SubscribeEvent
    public void onXpDrop(LivingExperienceDropEvent event) {
        EntityPlayer player = event.getAttackingPlayer();
-        if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) {
+        if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getDroppedExperience() >= 0) {
            event.setDroppedExperience(this.getUpdateXP(event.getDroppedExperience()));
        }

@@ -34,7 +34,7 @@ public class TraitAnalysing extends AbstractTrait {
    @SubscribeEvent
    public void onBlockBreak(BlockEvent.BreakEvent event) {
        EntityPlayer player = event.getPlayer();
-        if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) {
+        if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getExpToDrop() >= 0) {
            event.setExpToDrop(this.getUpdateXP(event.getExpToDrop()));
        }

--- a/src/main/java/com/sosnitzka/taiga/traits/TraitBeserk.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBeserk.java
@@ -0,0 +1,107 @@
+package com.sosnitzka.taiga.traits;
+
+import com.sosnitzka.taiga.util.Utils;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.util.FakePlayer;
+import net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import slimeknights.tconstruct.library.tools.ToolNBT;
+import slimeknights.tconstruct.library.utils.TagUtil;
+import slimeknights.tconstruct.library.utils.TinkerUtil;
+import slimeknights.tconstruct.library.utils.ToolHelper;
+
+
+public class TraitBeserk extends TraitProgressiveStats {
+
+    protected static int TICK_PER_STAT = 8;
+
+    public TraitBeserk() {
+        super(TraitBeserk.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED);
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+    @Override
+    public void miningSpeed(ItemStack tool, PlayerInteractEvent.BreakSpeed event) {
+        NBTTagCompound tag = TagUtil.getExtraTag(tool);
+        Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag);
+        if (!data.active) return;
+        event.setNewSpeed(event.getNewSpeed() * 4);
+    }
+
+    @Override
+    public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) {
+        NBTTagCompound tag = TagUtil.getExtraTag(tool);
+        Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag);
+        if (!data.active) return newDamage;
+        return newDamage * 4;
+    }
+
+
+    @Override
+    public void onUpdate(ItemStack tool, World world, Entity entity, int itemSlot, boolean isSelected) {
+        if (!world.isRemote) {
+            NBTTagCompound tag = TagUtil.getExtraTag(tool);
+            EntityLivingBase player = (EntityLivingBase) entity;
+            Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag);
+            NBTTagCompound root = TagUtil.getTagSafe(tool);
+            StatNBT distributed = getBonus(root);
+            if (data.active) {
+                TagUtil.setEnchantEffect(root, true);
+                if (entity instanceof FakePlayer) {
+                    return;
+                }
+                if (entity.ticksExisted % TICK_PER_STAT > 0) {
+                    return;
+                }
+
+                ToolNBT stat = TagUtil.getToolStats(tool);
+                if (random.nextFloat() > .80f) {
+                    stat.durability -= 1;
+                    distributed.durability -= 1;
+                } else
+                    ToolHelper.damageTool(tool, 1, player);
+                TagUtil.setToolTag(root, stat.get());
+                setBonus(root, distributed);
+            } else TagUtil.setEnchantEffect(root, false);
+        }
+    }
+
+    @SubscribeEvent
+    public void onRightClickItem(PlayerInteractEvent.RightClickItem event) {
+        World w = event.getWorld();
+        ItemStack tool = event.getEntityPlayer().getHeldItemMainhand();
+        if (!w.isRemote && TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) {
+            NBTTagCompound tag = TagUtil.getExtraTag(tool);
+            Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag);
+            NBTTagCompound root = TagUtil.getTagSafe(tool);
+            StatNBT distributed = getBonus(root);
+            ToolNBT stat = TagUtil.getToolStats(tool);
+            if (data.active) {
+                data.active = false;
+                TagUtil.setEnchantEffect(root, false);
+                TagUtil.setExtraTag(root, tag);
+                data.write(tag);
+
+            } else {
+                stat.durability -= 10;
+                distributed.durability -= 10;
+                TagUtil.setToolTag(root, stat.get());
+                setBonus(root, distributed);
+                data.active = true;
+                data.write(tag);
+
+                TagUtil.setExtraTag(root, tag);
+                data.write(tag);
+            }
+
+        }
+    }
+
+
+}
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitCarousel.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCarousel.java
@@ -0,0 +1,25 @@
+package com.sosnitzka.taiga.traits;
+
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import slimeknights.tconstruct.library.traits.AbstractTrait;
+
+
+public class TraitCarousel extends AbstractTrait {
+
+    public static final int TICK = 24;
+
+    public TraitCarousel() {
+        super(TraitCarousel.class.getSimpleName().toLowerCase().substring(5), 0xffcc5511);
+    }
+
+    @Override
+    public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) {
+
+    }
+
+
+}
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCatcher.java
@@ -3,6 +3,8 @@ package com.sosnitzka.taiga.traits;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -10,6 +12,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -21,7 +24,7 @@ import slimeknights.tconstruct.library.utils.ToolHelper;

 public class TraitCatcher extends AbstractTrait {

-    public static int chance = 1;
+    public static int chance = 3;
    public static float costMulti = 0.25f;

    public TraitCatcher() {
@@ -29,25 +32,49 @@ public class TraitCatcher extends AbstractTrait {
        MinecraftForge.EVENT_BUS.register(this);
    }

-    @Override
-    public void onHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean isCritical) {
-        World w = player.worldObj;
+    @SubscribeEvent
+    public void killEntity(LivingDeathEvent event) {
+        if (!(event.getSource().getEntity() instanceof EntityPlayer))
+            return;
+        if (event.getEntityLiving() instanceof EntityPlayer || event.getEntityLiving() instanceof EntityPlayerMP)
+            return;
+        World w = event.getSource().getEntity().getEntityWorld();
+        EntityPlayer p = (EntityPlayer) event.getSource().getEntity();
+        EntityLivingBase target = event.getEntityLiving();
+        NBTTagCompound tag = TagUtil.getExtraTag(p.getHeldItemMainhand());
+        Data data = Data.read(tag);
+        if (!data.mobClass.isEmpty())
+            return;
        if (!w.isRemote && random.nextInt((int) target.getMaxHealth()) <= chance && target instanceof EntityLiving) {
-            NBTTagCompound tag = TagUtil.getExtraTag(tool);
-            Data data = Data.read(tag);
+            event.setCanceled(true);
+            target.setDropItemsWhenDead(false);
            if (data.mobClass.isEmpty()) {
                data.mobClass = target.getClass().getName();
                data.mobName = target.getName();
                data.write(tag);
-                TagUtil.setEnchantEffect(tool, true);
-                TagUtil.setExtraTag(tool, tag);
-                player.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F);
+                if (p.getHeldItemMainhand() != null)
+                    TagUtil.setExtraTag(p.getHeldItemMainhand(), tag);
+                p.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F);
                target.setDropItemsWhenDead(false);
                target.setDead();
            }
        }
    }

+
+    @Override
+    public void onUpdate(ItemStack tool, World world, Entity entity, int itemSlot, boolean isSelected) {
+        if (!world.isRemote) {
+            NBTTagCompound tag = TagUtil.getExtraTag(tool);
+            Data data = Data.read(tag);
+            if (data.mobClass.isEmpty()) {
+                TagUtil.setEnchantEffect(tool, false);
+            } else
+                TagUtil.setEnchantEffect(tool, true);
+        }
+    }
+
+
    @SubscribeEvent
    public void onRightClickItem(PlayerInteractEvent.RightClickItem event) {
        World w = event.getWorld();
@@ -72,7 +99,6 @@ public class TraitCatcher extends AbstractTrait {
                    data.mobName = "";
                    data.write(tag);
                    TagUtil.setExtraTag(tool, tag);
-                    TagUtil.setEnchantEffect(tool, false);
                    ToolHelper.damageTool(tool, random.nextInt((int) (ToolHelper.getCurrentDurability(tool) * costMulti)), event.getEntityPlayer());
                }
            }
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitDevelopement.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDevelopement.java
@@ -0,0 +1,32 @@
+package com.sosnitzka.taiga.traits;
+
+import net.minecraft.block.BlockStone;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import slimeknights.tconstruct.library.traits.AbstractTrait;
+import slimeknights.tconstruct.library.utils.TagUtil;
+import slimeknights.tconstruct.library.utils.TinkerUtil;
+
+
+public class TraitDevelopement extends AbstractTrait {
+
+
+    public TraitDevelopement() {
+        super(TraitDevelopement.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED);
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+    @SubscribeEvent
+    public void onBreak(BlockEvent.BreakEvent e) {
+        IBlockState state = e.getState();
+        ItemStack tool = e.getPlayer().getHeldItemMainhand();
+        if (state.getBlock().equals(net.minecraft.init.Blocks.STONE) && TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier))
+            System.out.println("State.Variant: " + state.getValue(BlockStone.VARIANT));
+    }
+
+
+}
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java
@@ -25,41 +25,43 @@ public class TraitFracture extends AbstractTrait {
        float b = 0.99F * calcBonus(tool);
        if (!world.isRemote && tool.canHarvestBlock(state) && f <= b) {
            RayTraceResult mop = ((ToolCore) tool.getItem()).rayTrace(world, (EntityPlayer) player, false);
-            for (int i = random.nextInt(9) + 1; i >= 0; i--) {
-                switch (mop.sideHit) {
-                    case UP:
-                        BlockPos next1 = new BlockPos(pos.getX(), pos.getY() - i, pos.getZ());
-                        if (tool.canHarvestBlock(world.getBlockState(next1)) && !world.getBlockState(next1).equals(Blocks.BEDROCK.getDefaultState()))
-                            world.destroyBlock(next1, true);
-                        break;
-                    case DOWN:
-                        BlockPos next2 = new BlockPos(pos.getX(), pos.getY() + i, pos.getZ());
-                        if (tool.canHarvestBlock(world.getBlockState(next2)) && !world.getBlockState(next2).equals(Blocks.BEDROCK.getDefaultState()))
-                            world.destroyBlock(next2, true);
-                        break;
-                    case WEST:
-                        BlockPos next3 = new BlockPos(pos.getX() + i, pos.getY(), pos.getZ());
-                        if (tool.canHarvestBlock(world.getBlockState(next3)) && !world.getBlockState(next3).equals(Blocks.BEDROCK.getDefaultState()))
-                            world.destroyBlock(next3, true);
-                        break;
-                    case EAST:
-                        BlockPos next4 = new BlockPos(pos.getX() - i, pos.getY(), pos.getZ());
-                        if (tool.canHarvestBlock(world.getBlockState(next4)) && !world.getBlockState(next4).equals(Blocks.BEDROCK.getDefaultState()))
-                            world.destroyBlock(next4, true);
-                        break;
-                    case SOUTH:
-                        BlockPos next5 = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - i);
-                        if (tool.canHarvestBlock(world.getBlockState(next5)) && !world.getBlockState(next5).equals(Blocks.BEDROCK.getDefaultState()))
-                            world.destroyBlock(next5, true);
-                        break;
-                    case NORTH:
-                        BlockPos next6 = new BlockPos(pos.getX(), pos.getY() - i, pos.getZ() + i);
-                        if (tool.canHarvestBlock(world.getBlockState(next6)) && !world.getBlockState(next6).equals(Blocks.BEDROCK.getDefaultState()))
-                            world.destroyBlock(next6, true);
-                        break;
+            if (mop != null) {
+                for (int i = random.nextInt(9) + 1; i >= 0; i--) {
+                    switch (mop.sideHit) {
+                        case UP:
+                            BlockPos next1 = new BlockPos(pos.getX(), pos.getY() - i, pos.getZ());
+                            if (tool.canHarvestBlock(world.getBlockState(next1)) && !world.getBlockState(next1).equals(Blocks.BEDROCK.getDefaultState()))
+                                world.destroyBlock(next1, true);
+                            break;
+                        case DOWN:
+                            BlockPos next2 = new BlockPos(pos.getX(), pos.getY() + i, pos.getZ());
+                            if (tool.canHarvestBlock(world.getBlockState(next2)) && !world.getBlockState(next2).equals(Blocks.BEDROCK.getDefaultState()))
+                                world.destroyBlock(next2, true);
+                            break;
+                        case WEST:
+                            BlockPos next3 = new BlockPos(pos.getX() + i, pos.getY(), pos.getZ());
+                            if (tool.canHarvestBlock(world.getBlockState(next3)) && !world.getBlockState(next3).equals(Blocks.BEDROCK.getDefaultState()))
+                                world.destroyBlock(next3, true);
+                            break;
+                        case EAST:
+                            BlockPos next4 = new BlockPos(pos.getX() - i, pos.getY(), pos.getZ());
+                            if (tool.canHarvestBlock(world.getBlockState(next4)) && !world.getBlockState(next4).equals(Blocks.BEDROCK.getDefaultState()))
+                                world.destroyBlock(next4, true);
+                            break;
+                        case SOUTH:
+                            BlockPos next5 = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - i);
+                            if (tool.canHarvestBlock(world.getBlockState(next5)) && !world.getBlockState(next5).equals(Blocks.BEDROCK.getDefaultState()))
+                                world.destroyBlock(next5, true);
+                            break;
+                        case NORTH:
+                            BlockPos next6 = new BlockPos(pos.getX(), pos.getY() - i, pos.getZ() + i);
+                            if (tool.canHarvestBlock(world.getBlockState(next6)) && !world.getBlockState(next6).equals(Blocks.BEDROCK.getDefaultState()))
+                                world.destroyBlock(next6, true);
+                            break;
+                    }
                }
+                if (random.nextBoolean()) ToolHelper.damageTool(tool, random.nextInt(5), player);
            }
-            if (random.nextBoolean()) ToolHelper.damageTool(tool, random.nextInt(5), player);
        }
    }

--- a/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitHeroic.java
@@ -16,7 +16,12 @@ public class TraitHeroic extends AbstractTrait {
    public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) {
        int durability = ToolHelper.getCurrentDurability(tool);
        int durabilitymax = ToolHelper.getMaxDurability(tool);
-        float calc = newDamage + (newDamage / 2) / (durability * durabilitymax / (durabilitymax - durability - 1));
+        float calc;
+        if ((durability * durabilitymax / (durabilitymax - durability - 1)) != 0) {
+            calc = newDamage + (newDamage / 2) / (durability * durabilitymax / (durabilitymax - durability - 1));
+        } else {
+            calc = newDamage + (newDamage / 2) / ((durability * durabilitymax / (durabilitymax - durability - 1)) + 1);
+        }
        if ((float) durability < (float) (0.10 * durabilitymax) || player.getHealth() < player.getMaxHealth() / 8 || (target.getHealth() == target.getMaxHealth() && random.nextFloat() > 0.8)) {
            return super.damage(tool, player, target, damage, calc, isCritical);
        } else return super.damage(tool, player, target, damage, newDamage * 0.9f, isCritical);
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java
@@ -19,7 +19,7 @@ import slimeknights.tconstruct.library.utils.TinkerUtil;

 public class TraitSoulEater extends AbstractTrait {

-    private static float divisor = 20000f;
+    private static float divisor = 25000f;

    public TraitSoulEater() {
        super(TraitSoulEater.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED);
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java
@@ -0,0 +1,80 @@
+package com.sosnitzka.taiga.traits;
+
+import com.sosnitzka.taiga.util.Utils;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
+import net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import slimeknights.tconstruct.library.utils.TagUtil;
+import slimeknights.tconstruct.library.utils.TinkerUtil;
+
+
+public class TraitSuperHeavy extends TraitProgressiveStats {
+
+    protected static int TICK_PER_STAT = 50;
+    protected static float blockcount = 250f;
+
+    public TraitSuperHeavy() {
+        super(TraitSuperHeavy.class.getSimpleName().toLowerCase().substring(5), TextFormatting.DARK_GRAY);
+
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+    @Override
+    public void miningSpeed(ItemStack tool, PlayerInteractEvent.BreakSpeed event) {
+        NBTTagCompound tag = TagUtil.getExtraTag(tool);
+        Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag);
+        if (data.brokenblocks == 0) return;
+        event.setNewSpeed(Math.max(event.getNewSpeed() - data.brokenblocks * event.getOriginalSpeed() / blockcount, 0.25f));
+    }
+
+    @Override
+    public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) {
+        NBTTagCompound tag = TagUtil.getExtraTag(tool);
+        Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag);
+        data.brokenblocks += 1;
+        data.write(tag);
+        TagUtil.setExtraTag(tool, tag);
+    }
+
+    @Override
+    public void onUpdate(ItemStack tool, World world, Entity entity, int itemSlot, boolean isSelected) {
+        // every 3.6 seconds we distribute one stat. This means 1h = 1000 applications
+        if (entity.ticksExisted % TICK_PER_STAT > 0) {
+            return;
+        }
+
+        // we don't update if the player is currently breaking a block because that'd reset it
+        if (playerIsBreakingBlock(entity)) {
+            return;
+        }
+
+        NBTTagCompound tag = TagUtil.getExtraTag(tool);
+        Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag);
+        if (data.brokenblocks > 0)
+            data.brokenblocks -= 1;
+        data.write(tag);
+        TagUtil.setExtraTag(tool, tag);
+    }
+
+    @SubscribeEvent
+    public void onItemTooltip(ItemTooltipEvent e) {
+        ItemStack tool = e.getItemStack();
+        if (TinkerUtil.hasTrait(TagUtil.getTagSafe(tool), identifier)) {
+            NBTTagCompound tag = TagUtil.getExtraTag(tool);
+            Utils.GeneralNBTData data = Utils.GeneralNBTData.read(tag);
+            e.getToolTip().add(TextFormatting.RED + "Broken Blocks: " + TextFormatting.WHITE + data.brokenblocks);
+
+        }
+    }
+
+
+}
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java
@@ -35,7 +35,6 @@ public class TraitWhirl extends AbstractTrait {
        if (entity instanceof FakePlayer || entity.worldObj.isRemote) {
            return;
        }
-
        if (entity.ticksExisted % TICK_PER_STAT > 0) {
            return;
        }
--- a/src/main/java/com/sosnitzka/taiga/util/Generator.java
+++ b/src/main/java/com/sosnitzka/taiga/util/Generator.java
@@ -3,6 +3,7 @@ package com.sosnitzka.taiga.util;
 import com.google.common.collect.Lists;
 import com.sosnitzka.taiga.world.MeteorWorldSaveData;
 import com.sosnitzka.taiga.world.WorldGenMinable;
+import net.minecraft.block.BlockStone;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
@@ -19,34 +20,37 @@ import java.util.List;
 import java.util.Random;
 import java.util.Set;

+import static com.google.common.collect.Lists.newArrayList;
 import static com.sosnitzka.taiga.util.Utils.nextInt;

 public class Generator {

-    public static void generateOre(boolean center, IBlockState state, IBlockState replace, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) {
-        if (center) {
-            generateOreDense(state, replace, random, x, z, world, chance, minY, maxY, minSize, maxSize, null);
-        } else {
-            generateOre(state, replace, null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize, null);
-        }
+    public static void generateOre(IBlockState newState, IBlockState oldState, Random random, int chunkX, int chunkZ, World world, int count, int minY, int maxY, int minSize, int maxSize) {
+        generateOre(newState, oldState, null, null, random, chunkX, chunkZ, world, count, 100, minY, maxY, minSize, maxSize, null);
    }

+    public static void generateOre(IBlockState newState, IBlockState oldState, Random random, int chunkX, int chunkZ, World world, int count, int chance, int minY, int maxY, int minSize, int maxSize, List<Biome> biome) {
+        generateOre(newState, oldState, null, null, random, chunkX, chunkZ, world, count, chance, minY, maxY, minSize, maxSize, biome);
+    }

-    public static void generateOre(IBlockState state, IBlockState replace, IProperty property, Comparable comparable, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize, List<Biome> biome) {
+    public static void generateOre(IBlockState newState, IBlockState oldState, IProperty property, Comparable comparable, Random random, int chunkX, int chunkZ, World world, int count, int chance, int minY, int maxY, int minSize, int maxSize, List<Biome> biome) {
        int size = minSize + random.nextInt(maxSize - minSize);
        int height = maxY - minY;
-        for (int i = 0; i < chance; i++) {
-            int posX = chunkX + random.nextInt(16);
-            int posY = random.nextInt(height) + minY;
-            int posZ = chunkZ + random.nextInt(16);
-            BlockPos cPos = new BlockPos(posX, posY, posZ);
-            if (biome == null || biome.contains(world.getBiome(cPos))) {
-                new WorldGenMinable(state, size, StateMatcher.forState(replace, property, comparable)).generate(world, random, new BlockPos(posX, posY, posZ));
+        for (int i = 0; i < count; i++) {
+            if (0.01f * chance >= random.nextFloat()) {
+                int posX = chunkX + random.nextInt(16);
+                int posY = random.nextInt(height) + minY;
+                int posZ = chunkZ + random.nextInt(16);
+                BlockPos cPos = new BlockPos(posX, posY, posZ);
+                if (biome == null || biome.contains(world.getBiome(cPos))) {
+                    new WorldGenMinable(newState, size, StateMatcher.forState(oldState, property, comparable)).generate(world, random, new BlockPos(posX, posY, posZ));
+                }
            }
+
        }
    }

-    public static void generateOreDescending(List<IBlockState> replaceBlockList, IBlockState replacementBlock, Random random, int chunkX, int chunkZ, World world, int count, int minY, int maxY, int chance) {
+    public static void generateOre(List<IBlockState> replaceBlockList, IBlockState replacementBlock, Random random, int chunkX, int chunkZ, World world, int count, int minY, int maxY, int chance) {
        if (random.nextFloat() < (float) (0.01 * chance))
            generateOreDescending(replaceBlockList, replacementBlock, random, chunkX, chunkZ, world, count, minY, maxY);
    }
@@ -70,7 +74,51 @@ public class Generator {
        }
    }

-    public static void generateOreBottom(IBlockState replacedBlock, IBlockState replacementBlock, Random random, int chunkX, int chunkZ, World world, int chance, int spread, int maxY) {
+    public static void generateOreStoneVariant(IBlockState newState, BlockStone.EnumType type, Random random, int chunkX, int chunkZ, World world, int count) {
+        List<BlockStone.EnumType> list = newArrayList(type);
+        for (int i = 0; i < count; i += 2) {
+            int posX = chunkX + random.nextInt(16);
+            int posZ = chunkZ + random.nextInt(16);
+            BlockPos cPos = new BlockPos(posX, random.nextInt(64) + 32, posZ);
+            IBlockState state = world.getBlockState(cPos);
+            if (state.getBlock().equals(Blocks.STONE.getDefaultState().getBlock())) {
+                if (list.contains(state.getValue(BlockStone.VARIANT))) {
+                    world.setBlockState(cPos, newState);
+                }
+            } else {
+                while (cPos.getY() >= 0) {
+                    cPos = cPos.down();
+                    state = world.getBlockState(cPos);
+                    if (state.getBlock().equals(Blocks.STONE.getDefaultState().getBlock())) {
+                        if (list.contains(state.getValue(BlockStone.VARIANT))) {
+                            world.setBlockState(cPos, newState);
+                            break;
+                        }
+                    }
+                }
+            }
+            cPos = new BlockPos(posX, random.nextInt(32), posZ);
+            state = world.getBlockState(cPos);
+            if (state.getBlock().equals(Blocks.STONE.getDefaultState().getBlock())) {
+                if (list.contains(state.getValue(BlockStone.VARIANT))) {
+                    world.setBlockState(cPos, newState);
+                }
+            } else {
+                while (cPos.getY() <= 96) {
+                    cPos = cPos.up();
+                    state = world.getBlockState(cPos);
+                    if (state.getBlock().equals(Blocks.STONE.getDefaultState().getBlock())) {
+                        if (list.contains(state.getValue(BlockStone.VARIANT))) {
+                            world.setBlockState(cPos, newState);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public static void generateOreBottom(IBlockState oldState, IBlockState newState, Random random, int chunkX, int chunkZ, World world, int chance, int spread, int maxY) {
        for (int i = 0; i < chance; i++) {
            int posX = chunkX + random.nextInt(16);
            int posY = 0;
@@ -80,8 +128,8 @@ public class Generator {
                while (world.getBlockState(cPos).equals(Blocks.AIR.getDefaultState()) && cPos.getY() < maxY) {
                    cPos = cPos.up();
                }
-                if (world.getBlockState(cPos).equals(replacedBlock)) {
-                    world.setBlockState(cPos.up(random.nextInt(spread)), replacementBlock);
+                if (world.getBlockState(cPos).equals(oldState)) {
+                    world.setBlockState(cPos.up(random.nextInt(spread)), newState);
                }
            }
        }
@@ -150,11 +198,15 @@ public class Generator {
                    // we are in mid air, go down
                    while (world.getBlockState(cPos.down()).equals(Blocks.AIR.getDefaultState())) {
                        cPos = cPos.down();
+
+                        // if we are below 0, we might be in a void dim
+                        if (cPos.getY() < 0)
+                            break;
                    }
                }
                if (!validSurface.contains(Item.getItemFromBlock(world.getBlockState(cPos.down()).getBlock())))
                    continue;
-                cPos.down((random.nextInt(3) + 1) * r);
+                cPos = cPos.down(random.nextInt(r * 2) + r + 1);

                MeteorWorldSaveData saveData = MeteorWorldSaveData.getForWorld(world);
                saveData.addPos(cPos);
@@ -188,27 +240,4 @@ public class Generator {
            }
        }
    }
-
-
-    public static void generateOreDense(IBlockState state, IBlockState replace, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize, List<Biome> biome) {
-        int size = minSize + random.nextInt(maxSize - minSize);
-        int height = maxY - minY;
-        BlockPos cPos;
-        for (int i = 0; i < chance; i += 5) {
-            for (int j = 0; j <= 2; j++) {
-                cPos = new BlockPos(chunkX + random.nextInt(16), minY + height * j / 5 + random.nextInt(height * 3 / 5), chunkZ + random.nextInt(16));
-                if (biome == null || biome.contains(world.getBiome(cPos))) {
-                    new WorldGenMinable(state, size, StateMatcher.forState(replace, null, null)).generate(world, random, cPos);
-                }
-            }
-            for (int j = 0; j <= 1; j++) {
-                int x = chunkX + random.nextInt(16);
-                int y = chunkZ + random.nextInt(16);
-                cPos = new BlockPos(x, minY + height * 4 / 9 + random.nextInt(height / 9), y);
-                if (biome == null || biome.contains(world.getBiome(cPos))) {
-                    new WorldGenMinable(state, size, StateMatcher.forState(replace, null, null)).generate(world, random, cPos);
-                }
-            }
-        }
-    }
 }
--- a/src/main/java/com/sosnitzka/taiga/util/Utils.java
+++ b/src/main/java/com/sosnitzka/taiga/util/Utils.java
@@ -123,6 +123,9 @@ public class Utils {
        public int curse;
        public String name;
        public float radius;
+        public float dfloat;
+        public int dint;
+        public boolean active;

        public static GeneralNBTData read(NBTTagCompound tag) {
            GeneralNBTData data = new GeneralNBTData();
@@ -133,6 +136,9 @@ public class Utils {
            data.curse = tag.getInteger("curse");
            data.name = tag.getString("name");
            data.radius = tag.getFloat("radius");
+            data.dfloat = tag.getFloat("dfloat");
+            data.dint = tag.getInteger("dint");
+            data.active = tag.getBoolean("active");
            return data;
        }

@@ -144,6 +150,9 @@ public class Utils {
            tag.setInteger("curse", curse);
            tag.setString("name", name);
            tag.setFloat("radius", radius);
+            tag.setInteger("dint", dint);
+            tag.setFloat("dfloat", dfloat);
+            tag.setBoolean("active", active);
        }
    }
 }
--- a/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java
+++ b/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java
@@ -1,5 +1,6 @@
 package com.sosnitzka.taiga.world;

+import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.BlockPos;
@@ -20,6 +21,11 @@ public class MeteorWorldSaveData extends WorldSavedData {
        super(DATA_NAME);
    }

+    @SuppressWarnings("unused")
+    public MeteorWorldSaveData(String name) {
+        super(name);
+    }
+
    public static MeteorWorldSaveData getForWorld(World world) {
        MapStorage storage = world.getPerWorldStorage();
        MeteorWorldSaveData instance = (MeteorWorldSaveData) storage.getOrLoadData(MeteorWorldSaveData.class, DATA_NAME);
@@ -48,8 +54,8 @@ public class MeteorWorldSaveData extends WorldSavedData {

    @Override
    public void readFromNBT(NBTTagCompound nbt) {
-        if (nbt.hasKey("posData")) {
-            posList = new Gson().fromJson(nbt.getString("posData"), posList.getClass());
+        if (nbt.hasKey("posData") && !nbt.getString("posData").isEmpty()) {
+            posList = new Gson().fromJson(nbt.getString("posData"), new TypeToken<List<BlockPos>>(){}.getType());
        }
    }

--- a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java
+++ b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java
@@ -9,44 +9,44 @@ import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkGenerator;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraftforge.fml.common.IWorldGenerator;
+import slimeknights.tconstruct.gadgets.block.BlockStoneTorch;

 import java.util.Random;

 import static com.google.common.collect.Lists.newArrayList;
 import static com.sosnitzka.taiga.Blocks.*;
-import static com.sosnitzka.taiga.TAIGAConfiguration.ironGen;
+import static com.sosnitzka.taiga.TAIGAConfiguration.*;

@SuppressWarnings("unchecked")
 public class WorldGen implements IWorldGenerator {
    private void nether(Random random, int x, int z, World world) {
-
-        Generator.generateOre(false, Blocks.NETHERRACK.getDefaultState(), tiberiumOre.getDefaultState(), random, x, z, world, 15, 0, 128, 10, 35);
-        Generator.generateOre(true, Blocks.NETHERRACK.getDefaultState(), prometheumOre.getDefaultState(), random, x, z, world, 25, 0, 128, 2, 4);
-        Generator.generateOre(true, Blocks.NETHERRACK.getDefaultState(), valyriumOre.getDefaultState(), random, x, z, world, 10, 0, 32, 2, 4);
-        Generator.generateOreDescending(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), osramOre.getDefaultState(), random, x, z, world, 1, 0, 64, 5);
-
+        Generator.generateOre(tiberiumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, TIBERIUM_VAL, 0, 128, 10, 35);
+        Generator.generateOre(prometheumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, PROMETHEUM_VAL, 0, 128, 2, 4);
+        Generator.generateOre(valyriumOre.getDefaultState(), Blocks.NETHERRACK.getDefaultState(), random, x, z, world, VALYRIUM_VAL, 0, 32, 2, 4);
+        Generator.generateOre(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), osramOre.getDefaultState(), random, x, z, world, OSRAM_VAL, 0, 64, 15);
    }

    private void world(Random random, int x, int z, World world) {
-        // Optional
-        if (!ironGen) {
-            Generator.generateOre(false, Blocks.STONE.getDefaultState(), Blocks.IRON_ORE.getDefaultState(), random, x, z, world, 20, 0, 128, 1, 8);
+        Generator.generateMeteor(duraniteOre.getDefaultState(), blockMeteorite.getDefaultState(), random, x, z, world, DURANITE_VAL, 6, 16, 112);
+        Generator.generateOreDescending(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), basaltBlock.getDefaultState(), random, x, z, world, BASALT_VAL, 0, 64);
+        Generator.generateOreDescending(newArrayList(Blocks.BEDROCK.getDefaultState()), eezoOre.getDefaultState(), random, x, z, world, EEZO_VAL, 0, 10);
+        Generator.generateOreStoneVariant(karmesineOre.getDefaultState(), BlockStone.EnumType.ANDESITE, random, x, z, world, KARMESINE_VAL);
+        Generator.generateOreStoneVariant(oviumOre.getDefaultState(), BlockStone.EnumType.DIORITE, random, x, z, world, OVIUM_VAL);
+        Generator.generateOreStoneVariant(jauxumOre.getDefaultState(), BlockStone.EnumType.GRANITE, random, x, z, world, JAUXUM_VAL);
+        Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, VIBRANIUM_VAL, 100, 0, 64, 2, 9, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT));
+        Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 1, 25, 0, 128, 1, 5, null);
+        if (ironGen) {
+            Generator.generateOre(Blocks.IRON_ORE.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, IRON_VAL, 0, 32, 2, 8);
        }
-        Generator.generateMeteor(duraniteOre.getDefaultState(), blockMeteorite.getDefaultState(), random, x, z, world, 1, 4, 16, 112);
-        Generator.generateOreDescending(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), basaltBlock.getDefaultState(), random, x, z, world, 10, 0, 64);
-        Generator.generateOreDescending(newArrayList(Blocks.BEDROCK.getDefaultState()), eezoOre.getDefaultState(), random, x, z, world, 3, 0, 10);
-        Generator.generateOre(karmesineOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 15, 0, 96, 3, 4, null);
-        Generator.generateOre(karmesineOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 15, 0, 96, 3, 4, null);
-        Generator.generateOre(karmesineOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 15, 0, 96, 3, 4, null);
-        Generator.generateOreDense(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 10, 0, 64, 2, 12, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT));
    }

    private void end(Random random, int x, int z, World world) {
-        Generator.generateCube(true, uruOre.getDefaultState(), blockObsidiorite.getDefaultState(), random, x, z, world, 1, 2, 0, 96, 3);
-        Generator.generateOre(Blocks.END_STONE.getDefaultState(), Blocks.AIR.getDefaultState(), null, null, random, x, z, world, 1, 3, 64, 3, 8, null);
-        Generator.generateOre(false, Blocks.END_STONE.getDefaultState(), auroriumOre.getDefaultState(), random, x, z, world, 10, 32, 48, 2, 4);
-        Generator.generateOre(true, Blocks.END_STONE.getDefaultState(), palladiumOre.getDefaultState(), random, x, z, world, 10, 48, 64, 2, 4);
-        Generator.generateOreBottom(Blocks.END_STONE.getDefaultState(), abyssumOre.getDefaultState(), random, x, z, world, 12, 4, 64);
+        Generator.generateCube(true, uruOre.getDefaultState(), blockObsidiorite.getDefaultState(), random, x, z, world, URU_VAL, 2, 0, 96, 3);
+        if (endGen)
+            Generator.generateOre(Blocks.AIR.getDefaultState(), Blocks.END_STONE.getDefaultState(), null, null, random, x, z, world, 1, 100, 3, 64, 3, 8, null);
+        Generator.generateOre(auroriumOre.getDefaultState(), Blocks.END_STONE.getDefaultState(), random, x, z, world, AURORIUM_VAL, 32, 48, 2, 4);
+        Generator.generateOre(palladiumOre.getDefaultState(), Blocks.END_STONE.getDefaultState(), random, x, z, world, PALLADIUM_VAL, 48, 64, 2, 4);
+        Generator.generateOreBottom(Blocks.END_STONE.getDefaultState(), abyssumOre.getDefaultState(), random, x, z, world, ABYSSUM_VAL, 4, 64);
    }

    @Override
--- a/src/main/resources/assets/taiga/blockstates/fluid_block.json
+++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json
@@ -11,6 +11,20 @@
        }
      }
    ],
+    "magma_fluid": [
+      {
+        "custom": {
+          "fluid": "magma_fluid"
+        }
+      }
+    ],
+    "nitronite_fluid": [
+      {
+        "custom": {
+          "fluid": "nitronite_fluid"
+        }
+      }
+    ],
    "meteorite_fluid": [
      {
        "custom": {
@@ -74,6 +88,27 @@
        }
      }
    ],
+    "jauxum_fluid": [
+      {
+        "custom": {
+          "fluid": "jauxum_fluid"
+        }
+      }
+    ],
+    "ovium_fluid": [
+      {
+        "custom": {
+          "fluid": "ovium_fluid"
+        }
+      }
+    ],
+    "terrax_fluid": [
+      {
+        "custom": {
+          "fluid": "terrax_fluid"
+        }
+      }
+    ],
    "palladium_fluid": [
      {
        "custom": {
@@ -109,13 +144,6 @@
        }
      }
    ],
-    "tiberiumX_fluid": [
-      {
-        "custom": {
-          "fluid": "tiberiumX_fluid"
-        }
-      }
-    ],
    "fractum_fluid": [
      {
        "custom": {
--- a/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json
@@ -3,7 +3,7 @@
  "defaults": {
    "model": "minecraft:cube_all",
    "textures": {
-      "all": "taiga:blocks/ore/karmesinediorite"
+      "all": "taiga:blocks/block/jauxum"
    },
    "transform": "forge:default-block"
  },
--- a/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json
@@ -3,7 +3,7 @@
  "defaults": {
    "model": "minecraft:cube_all",
    "textures": {
-      "all": "taiga:blocks/ore/karmesinegranite"
+      "all": "taiga:blocks/ore/jauxum"
    },
    "transform": "forge:default-block"
  },
--- a/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json
@@ -3,7 +3,7 @@
  "defaults": {
    "model": "minecraft:cube_all",
    "textures": {
-      "all": "taiga:blocks/ore/karmesineandensite"
+      "all": "taiga:blocks/block/ovium"
    },
    "transform": "forge:default-block"
  },
--- a/src/main/resources/assets/taiga/blockstates/ovium_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/ovium_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/ovium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
--- a/src/main/resources/assets/taiga/blockstates/terrax_block.json
+++ b/src/main/resources/assets/taiga/blockstates/terrax_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/terrax"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
--- a/src/main/resources/assets/taiga/lang/de_DE.lang
+++ b/src/main/resources/assets/taiga/lang/de_DE.lang
@@ -1,203 +1,279 @@
-item.slagiron.name=Unreiner Eisenbarren
-item.lignite.name=Braunkohle
-
-tile.adamantite_ore.name=Adamantiterz
-tile.arcanite_ore.name=Arcaniterz
-tile.basalt.name=Basalt
-tile.bismuth_ore.name=Bismutherz
-tile.eternite_ore.name=Eterniterz
-tile.karmesine_ore.name=Karmesinerz
-tile.lignite_ore.name=Braunkohleerz
-tile.meteorite_ore.name=Meteoriterz
-tile.mindorite_ore.name=Mindoriterz
-tile.mythril_ore.name=Mythrilerz
-tile.palladium_ore.name=Palladiumerz
-tile.prometheum_ore.name=Prometheumerz
-tile.slagiron_ore.name=Unreines Eisenerz
-tile.slaggold_ore.name=Unreines Golderz
-tile.tiberium_ore.name=Tiberiumerz
-tile.vibranium_ore.name=Vibraniumerz
-tile.rubium_ore.name=Rubiumerz
-tile.titanite_ore.name=Titaniteerz
-tile.ignitite_ore.name=Ignititerz
-tile.violium_ore.name=Violiumerz
-
-item.slagiron_ingot.name=Unreiner Eisenbarren
-item.slaggold_ingot.name=Unreiner Goldbarren
-item.fuel_brick.name=Brennstoffziegel
-item.iron_nugget.name=Eisennugget
-
-material.titanite.name=Titanit
-material.meteorite.name=Meteorit
-material.vibranium.name=Vibranium
-material.adamantite.name=Adamantit
-material.prometheum.name=Prometheum
-material.rubium.name=Rubium
+material.basalt.name=Basalt
 material.tiberium.name=Tiberium
-material.arcanite.name=Arcanit
-material.eternite.name=Eternit
-material.mythril.name=Mythril
+material.aurorium.name=Aurorium
+material.prometheum.name=Prometheum
+material.duranite.name=Duranite
+material.valyrium.name=Valyrium
+material.vibranium.name=Vibranium
+material.karmesine.name=Karmesine
+material.jauxum.name=Jauxum
+material.ovium.name=Ovium
+material.terrax.name=Terrax
 material.palladium.name=Palladium
-material.ignitite.name=Ignitit
+material.uru.name=Uru
+material.osram.name=Osram
+material.abyssum.name=Abyssum
+material.eezo.name=Eezo
+material.triberium.name=Triberium
+material.fractum.name=Fractum
 material.violium.name=Violium
-material.bismuth.name=Bismuth
-material.mindorite.name=Mindorit
-material.karmesine.name=Karmesin
-material.imperomite.name=Imperomit
-material.fractoryte.name=Fractoryt
-material.noctunyx.name=Noctunyx
-material.nitronite.name=Nitronit
-material.cryptogen.name=Cryptogen
-material.seismodium.name=Seismodium
-material.aegisalt.name=Aegisalt
-material.ultranite.name=Ultranit
-material.bysmuid.name=Bysmuid
-material.nucleum.name=Nucleum
-material.terramite.name=Terramit
+material.proxii.name=Proxii
+material.tritonite.name=Tritonite
+material.ignitz.name=Ignitz
+material.imperomite.name=Imperomite
 material.solarium.name=Solarium
-material.lumixyl.name=Lumixyl
-material.dyonite.name=Dyonit
-material.proxideum.name=Proxideum
+material.nihilite.name=Nihilite
+material.adamant.name=Adamant
+material.dyonite.name=Dyonite
+material.nucleum.name=Nucleum
+material.lumix.name=Lumix
+material.seismum.name=Seismum
 material.astrium.name=Astrium
+material.niob.name=Niob
+material.yrdeen.name=Yrdeen
+material.iox.name=Iox
+material.meteorite.name=Meteorite
+material.obsidiorite.name=Obsidiorite
+material.magma.name=Magma
+material.nitronite.name=Nitronite

-tile.titanite_block.name=Titanitblock
-tile.meteorite_block.name=Meteoritblock
-tile.vibranium_block.name=Vibraniumblock
-tile.adamantite_block.name=Adamantitblock
-tile.prometheum_block.name=Prometheumblock
-tile.rubium_block.name=Rubiumblock
-tile.tiberium_block.name=Tiberiumblock
-tile.arcanite_block.name=Arcanitblock
-tile.eternite_block.name=Eternitblock
-tile.mythril_block.name=Mythrilblock
-tile.palladium_block.name=Palladiumblock
-tile.ignitite_block.name=Ignititblock
-tile.violium_block.name=Violiumblock
-tile.bismuth_block.name=Bismuthblock
-tile.mindorite_block.name=Mindoritblock
-tile.karmesine_block.name=Karmesinblock
-tile.imperomite_block.name=Imperomitblock
-tile.fractoryte_block.name=Fractorytblock
-tile.noctunyx_block.name=Noctunyxblock
-tile.nitronite_block.name=Nitronitblock
-tile.cryptogen_block.name=Cryptogenblock
-tile.seismodium_block.name=Seismodiumblock
-tile.aegisalt_block.name=Aegisaltblock
-tile.ultranite_block.name=Ultranitblock
-tile.bysmuid_block.name=Bysmuidblock
-tile.nucleum_block.name=Nucleumblock
-tile.terramite_block.name=Terramitblock
-tile.solarium_block.name=Solariumblock
-tile.lumixyl_block.name=Lumixylblock
-tile.dyonite_block.name=Dyonitblock
-tile.proxideum_block.name=Proxideumblock
-tile.astrium_block.name=Astriumblock
+tile.basalt_block.name=Basalt Block
+tile.tiberium_block.name=Tiberium Block
+tile.aurorium_block.name=Aurorium Block
+tile.prometheum_block.name=Prometheum Block
+tile.duranite_block.name=Duranite Block
+tile.valyrium_block.name=Valyrium Block
+tile.vibranium_block.name=Vibranium Block
+tile.karmesine_block.name=Karmesine Block
+tile.jauxum_block.name=Jauxum Block
+tile.ovium_block.name=Ovium Block
+tile.terrax_block.name=Terrax Block
+tile.palladium_block.name=Palladium Block
+tile.uru_block.name=Uru Block
+tile.osram_block.name=Osram Block
+tile.abyssum_block.name=Abyssum Block
+tile.eezo_block.name=Eezo Block
+tile.triberium_block.name=Triberium Block
+tile.fractum_block.name=Fractum Block
+tile.violium_block.name=Violium Block
+tile.proxii_block.name=Proxii Block
+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.adamant_block.name=Adamant Block
+tile.dyonite_block.name=Dyonite Block
+tile.nucleum_block.name=Nucleum Block
+tile.lumix_block.name=Lumix Block
+tile.seismum_block.name=Seismum Block
+tile.astrium_block.name=Astrium Block
+tile.niob_block.name=Niob Block
+tile.yrdeen_block.name=Yrdeen Block
+tile.iox_block.name=Iox Block
+tile.meteorite_block.name=Meteorite Block
+tile.obsidiorite_block.name=Obsidiorite Block
+tile.magma_block.name=Magma Block
+tile.nitronite_block.name=Nitronite Block
+tile.meteoritecobble_block.name=Meteorite Cobble Block
+tile.obsidioritecobble_block.name=Meteorite Cobble Block

-item.titanite_ingot.name=Titanitbarren
-item.meteorite_ingot.name=Meteoritbarren
-item.vibranium_ingot.name=Vibraniumbarren
-item.adamantite_ingot.name=Adamantitbarren
-item.prometheum_ingot.name=Prometheumbarren
-item.rubium_ingot.name=Rubiumbarren
-item.tiberium_ingot.name=Tiberiumbarren
-item.arcanite_ingot.name=Arcanitbarren
-item.eternite_ingot.name=Eternitbarren
-item.mythril_ingot.name=Mythrilbarren
-item.palladium_ingot.name=Palladiumbarren
-item.ignitite_ingot.name=Ignititbarren
-item.violium_ingot.name=Violiumbarren
-item.bismuth_ingot.name=Bismuthbarren
-item.mindorite_ingot.name=Mindoritbarren
-item.karmesine_ingot.name=Karmesinbarren
-item.imperomite_ingot.name=Imperomitbarren
-item.fractoryte_ingot.name=Fractorytbarren
-item.noctunyx_ingot.name=Noctunyxbarren
-item.nitronite_ingot.name=Nitronitbarren
-item.cryptogen_ingot.name=Cryptogenbarren
-item.seismodium_ingot.name=Seismodiumbarren
-item.aegisalt_ingot.name=Aegisaltbarren
-item.ultranite_ingot.name=Ultranitbarren
-item.bysmuid_ingot.name=Bysmuidbarren
-item.nucleum_ingot.name=Nucleumbarren
-item.terramite_ingot.name=Terramitbarren
-item.solarium_ingot.name=Solariumbarren
-item.lumixyl_ingot.name=Lumixylbarren
-item.dyonite_ingot.name=Dyonitbarren
-item.proxideum_ingot.name=Proxideumbarren
-item.astrium_ingot.name=Astriumbarren
+tile.basalt_ore.name=Basalt Erz
+tile.tiberium_ore.name=Tiberium Erz
+tile.aurorium_ore.name=Aurorium Erz
+tile.prometheum_ore.name=Prometheum Erz
+tile.duranite_ore.name=Duranite Erz
+tile.valyrium_ore.name=Valyrium Erz
+tile.vibranium_ore.name=Vibranium Erz
+tile.karmesine_ore.name=Karmesine Erz
+tile.jauxum_ore.name=Jauxum Erz
+tile.ovium_ore.name=Ovium Erz
+tile.terrax_ore.name=Terrax Erz
+tile.palladium_ore.name=Palladium Erz
+tile.uru_ore.name=Uru Erz
+tile.osram_ore.name=Osram Erz
+tile.abyssum_ore.name=Abyssum Erz
+tile.eezo_ore.name=Eezo Erz
+tile.triberium_ore.name=Triberium Erz
+tile.fractum_ore.name=Fractum Erz
+tile.violium_ore.name=Violium Erz
+tile.proxii_ore.name=Proxii Erz
+tile.tritonite_ore.name=Tritonite Erz
+tile.ignitz_ore.name=Ignitz Erz
+tile.imperomite_ore.name=Imperomite Erz
+tile.solarium_ore.name=Solarium Erz
+tile.nihilite_ore.name=Nihilite Erz
+tile.adamant_ore.name=Adamant Erz
+tile.dyonite_ore.name=Dyonite Erz
+tile.nucleum_ore.name=Nucleum Erz
+tile.lumix_ore.name=Lumix Erz
+tile.seismum_ore.name=Seismum Erz
+tile.astrium_ore.name=Astrium Erz
+tile.niob_ore.name=Niob Erz
+tile.yrdeen_ore.name=Yrdeen Erz
+tile.iox_ore.name=Iox Erz
+tile.meteorite_ore.name=Meteorite Erz
+tile.obsidiorite_ore.name=Obsidiorite Erz
+tile.magma_ore.name=Magma Erz
+tile.nitronite_ore.name=Nitronite Erz

-item.titanite_nugget.name=Titanitklumpen
-item.meteorite_nugget.name=Meteoritklumpen
-item.vibranium_nugget.name=Vibraniumklumpen
-item.adamantite_nugget.name=Adamantitklumpen
-item.prometheum_nugget.name=Prometheumklumpen
-item.rubium_nugget.name=Rubiumklumpen
-item.tiberium_nugget.name=Tiberiumklumpen
-item.arcanite_nugget.name=Arcanitklumpen
-item.eternite_nugget.name=Eternitklumpen
-item.mythril_nugget.name=Mythrilklumpen
-item.palladium_nugget.name=Palladiumklumpen
-item.ignitite_nugget.name=Ignititklumpen
-item.violium_nugget.name=Violiumklumpen
-item.bismuth_nugget.name=Bismuthklumpen
-item.mindorite_nugget.name=Mindoritklumpen
-item.karmesine_nugget.name=Karmesinklumpen
-item.imperomite_nugget.name=Imperomitklumpen
-item.fractoryte_nugget.name=Fractorytklumpen
-item.noctunyx_nugget.name=Noctunyxklumpen
-item.nitronite_nugget.name=Nitronitklumpen
-item.cryptogen_nugget.name=Cryptogenklumpen
-item.seismodium_nugget.name=Seismodiumklumpen
-item.aegisalt_nugget.name=Aegisaltklumpen
-item.ultranite_nugget.name=Ultranitklumpen
-item.bysmuid_nugget.name=Bysmuidklumpen
-item.nucleum_nugget.name=Nucleumklumpen
-item.terramite_nugget.name=Terramitklumpen
-item.solarium_nugget.name=Solariumklumpen
-item.lumixyl_nugget.name=Lumixylklumpen
-item.dyonite_nugget.name=Dyonitklumpen
-item.proxideum_nugget.name=Proxideumklumpen
-item.astrium_nugget.name=Astriumklumpen
+item.basalt_nugget.name=Basalt Nugget
+item.tiberium_nugget.name=Tiberium Nugget
+item.aurorium_nugget.name=Aurorium Nugget
+item.prometheum_nugget.name=Prometheum Nugget
+item.duranite_nugget.name=Duranite Nugget
+item.valyrium_nugget.name=Valyrium Nugget
+item.vibranium_nugget.name=Vibranium Nugget
+item.karmesine_nugget.name=Karmesine Nugget
+item.jauxum_nugget.name=Jauxum Nugget
+item.ovium_nugget.name=Ovium Nugget
+item.terrax_nugget.name=Terrax Nugget
+item.palladium_nugget.name=Palladium Nugget
+item.uru_nugget.name=Uru Nugget
+item.osram_nugget.name=Osram Nugget
+item.abyssum_nugget.name=Abyssum Nugget
+item.eezo_nugget.name=Eezo Nugget
+item.triberium_nugget.name=Triberium Nugget
+item.fractum_nugget.name=Fractum Nugget
+item.violium_nugget.name=Violium Nugget
+item.proxii_nugget.name=Proxii Nugget
+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.adamant_nugget.name=Adamant Nugget
+item.dyonite_nugget.name=Dyonite Nugget
+item.nucleum_nugget.name=Nucleum Nugget
+item.lumix_nugget.name=Lumix Nugget
+item.seismum_nugget.name=Seismum Nugget
+item.astrium_nugget.name=Astrium Nugget
+item.niob_nugget.name=Niob Nugget
+item.yrdeen_nugget.name=Yrdeen Nugget
+item.iox_nugget.name=Iox Nugget
+item.meteorite_nugget.name=Meteorite Nugget
+item.obsidiorite_nugget.name=Obsidiorite Nugget
+item.magma_nugget.name=Magma Nugget
+item.nitronite_nugget.name=Nitronite Nugget
+item.iron_nugget.name=Iron Nugget

-fluid.tconstruct.arcanite.name=Arcanit
-fluid.tconstruct.tiberium.name=Tiberium
-fluid.tconstruct.prometheum.name=Prometheum
-fluid.tconstruct.rubium.name=Rubium
-fluid.tconstruct.violium.name=Violium
-fluid.tconstruct.bismuth.name=Bismuth
-fluid.tconstruct.karmesine.name=Karmesin
-fluid.tconstruct.mindorite.name=Mindorit
-fluid.tconstruct.titanite.name=Titanit
-fluid.tconstruct.meteorite.name=Meteorit
-fluid.tconstruct.adamantite.name=Adamantit
-fluid.tconstruct.vibranium.name=Vibranium
-fluid.tconstruct.ignitite.name=Ignitit
-fluid.tconstruct.palladium.name=Palladium
-fluid.tconstruct.eternite.name=Eternit
-fluid.tconstruct.mythril.name=Mythril
-fluid.tconstruct.astrium.name=Astrium
-fluid.tconstruct.nitronite.name=Nitronit
-fluid.tconstruct.proxideum.name=Proxideum
-fluid.tconstruct.noctunyx.name=Noctunyx
-fluid.tconstruct.imperomite.name=Imperomit
-fluid.tconstruct.cryptogen.name=Cryptogen
-fluid.tconstruct.fractoryte.name=Fractoryt
-fluid.tconstruct.seismodium.name=Seismodium
-fluid.tconstruct.terramite.name=Terramit
-fluid.tconstruct.lumixyl.name=Lumixyl
-fluid.tconstruct.solarium.name=Solarium
-fluid.tconstruct.dyonite.name=Dyonite
-fluid.tconstruct.ultranite.name=Ultranit
-fluid.tconstruct.nucleum.name=Nucleum
-fluid.tconstruct.aegisalt.name=Aegisalt
-fluid.tconstruct.bysmuid.name=Bysmuid
-fluid.tconstruct.radiant_enderium.name=Radiant Enderium
-fluid.tconstruct.glimming_enderium.name=Glimming Enderium
-fluid.tconstruct.energy_enderium.name=Energy Enderium
-fluid.tconstruct.glimmercoal_fluid.name=Flüssige Glimmerkohle
-fluid.tconstruct.nitro_fluid.name=Flüssiges Nitro
-fluid.tconstruct.anthracite_fluid.name=Flüssiges Anthracit
-fluid.tconstruct.spectrum_fluid.name=Spektrumfluid
+
+item.basalt_dust.name=Basalt Staub
+item.tiberium_dust.name=Tiberium Staub
+item.aurorium_dust.name=Aurorium Staub
+item.prometheum_dust.name=Prometheum Staub
+item.duranite_dust.name=Duranite Staub
+item.valyrium_dust.name=Valyrium Staub
+item.vibranium_dust.name=Vibranium Staub
+item.karmesine_dust.name=Karmesine Staub
+item.jauxum_dust.name=Jauxum Staub
+item.ovium_dust.name=Ovium Staub
+item.terrax_dust.name=Terrax Staub
+item.palladium_dust.name=Palladium Staub
+item.uru_dust.name=Uru Staub
+item.osram_dust.name=Osram Staub
+item.abyssum_dust.name=Abyssum Staub
+item.eezo_dust.name=Eezo Staub
+item.triberium_dust.name=Triberium Staub
+item.fractum_dust.name=Fractum Staub
+item.violium_dust.name=Violium Staub
+item.proxii_dust.name=Proxii Staub
+item.tritonite_dust.name=Tritonite Staub
+item.ignitz_dust.name=Ignitz Staub
+item.imperomite_dust.name=Imperomite Staub
+item.solarium_dust.name=Solarium Staub
+item.nihilite_dust.name=Nihilite Staub
+item.adamant_dust.name=Adamant Staub
+item.dyonite_dust.name=Dyonite Staub
+item.nucleum_dust.name=Nucleum Staub
+item.lumix_dust.name=Lumix Staub
+item.seismum_dust.name=Seismum Staub
+item.astrium_dust.name=Astrium Staub
+item.niob_dust.name=Niob Staub
+item.yrdeen_dust.name=Yrdeen Staub
+item.iox_dust.name=Iox Staub
+item.meteorite_dust.name=Meteorite Staub
+item.obsidiorite_dust.name=Obsidiorite Staub
+item.magma_dust.name=Magma Staub
+item.nitronite_dust.name=Nitronite Staub
+
+item.basalt_ingot.name=Basalt Barren
+item.tiberium_ingot.name=Tiberium Barren
+item.aurorium_ingot.name=Aurorium Barren
+item.prometheum_ingot.name=Prometheum Barren
+item.duranite_ingot.name=Duranite Barren
+item.valyrium_ingot.name=Valyrium Barren
+item.vibranium_ingot.name=Vibranium Barren
+item.karmesine_ingot.name=Karmesine Barren
+item.jauxum_ingot.name=Jauxum Barren
+item.ovium_ingot.name=Ovium Barren
+item.terrax_ingot.name=Terrax Barren
+item.palladium_ingot.name=Palladium Barren
+item.uru_ingot.name=Uru Barren
+item.osram_ingot.name=Osram Barren
+item.abyssum_ingot.name=Abyssum Barren
+item.eezo_ingot.name=Eezo Barren
+item.triberium_ingot.name=Triberium Barren
+item.fractum_ingot.name=Fractum Barren
+item.violium_ingot.name=Violium Barren
+item.proxii_ingot.name=Proxii Barren
+item.tritonite_ingot.name=Tritonite Barren
+item.ignitz_ingot.name=Ignitz Barren
+item.imperomite_ingot.name=Imperomite Barren
+item.solarium_ingot.name=Solarium Barren
+item.nihilite_ingot.name=Nihilite Barren
+item.adamant_ingot.name=Adamant Barren
+item.dyonite_ingot.name=Dyonite Barren
+item.nucleum_ingot.name=Nucleum Barren
+item.lumix_ingot.name=Lumix Barren
+item.seismum_ingot.name=Seismum Barren
+item.astrium_ingot.name=Astrium Barren
+item.niob_ingot.name=Niob Barren
+item.yrdeen_ingot.name=Yrdeen Barren
+item.iox_ingot.name=Iox Barren
+item.meteorite_ingot.name=Meteorite Barren
+item.obsidiorite_ingot.name=Obsidiorite Barren
+item.magma_ingot.name=Magma Barren
+item.nitronite_ingot.name=Nitronite Barren
+
+fluid.tconstruct.basalt_fluid.name=Basalt Fluid
+fluid.tconstruct.tiberium_fluid.name=Tiberium Fluid
+fluid.tconstruct.aurorium_fluid.name=Aurorium Fluid
+fluid.tconstruct.prometheum_fluid.name=Prometheum Fluid
+fluid.tconstruct.duranite_fluid.name=Duranite Fluid
+fluid.tconstruct.valyrium_fluid.name=Valyrium Fluid
+fluid.tconstruct.vibranium_fluid.name=Vibranium Fluid
+fluid.tconstruct.karmesine_fluid.name=Karmesine Fluid
+fluid.tconstruct.jauxum_fluid.name=Jauxum Fluid
+fluid.tconstruct.ovium_fluid.name=Ovium Fluid
+fluid.tconstruct.terrax_fluid.name=Terrax Fluid
+fluid.tconstruct.palladium_fluid.name=Palladium Fluid
+fluid.tconstruct.uru_fluid.name=Uru Fluid
+fluid.tconstruct.osram_fluid.name=Osram Fluid
+fluid.tconstruct.abyssum_fluid.name=Abyssum Fluid
+fluid.tconstruct.eezo_fluid.name=Eezo Fluid
+fluid.tconstruct.triberium_fluid.name=Triberium Fluid
+fluid.tconstruct.fractum_fluid.name=Fractum Fluid
+fluid.tconstruct.violium_fluid.name=Violium Fluid
+fluid.tconstruct.proxii_fluid.name=Proxii Fluid
+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.adamant_fluid.name=Adamant Fluid
+fluid.tconstruct.dyonite_fluid.name=Dyonite Fluid
+fluid.tconstruct.nucleum_fluid.name=Nucleum Fluid
+fluid.tconstruct.lumix_fluid.name=Lumix Fluid
+fluid.tconstruct.seismum_fluid.name=Seismum Fluid
+fluid.tconstruct.astrium_fluid.name=Astrium Fluid
+fluid.tconstruct.niob_fluid.name=Niob Fluid
+fluid.tconstruct.yrdeen_fluid.name=Yrdeen Fluid
+fluid.tconstruct.iox_fluid.name=Iox Fluid
+fluid.tconstruct.meteorite_fluid.name=Meteorite Fluid
+fluid.tconstruct.obsidiorite_fluid.name=Obsidiorite Fluid
+fluid.tconstruct.magma_fluid.name=Magma Fluid
+fluid.tconstruct.nitronite_fluid.name=Nitronite Fluid

 modifier.analysing.name=Analysierend
 modifier.analysing.desc=§oIch kenne dich!§r\ERFAHRRRUNG!
@@ -254,19 +330,6 @@ modifier.reviving.desc=§oTöte es doch endlich!§r\Zombies!?
 modifier.melting.name=Schmelzend
 modifier.melting.desc=§oUnendlich heiß!§r\Burrrrrrn!

-
-item.glimmercoal.name=Glimmerkohle
-item.glimmer_pearl.name=Glimmerperle
-item.glimmerstone_dust.name=Glimmerstein Staub
-item.energy_pearl.name=Energieperle
-item.nitro_brick.name=Nitroziegel
-item.anthracite_dust.name=Anthracitstaub
-item.spectrum_dust.name=Spektrumstaub
-item.tiberium_shard_instable.name=Instabile Tiberiumscherbe
-item.tiberium_nugget.name=Tiberium Nugget
-item.radiant_pearl.name=Radiumperle
-item.luminar_dust.name=Luminarstaub
-
 gui.taiga_configuration.mainTitle=TAIGA Configuration
 itemGroup.taiga_block=TAIGA Blocks
 itemGroup.taiga_item=TAIGA Items
--- a/src/main/resources/assets/taiga/lang/en_US.lang
+++ b/src/main/resources/assets/taiga/lang/en_US.lang
@@ -1,271 +1,351 @@
-item.slagiron.name=Slagiron Bar
-item.lignite.name=Lignite
+material.basalt.name=Basalt
+material.tiberium.name=Tiberium
+material.aurorium.name=Aurorium
+material.prometheum.name=Prometheum
+material.duranite.name=Duranite
+material.valyrium.name=Valyrium
+material.vibranium.name=Vibranium
+material.karmesine.name=Karmesine
+material.jauxum.name=Jauxum
+material.ovium.name=Ovium
+material.terrax.name=Terrax
+material.palladium.name=Palladium
+material.uru.name=Uru
+material.osram.name=Osram
+material.abyssum.name=Abyssum
+material.eezo.name=Eezo
+material.triberium.name=Triberium
+material.fractum.name=Fractum
+material.violium.name=Violium
+material.proxii.name=Proxii
+material.tritonite.name=Tritonite
+material.ignitz.name=Ignitz
+material.imperomite.name=Imperomite
+material.solarium.name=Solarium
+material.nihilite.name=Nihilite
+material.adamant.name=Adamant
+material.dyonite.name=Dyonite
+material.nucleum.name=Nucleum
+material.lumix.name=Lumix
+material.seismum.name=Seismum
+material.astrium.name=Astrium
+material.niob.name=Niob
+material.yrdeen.name=Yrdeen
+material.iox.name=Iox
+material.meteorite.name=Meteorite
+material.obsidiorite.name=Obsidiorite
+material.magma.name=Magma
+material.nitronite.name=Nitronit

-tile.adamantite_ore.name=Adamantite Ore
-tile.arcanite_ore.name=Arcanite Ore
-tile.basalt.name=Basalt
-tile.bismuth_ore.name=Bismuth Ore
-tile.eternite_ore.name=Eternite Ore
-tile.karmesine_ore.name=Karmesine Ore
-tile.lignite_ore.name=Lignite Ore
-tile.meteorite_ore.name=Meteorite Ore
-tile.mindorite_ore.name=Mindorite Ore
-tile.mythril_ore.name=Mythril Ore
-tile.palladium_ore.name=Palladium Ore
-tile.prometheum_ore.name=Prometheum Ore
-tile.slagiron_ore.name=Slagiron Ore
-tile.slaggold_ore.name=Slaggold Ore
+tile.basalt_block.name=Basalt Block
+tile.tiberium_block.name=Tiberium Block
+tile.aurorium_block.name=Aurorium Block
+tile.prometheum_block.name=Prometheum Block
+tile.duranite_block.name=Duranite Block
+tile.valyrium_block.name=Valyrium Block
+tile.vibranium_block.name=Vibranium Block
+tile.karmesine_block.name=Karmesine Block
+tile.jauxum_block.name=Jauxum Block
+tile.ovium_block.name=Ovium Block
+tile.terrax_block.name=Terrax Block
+tile.palladium_block.name=Palladium Block
+tile.uru_block.name=Uru Block
+tile.osram_block.name=Osram Block
+tile.abyssum_block.name=Abyssum Block
+tile.eezo_block.name=Eezo Block
+tile.triberium_block.name=Triberium Block
+tile.fractum_block.name=Fractum Block
+tile.violium_block.name=Violium Block
+tile.proxii_block.name=Proxii Block
+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.adamant_block.name=Adamant Block
+tile.dyonite_block.name=Dyonite Block
+tile.nucleum_block.name=Nucleum Block
+tile.lumix_block.name=Lumix Block
+tile.seismum_block.name=Seismum Block
+tile.astrium_block.name=Astrium Block
+tile.niob_block.name=Niob Block
+tile.yrdeen_block.name=Yrdeen Block
+tile.iox_block.name=Iox Block
+tile.meteorite_block.name=Meteorite Block
+tile.obsidiorite_block.name=Obsidiorite Block
+tile.magma_block.name=Magma Block
+tile.nitronite_block.name=Nitronite Block
+tile.meteoritecobble_block.name=Meteorite Cobble Block
+tile.obsidioritecobble_block.name=Meteorite Cobble Block
+
+
+tile.basalt_ore.name=Basalt Ore
 tile.tiberium_ore.name=Tiberium Ore
+tile.aurorium_ore.name=Aurorium Ore
+tile.prometheum_ore.name=Prometheum Ore
+tile.duranite_ore.name=Duranite Ore
+tile.valyrium_ore.name=Valyrium Ore
 tile.vibranium_ore.name=Vibranium Ore
-tile.rubium_ore.name=Rubium Ore
-tile.titanite_ore.name=Titanite Ore
-tile.ignitite_ore.name=Ignitite Ore
+tile.karmesine_ore.name=Karmesine Ore
+tile.jauxum_ore.name=Jauxum Ore
+tile.ovium_ore.name=Ovium Ore
+tile.terrax_ore.name=Terrax Ore
+tile.palladium_ore.name=Palladium Ore
+tile.uru_ore.name=Uru Ore
+tile.osram_ore.name=Osram Ore
+tile.abyssum_ore.name=Abyssum Ore
+tile.eezo_ore.name=Eezo Ore
+tile.triberium_ore.name=Triberium Ore
+tile.fractum_ore.name=Fractum Ore
 tile.violium_ore.name=Violium Ore
+tile.proxii_ore.name=Proxii Ore
+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.adamant_ore.name=Adamant Ore
+tile.dyonite_ore.name=Dyonite Ore
+tile.nucleum_ore.name=Nucleum Ore
+tile.lumix_ore.name=Lumix Ore
+tile.seismum_ore.name=Seismum Ore
+tile.astrium_ore.name=Astrium Ore
+tile.niob_ore.name=Niob Ore
+tile.yrdeen_ore.name=Yrdeen Ore
+tile.iox_ore.name=Iox Ore
+tile.meteorite_ore.name=Meteorite Ore
+tile.obsidiorite_ore.name=Obsidiorite Ore
+tile.magma_ore.name=Magma Ore
+tile.nitronite_ore.name=Nitronite Ore

-item.slagiron_ingot.name=Slagiron Ingot
-item.slaggold_ingot.name=Slaggold Ingot
-item.fuel_brick.name=Fuelbrick
+
+item.basalt_nugget.name=Basalt Nugget
+item.tiberium_nugget.name=Tiberium Nugget
+item.aurorium_nugget.name=Aurorium Nugget
+item.prometheum_nugget.name=Prometheum Nugget
+item.duranite_nugget.name=Duranite Nugget
+item.valyrium_nugget.name=Valyrium Nugget
+item.vibranium_nugget.name=Vibranium Nugget
+item.karmesine_nugget.name=Karmesine Nugget
+item.jauxum_nugget.name=Jauxum Nugget
+item.ovium_nugget.name=Ovium Nugget
+item.terrax_nugget.name=Terrax Nugget
+item.palladium_nugget.name=Palladium Nugget
+item.uru_nugget.name=Uru Nugget
+item.osram_nugget.name=Osram Nugget
+item.abyssum_nugget.name=Abyssum Nugget
+item.eezo_nugget.name=Eezo Nugget
+item.triberium_nugget.name=Triberium Nugget
+item.fractum_nugget.name=Fractum Nugget
+item.violium_nugget.name=Violium Nugget
+item.proxii_nugget.name=Proxii Nugget
+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.adamant_nugget.name=Adamant Nugget
+item.dyonite_nugget.name=Dyonite Nugget
+item.nucleum_nugget.name=Nucleum Nugget
+item.lumix_nugget.name=Lumix Nugget
+item.seismum_nugget.name=Seismum Nugget
+item.astrium_nugget.name=Astrium Nugget
+item.niob_nugget.name=Niob Nugget
+item.yrdeen_nugget.name=Yrdeen Nugget
+item.iox_nugget.name=Iox Nugget
+item.meteorite_nugget.name=Meteorite Nugget
+item.obsidiorite_nugget.name=Obsidiorite Nugget
+item.magma_nugget.name=Magma Nugget
+item.nitronite_nugget.name=Nitronite Nugget
 item.iron_nugget.name=Iron Nugget

-material.titanite.name=Titanite
-material.meteorite.name=Meteorite
-material.vibranium.name=Vibranium
-material.adamantite.name=Adamantite
-material.prometheum.name=Prometheum
-material.rubium.name=Rubium
-material.tiberium.name=Tiberium
-material.arcanite.name=Arcanite
-material.eternite.name=Eternite
-material.mythril.name=Mythril
-material.palladium.name=Palladium
-material.ignitite.name=Ignitite
-material.violium.name=Violium
-material.bismuth.name=Bismuth
-material.mindorite.name=Mindorite
-material.karmesine.name=Karmesine
-material.imperomite.name=Imperomite
-material.fractoryte.name=Fractoryte
-material.noctunyx.name=Noctunyx
-material.nitronite.name=Nitronite
-material.cryptogen.name=Cryptogen
-material.seismodium.name=Seismodium
-material.aegisalt.name=Aegisalt
-material.ultranite.name=Ultranite
-material.bysmuid.name=Bysmuid
-material.nucleum.name=Nucleum
-material.terramite.name=Terramite
-material.solarium.name=Solarium
-material.lumixyl.name=Lumixyl
-material.dyonite.name=Dyonite
-material.proxideum.name=Proxideum
-material.astrium.name=Astrium

-fluid.tconstruct.arcanite.name=Arcanite
-fluid.tconstruct.tiberium.name=Tiberium
-fluid.tconstruct.prometheum.name=Prometheum
-fluid.tconstruct.rubium.name=Rubium
-fluid.tconstruct.violium.name=Violium
-fluid.tconstruct.bismuth.name=Bismuth
-fluid.tconstruct.karmesine.name=Karmesine
-fluid.tconstruct.mindorite.name=Mindorite
-fluid.tconstruct.titanite.name=Titanite
-fluid.tconstruct.meteorite.name=Meteorite
-fluid.tconstruct.adamantite.name=Adamantite
-fluid.tconstruct.vibranium.name=Vibranium
-fluid.tconstruct.ignitite.name=Ignitite
-fluid.tconstruct.palladium.name=Palladium
-fluid.tconstruct.eternite.name=Eternite
-fluid.tconstruct.mythril.name=Mythril
-fluid.tconstruct.astrium.name=Astrium
-fluid.tconstruct.nitronite.name=Nitronite
-fluid.tconstruct.proxideum.name=Proxideum
-fluid.tconstruct.noctunyx.name=Noctunyx
-fluid.tconstruct.imperomite.name=Imperomite
-fluid.tconstruct.cryptogen.name=Cryptogen
-fluid.tconstruct.fractoryte.name=Fractoryte
-fluid.tconstruct.seismodium.name=Seismodium
-fluid.tconstruct.terramite.name=Terramite
-fluid.tconstruct.lumixyl.name=Lumixyl
-fluid.tconstruct.solarium.name=Solarium
-fluid.tconstruct.dyonite.name=Dyonite
-fluid.tconstruct.ultranite.name=Ultranite
-fluid.tconstruct.nucleum.name=Nucleum
-fluid.tconstruct.aegisalt.name=Aegisalt
-fluid.tconstruct.bysmuid.name=Bysmuid
-fluid.tconstruct.radiant_enderium.name=Radiant Enderium
-fluid.tconstruct.glimming_enderium.name=Glimming Enderium
-fluid.tconstruct.energy_enderium.name=Energy Enderium
-fluid.tconstruct.glimmercoal_fluid.name=Glimmercoal Fluid
-fluid.tconstruct.nitro_fluid.name=Nitro Fluid
-fluid.tconstruct.anthracite_fluid.name=Anthracite Fluid
-fluid.tconstruct.spectrum_fluid.name=Spectrum Fluid
+item.basalt_dust.name=Basalt Dust
+item.tiberium_dust.name=Tiberium Dust
+item.aurorium_dust.name=Aurorium Dust
+item.prometheum_dust.name=Prometheum Dust
+item.duranite_dust.name=Duranite Dust
+item.valyrium_dust.name=Valyrium Dust
+item.vibranium_dust.name=Vibranium Dust
+item.karmesine_dust.name=Karmesine Dust
+item.jauxum_dust.name=Jauxum Dust
+item.ovium_dust.name=Ovium Dust
+item.terrax_dust.name=Terrax Dust
+item.palladium_dust.name=Palladium Dust
+item.uru_dust.name=Uru Dust
+item.osram_dust.name=Osram Dust
+item.abyssum_dust.name=Abyssum Dust
+item.eezo_dust.name=Eezo Dust
+item.triberium_dust.name=Triberium Dust
+item.fractum_dust.name=Fractum Dust
+item.violium_dust.name=Violium Dust
+item.proxii_dust.name=Proxii Dust
+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.adamant_dust.name=Adamant Dust
+item.dyonite_dust.name=Dyonite Dust
+item.nucleum_dust.name=Nucleum Dust
+item.lumix_dust.name=Lumix Dust
+item.seismum_dust.name=Seismum Dust
+item.astrium_dust.name=Astrium Dust
+item.niob_dust.name=Niob Dust
+item.yrdeen_dust.name=Yrdeen Dust
+item.iox_dust.name=Iox Dust
+item.meteorite_dust.name=Meteorite Dust
+item.obsidiorite_dust.name=Obsidiorite Dust
+item.magma_dust.name=Magma Dust
+item.nitronite_dust.name=Nitronite Dust

-tile.titanite_block.name=Titanite Block
-tile.meteorite_block.name=Meteorite Block
-tile.vibranium_block.name=Vibranium Block
-tile.adamantite_block.name=Adamantite Block
-tile.prometheum_block.name=Prometheum Block
-tile.rubium_block.name=Rubium Block
-tile.tiberium_block.name=Tiberium Block
-tile.arcanite_block.name=Arcanite Block
-tile.eternite_block.name=Eternite Block
-tile.mythril_block.name=Mythril Block
-tile.palladium_block.name=Palladium Block
-tile.ignitite_block.name=Ignitite Block
-tile.violium_block.name=Violium Block
-tile.bismuth_block.name=Bismuth Block
-tile.mindorite_block.name=Mindorite Block
-tile.karmesine_block.name=Karmesine Block
-tile.imperomite_block.name=Imperomite Block
-tile.fractoryte_block.name=Fractoryte Block
-tile.noctunyx_block.name=Noctunyx Block
-tile.nitronite_block.name=Nitronite Block
-tile.cryptogen_block.name=Cryptogen Block
-tile.seismodium_block.name=Seismodium Block
-tile.aegisalt_block.name=Aegisalt Block
-tile.ultranite_block.name=Ultranite Block
-tile.bysmuid_block.name=Bysmuid Block
-tile.nucleum_block.name=Nucleum Block
-tile.terramite_block.name=Terramite Block
-tile.solarium_block.name=Solarium Block
-tile.lumixyl_block.name=Lumixyl Block
-tile.dyonite_block.name=Dyonite Block
-tile.proxideum_block.name=Proxideum Block
-tile.astrium_block.name=Astrium Block
-
-item.titanite_ingot.name=Titanite Ingot
-item.meteorite_ingot.name=Meteorite Ingot
-item.vibranium_ingot.name=Vibranium Ingot
-item.adamantite_ingot.name=Adamantite Ingot
-item.prometheum_ingot.name=Prometheum Ingot
-item.rubium_ingot.name=Rubium Ingot
+item.basalt_ingot.name=Basalt Ingot
 item.tiberium_ingot.name=Tiberium Ingot
-item.arcanite_ingot.name=Arcanite Ingot
-item.eternite_ingot.name=Eternite Ingot
-item.mythril_ingot.name=Mythril Ingot
-item.palladium_ingot.name=Palladium Ingot
-item.ignitite_ingot.name=Ignitite Ingot
-item.violium_ingot.name=Violium Ingot
-item.bismuth_ingot.name=Bismuth Ingot
-item.mindorite_ingot.name=Mindorite Ingot
+item.aurorium_ingot.name=Aurorium Ingot
+item.prometheum_ingot.name=Prometheum Ingot
+item.duranite_ingot.name=Duranite Ingot
+item.valyrium_ingot.name=Valyrium Ingot
+item.vibranium_ingot.name=Vibranium Ingot
 item.karmesine_ingot.name=Karmesine Ingot
+item.jauxum_ingot.name=Jauxum Ingot
+item.ovium_ingot.name=Ovium Ingot
+item.terrax_ingot.name=Terrax Ingot
+item.palladium_ingot.name=Palladium Ingot
+item.uru_ingot.name=Uru Ingot
+item.osram_ingot.name=Osram Ingot
+item.abyssum_ingot.name=Abyssum Ingot
+item.eezo_ingot.name=Eezo Ingot
+item.triberium_ingot.name=Triberium Ingot
+item.fractum_ingot.name=Fractum Ingot
+item.violium_ingot.name=Violium Ingot
+item.proxii_ingot.name=Proxii Ingot
+item.tritonite_ingot.name=Tritonite Ingot
+item.ignitz_ingot.name=Ignitz Ingot
 item.imperomite_ingot.name=Imperomite Ingot
-item.fractoryte_ingot.name=Fractoryte Ingot
-item.noctunyx_ingot.name=Noctunyx Ingot
-item.nitronite_ingot.name=Nitronite Ingot
-item.cryptogen_ingot.name=Cryptogen Ingot
-item.seismodium_ingot.name=Seismodium Ingot
-item.aegisalt_ingot.name=Aegisalt Ingot
-item.ultranite_ingot.name=Ultranite Ingot
-item.bysmuid_ingot.name=Bysmuid Ingot
-item.nucleum_ingot.name=Nucleum Ingot
-item.terramite_ingot.name=Terramite Ingot
 item.solarium_ingot.name=Solarium Ingot
-item.lumixyl_ingot.name=Lumixyl Ingot
+item.nihilite_ingot.name=Nihilite Ingot
+item.adamant_ingot.name=Adamant Ingot
 item.dyonite_ingot.name=Dyonite Ingot
-item.proxideum_ingot.name=Proxideum Ingot
+item.nucleum_ingot.name=Nucleum Ingot
+item.lumix_ingot.name=Lumix Ingot
+item.seismum_ingot.name=Seismum Ingot
 item.astrium_ingot.name=Astrium Ingot
+item.niob_ingot.name=Niob Ingot
+item.yrdeen_ingot.name=Yrdeen Ingot
+item.iox_ingot.name=Iox Ingot
+item.meteorite_ingot.name=Meteorite Ingot
+item.obsidiorite_ingot.name=Obsidiorite Ingot
+item.magma_ingot.name=Magma Ingot
+item.nitronite_ingot.name=Nitronite Ingot

-item.titanite_nugget.name=Titanite Nugget
-item.meteorite_nugget.name=Meteorite Nugget
-item.vibranium_nugget.name=Vibranium Nugget
-item.adamantite_nugget.name=Adamantite Nugget
-item.prometheum_nugget.name=Prometheum Nugget
-item.rubium_nugget.name=Rubium Nugget
-item.tiberium_nugget.name=Tiberium Nugget
-item.arcanite_nugget.name=Arcanite Nugget
-item.eternite_nugget.name=Eternite Nugget
-item.mythril_nugget.name=Mythril Nugget
-item.palladium_nugget.name=Palladium Nugget
-item.ignitite_nugget.name=Ignitite Nugget
-item.violium_nugget.name=Violium Nugget
-item.bismuth_nugget.name=Bismuth Nugget
-item.mindorite_nugget.name=Mindorite Nugget
-item.karmesine_nugget.name=Karmesine Nugget
-item.imperomite_nugget.name=Imperomite Nugget
-item.fractoryte_nugget.name=Fractoryte Nugget
-item.noctunyx_nugget.name=Noctunyx Nugget
-item.nitronite_nugget.name=Nitronite Nugget
-item.cryptogen_nugget.name=Cryptogen Nugget
-item.seismodium_nugget.name=Seismodium Nugget
-item.aegisalt_nugget.name=Aegisalt Nugget
-item.ultranite_nugget.name=Ultranite Nugget
-item.bysmuid_nugget.name=Bysmuid Nugget
-item.nucleum_nugget.name=Nucleum Nugget
-item.terramite_nugget.name=Terramite Nugget
-item.solarium_nugget.name=Solarium Nugget
-item.lumixyl_nugget.name=Lumixyl Nugget
-item.dyonite_nugget.name=Dyonite Nugget
-item.proxideum_nugget.name=Proxideum Nugget
-item.astrium_nugget.name=Astrium Nugget
+fluid.tconstruct.basalt_fluid.name=Basalt Fluid
+fluid.tconstruct.tiberium_fluid.name=Tiberium Fluid
+fluid.tconstruct.aurorium_fluid.name=Aurorium Fluid
+fluid.tconstruct.prometheum_fluid.name=Prometheum Fluid
+fluid.tconstruct.duranite_fluid.name=Duranite Fluid
+fluid.tconstruct.valyrium_fluid.name=Valyrium Fluid
+fluid.tconstruct.vibranium_fluid.name=Vibranium Fluid
+fluid.tconstruct.karmesine_fluid.name=Karmesine Fluid
+fluid.tconstruct.jauxum_fluid.name=Jauxum Fluid
+fluid.tconstruct.ovium_fluid.name=Ovium Fluid
+fluid.tconstruct.terrax_fluid.name=Terrax Fluid
+fluid.tconstruct.palladium_fluid.name=Palladium Fluid
+fluid.tconstruct.uru_fluid.name=Uru Fluid
+fluid.tconstruct.osram_fluid.name=Osram Fluid
+fluid.tconstruct.abyssum_fluid.name=Abyssum Fluid
+fluid.tconstruct.eezo_fluid.name=Eezo Fluid
+fluid.tconstruct.triberium_fluid.name=Triberium Fluid
+fluid.tconstruct.fractum_fluid.name=Fractum Fluid
+fluid.tconstruct.violium_fluid.name=Violium Fluid
+fluid.tconstruct.proxii_fluid.name=Proxii Fluid
+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.adamant_fluid.name=Adamant Fluid
+fluid.tconstruct.dyonite_fluid.name=Dyonite Fluid
+fluid.tconstruct.nucleum_fluid.name=Nucleum Fluid
+fluid.tconstruct.lumix_fluid.name=Lumix Fluid
+fluid.tconstruct.seismum_fluid.name=Seismum Fluid
+fluid.tconstruct.astrium_fluid.name=Astrium Fluid
+fluid.tconstruct.niob_fluid.name=Niob Fluid
+fluid.tconstruct.yrdeen_fluid.name=Yrdeen Fluid
+fluid.tconstruct.iox_fluid.name=Iox Fluid
+fluid.tconstruct.meteorite_fluid.name=Meteorite Fluid
+fluid.tconstruct.obsidiorite_fluid.name=Obsidiorite Fluid
+fluid.tconstruct.magma_fluid.name=Magma Fluid
+fluid.tconstruct.nitronite_fluid.name=Nitronite Fluid

+
+modifier.catcher.name=Catcher
+modifier.catcher.desc=§oGotta catch 'em all!§r\nRandomly catch Mobs and stores it... and release it!
 modifier.analysing.name=Analysing
-modifier.analysing.desc=§oI know what you are!§r\nKill them, get all their knowledge, ignore loot.
+modifier.analysing.desc=§oI know what you are!§r\nLess drops but more experience!
+modifier.congenial.name=Congenial
+modifier.congenial.desc=§oYou are my rival!§r\nAlready known enemies take more damage.
 modifier.arcane.name=Arcane
-modifier.arcane.desc=§oIt's dark outside, let's go mining!§r\Nighttime is good for tool health.
-modifier.organizing.name=Organizing
-modifier.organizing.desc=§oNow you are tree!§r\Possibly creates wood.
+modifier.arcane.desc=§oLet's go out! It's dark!§r\nNighttime is good for the tool health.
 modifier.blind.name=Blind
-modifier.blind.desc=§oIt's a dark night, I can't even see!§r\Darkness brings weakness or more darkness.
+modifier.blind.desc=§oIt's a dark night, I can't even see!§r\nDarkness brings weakness and also more darkness.
 modifier.bright.name=Bright
-modifier.bright.desc=§oIt's a bright day, I feel strong!§r\Daytime let you glow.
+modifier.bright.desc=§oIt's a bright day, I feel strong!§r\nDaytime let you glow.
 modifier.cascade.name=Cascade
-modifier.cascade.desc=§oThis tool is vibrating!§r\Breaks blocks like an earthquake.
+modifier.cascade.desc=§oThrough the walls!§r\nBreaks blocks like an wandering earthquake.
 modifier.curvature.name=Curvature
-modifier.curvature.desc=§oIt pulls me back and forth!§r\Sometimes it teleports you or your surroundings.
+modifier.curvature.desc=§oIt pulls me!§r\nSometimes it teleports you or your surroundings.
 modifier.dark.name=Dark
-modifier.dark.desc=§oIt's dark outside, let's fight!§r\Nighttime makes you stronger.
+modifier.dark.desc=§oIt's dark outside, let's fight!§r\nNighttime makes you stronger.
 modifier.diffuse.name=Diffuse
-modifier.diffuse.desc=§oSo much EXP... or nothing?§r\Regular blocks drop exp, but loot is probably gone.
+modifier.diffuse.desc=§oThere is much to learn!§r\nRegular blocks drop exp, but loot is probably gone.
 modifier.dissolving.name=Dissolving
-modifier.dissolving.desc=§oI don't care about missing Experience.§r\Switching amount of experience.
+modifier.dissolving.desc=§oThis seems a lot.§r\nSometimes there is no experience and then a huge amount.
 modifier.fracture.name=Fracture
-modifier.fracture.desc=§oYou gonna dig deep!§r\Do you have a drill or something?
+modifier.fracture.desc=§oRupture!§r\nBreaks blocks in a straight line.
 modifier.fragile.name=Fragile
-modifier.fragile.desc=§oKind of earthquake.§r\Blocks are getting weak and your tool drops health.
+modifier.fragile.desc=§oEarthquake§r\nBlocks are getting cracked and your tool health drops.
 modifier.garishly.name=Garishly
-modifier.garishly.desc=§oIt's so hot.§r\Thei actually drop fiery stuff.
+modifier.garishly.desc=§oIt's so hot.§r\nThey actually drop fiery stuff.
 modifier.glimmer.name=Glimmer
-modifier.glimmer.desc=§oDarkness? Not for me!§r\Sometimes you get night vision.
-modifier.haunted.name=Haunted
-modifier.haunted.desc=§oHit 'em to get 'em crazy!'§r\This is mad cow desease.
+modifier.glimmer.desc=§oNo darkness for me!§r\nSometimes you get night vision.
 modifier.heroic.name=Heroic
-modifier.heroic.desc=§oUntil you'll die.§r\At the end, you grow stronger.
+modifier.heroic.desc=§oUntil you'll die.§r\nWhen the end is near, you grow stronger.
 modifier.hollow.name=Hollow
-modifier.hollow.desc=§oBraindead!§r\Brain smash!
+modifier.hollow.desc=§oBraindead!§r\nMakes your enemies brainless.
 modifier.instable.name=Unstable
-modifier.instable.desc=§oWhat the heck?§r\Seriously, this is unstable!
+modifier.instable.desc=§oCan you feel this?§r\nSeriously, this is completely unstable! Expect explosions!
 modifier.naturebound.name=Naturebound
-modifier.naturebound.desc=§oYou are one with your surrounding!§r\Repairs in name of the nature.
+modifier.naturebound.desc=§oYou are one with your surrounding!§r\nRepairs the tool on several blocks.
 modifier.pulverizing.name=Pulverizing
-modifier.pulverizing.desc=§oHulk... Smash!§r\Destroy the stuff you mine.
-modifier.randomize.name=Randomize
-modifier.randomize.desc=§oWho are you?§r\Randomizes entities and vanilla metal-ores.
+modifier.pulverizing.desc=§oSmash it!§r\nDestroy a lot of your drops.
 modifier.resonance.name=Resonance
-modifier.resonance.desc=§oVibranium!!! Baaaam!§r\Take that smash!
+modifier.resonance.desc=§oFeel the vibrations!§r\nEnemies propably fly away after a hit!
 modifier.slaughtering.name=Slaughtering
-modifier.slaughtering.desc=§oYum yum!§r\Who needs EXP if you can have meat?
+modifier.slaughtering.desc=§oYum yum!§r\nWho needs EXP if you can have a lot more meat?
 modifier.softy.name=Softy
-modifier.softy.desc=§oI love dirt!§r\Dirt heals!
+modifier.softy.desc=§oI love dirt!§r\nDirt digging heals!
 modifier.uncertain.name=Uncertain
-modifier.uncertain.desc=§oSome kind of risky to use.§r\At least it's not unstable...or?
+modifier.uncertain.desc=§oSome kind of risky to use.§r\nAt least it's not unstable...or?
 modifier.reviving.name=Reviving
-modifier.reviving.desc=§oPlease kill it already!§r\Zombies!?
+modifier.reviving.desc=§oPlease kill it already!§r\nThey revive like zombies!
 modifier.melting.name=Melting
-modifier.melting.desc=§oSo damn hot!§r\Burrrrrrn!
-
-
-item.glimmercoal.name=Glimmercoal
-item.glimmer_pearl.name=Glimmerpearl
-item.glimmerstone_dust.name=Glimmerstone Dust
-item.energy_pearl.name=Energy Pearl
-item.nitro_brick.name=Nitro Brick
-item.anthracite_dust.name=Anthracite Dust
-item.spectrum_dust.name=Spectrum Dust
-item.tiberium_shard_instable.name=Unstable Tiberium Shard
-item.tiberium_nugget.name=Tiberium Nugget
-item.radiant_pearl.name=Radiant Pearl
-item.luminar_dust.name=Luminar Dust
+modifier.melting.desc=§oSo damn hot!§r\nMelts down blocks to lava!
+modifier.cursed.name=Cursed
+modifier.cursed.desc=§oI don't feel well!§r\nThe more enemies killed, the more there is a chance for random pain.
+modifier.superheavy.name=Super Heavy
+modifier.superheavy.desc=§oIt weights over 9000!§r\nAs you dig a lot, it will make you tired.
+modifier.whirl.name=Whirl
+modifier.whirl.desc=§oLike a sponge!§r\nRemove water at a gained radius.
+modifier.souleater.name=Soul Eater
+modifier.souleater.desc=§oKill a lot, be a veteran§r\nIf you kill a lot of enemies, your weapon will get stronger.
+modifier.beserk.name=BESERK
+modifier.beserk.desc=§oBecome the Hulk!§r\nActivate the life consumption and be three times faster and stronger.
+modifier.tantrum.name=Tantrum
+modifier.tantrum.desc=§oCast an explosion!§r\nIf you activate the stacked explosion you won't get hurt.
+modifier.decay.name=Decay
+modifier.decay.desc=§oRadioactive!§r\nYour tool is fading away over time.
+modifier.ported.name=Ported
+modifier.ported.desc=§oBeam me up!§r\nTry to escape out of a cave with right clicks. Needs several tries.

 gui.taiga_configuration.mainTitle=TAIGA Configuration
 itemGroup.taiga_block=TAIGA Blocks
--- a/src/main/resources/assets/taiga/lang/zh_CN.lang
+++ b/src/main/resources/assets/taiga/lang/zh_CN.lang
@@ -267,6 +267,6 @@ item.tiberium_nugget.name=泰伯利亚粒
 item.radiant_pearl.name=辐射珍珠
 item.luminar_dust.name=流明粉

-gui.taiga_configuration.mainTitle=TAIGA 组态
-itemGroup.taiga_block=TAIGA 块
-itemGroup.taiga_item=TAIGA 对象
+gui.taiga_configuration.mainTitle=TAIGA 配置
+itemGroup.taiga_block=TAIGA 方块
+itemGroup.taiga_item=TAIGA 物品
--- a/src/main/resources/assets/taiga/models/item/jauxum_dust.json
+++ b/src/main/resources/assets/taiga/models/item/jauxum_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/jauxum"
+  }
+}
--- a/src/main/resources/assets/taiga/models/item/jauxum_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/jauxum_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/jauxum"
+  }
+}
--- a/src/main/resources/assets/taiga/models/item/jauxum_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/jauxum_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/jauxum"
+  }
+}
--- a/src/main/resources/assets/taiga/models/item/ovium_dust.json
+++ b/src/main/resources/assets/taiga/models/item/ovium_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/ovium"
+  }
+}
--- a/src/main/resources/assets/taiga/models/item/ovium_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/ovium_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/ovium"
+  }
+}
--- a/src/main/resources/assets/taiga/models/item/ovium_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/ovium_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/ovium"
+  }
+}
--- a/src/main/resources/assets/taiga/models/item/terrax_dust.json
+++ b/src/main/resources/assets/taiga/models/item/terrax_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/terrax"
+  }
+}
--- a/src/main/resources/assets/taiga/models/item/terrax_ingot.json
+++ b/src/main/resources/assets/taiga/models/item/terrax_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/terrax"
+  }
+}
--- a/src/main/resources/assets/taiga/models/item/terrax_nugget.json
+++ b/src/main/resources/assets/taiga/models/item/terrax_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/terrax"
+  }
+}
--- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png
--- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png
--- a/src/main/resources/assets/taiga/textures/blocks/block/terrax.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/terrax.png
--- a/src/main/resources/assets/taiga/textures/blocks/ore/jauxum.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/jauxum.png
--- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png
--- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png
--- a/src/main/resources/assets/taiga/textures/items/dust/jauxum.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/jauxum.png
--- a/src/main/resources/assets/taiga/textures/items/dust/ovium.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/ovium.png
--- a/src/main/resources/assets/taiga/textures/items/dust/terrax.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/terrax.png
--- a/src/main/resources/assets/taiga/textures/items/dust/triberium.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/triberium.png
--- a/src/main/resources/assets/taiga/textures/items/ingot/jauxum.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/jauxum.png
--- a/src/main/resources/assets/taiga/textures/items/ingot/ovium.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/ovium.png
--- a/src/main/resources/assets/taiga/textures/items/ingot/terrax.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/terrax.png
--- a/src/main/resources/assets/taiga/textures/items/ingot/triberium.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/triberium.png
--- a/src/main/resources/assets/taiga/textures/items/nugget/jauxum.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/jauxum.png
--- a/src/main/resources/assets/taiga/textures/items/nugget/ovium.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/ovium.png
--- a/src/main/resources/assets/taiga/textures/items/nugget/terrax.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/terrax.png
--- a/src/main/resources/assets/taiga/textures/items/nugget/triberium.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/triberium.png
--- a/src/main/resources/assets/taiga/textures/materials/triberium.png
+++ b/src/main/resources/assets/taiga/textures/materials/triberium.png
Author	SHA1	Message	Date
Giovanni Harting	43123ea3d6	forgot to fix it for the end as well -.-	2017-01-05 05:43:01 +01:00
Giovanni Harting	6d3c6daa87	fixed ores not generating in the nether #91	2017-01-05 05:16:10 +01:00
Giovanni Harting	79c2e3a579	Break out of meteor generation if we are in a void dim 92; Added a file type to gitignore	2017-01-05 05:15:54 +01:00
Giovanni Harting	9e54f0e62a	refactored some config related parts	2017-01-05 05:15:45 +01:00
Giovanni Harting	a8c066ed1b	be sure dropped xp is positive/null, fixes #89	2017-01-05 05:15:30 +01:00
Giovanni Harting	e2d3ead5ad	fixed NPE #86	2017-01-05 05:15:10 +01:00
Robert Sosnitzka	eabc1ffe8c	Added missing json files, fixed some coloring and spelling issues	2016-12-24 13:39:55 +01:00
Robert Sosnitzka	e539e506c3	Added missing png images files	2016-12-24 13:07:15 +01:00
Robert Sosnitzka	613850e2b5	Fixed some names and wrote more clear descriptions. Fixed 2 Traits with possible NPE	2016-12-23 01:21:30 +01:00
Robert Sosnitzka	1c34ded555	Resolved a possible arithmetic exception. Divided by zero.	2016-12-22 20:39:28 +01:00
Giovanni Harting	7adec10002	fixed possible NPE	2016-12-22 15:54:45 +01:00
Robert Sosnitzka	36c425e143	Fixed a Trait where no enchantment effect has been shown after restart. Added beserk trait.	2016-12-22 14:54:05 +01:00
Robert Sosnitzka	c0a5d56278	Created Trait SuperHeavy, rebalanced material stats for lore.	2016-12-19 14:53:08 +01:00
Robert Sosnitzka	224c3bd91f	Merge pull request #78 from 3TUSK/patch-1 Update zh_CN.lang	2016-12-18 14:11:59 +01:00
Robert Sosnitzka	e167f0da5b	Balanced out block hardness. It's tinkers alloying addon, not tinkers annoying addon! Fixed some language files and fluid models.	2016-12-18 14:10:03 +01:00
Giovanni Harting	6f906428d0	fixed a potential NPE	2016-12-17 14:20:45 +01:00
Robert Sosnitzka	f6521cdddf	Reimplemented different ore-types for Grantie, Diorite, Andensite. Added material, items and other stuff for each ore. Oregen rebalanced. Fixed Generator for Oregen.	2016-12-17 13:28:08 +01:00
Urey. Xue	fdd34ae097	Update zh_CN.lang	2016-12-16 23:26:35 -05:00
Robert Sosnitzka	851eaabb16	small generator fix, not ready yet	2016-12-15 02:11:19 +01:00
Robert Sosnitzka	29576086f8	Some generator changes	2016-12-14 23:09:26 +01:00
Robert Sosnitzka	e104803854	Added missing names and two missing textures for liquids. Reworked Configuration, did not work - still need to be fixed. Changed some Temperatures, added two additional liquids for melting.	2016-12-14 02:10:56 +01:00
Giovanni Harting	1b908988be	fixed some crash with WorldSaveData	2016-12-09 18:58:09 +01:00