Added Dilithium Ore and assigned crystals. Added some Book pages as a test (need to be fixed before next release).

Removed deprecated stuff.
Removed 2016, Added 2017.

60 files changed, 370 insertions, 106 deletions

diff --git a/src/main/java/com/sosnitzka/taiga/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java
index c3863e5..0a38c3e 100644
--- a/src/main/java/com/sosnitzka/taiga/Blocks.java
+++ b/src/main/java/com/sosnitzka/taiga/Blocks.java
@@ -5,6 +5,7 @@ import com.sosnitzka.taiga.blocks.BlockCobble;
 import com.sosnitzka.taiga.blocks.BlockMeteoriteRock;
 import com.sosnitzka.taiga.blocks.BlockTiberium;
 import com.sosnitzka.taiga.generic.BasicBlock;
+import com.sosnitzka.taiga.generic.BlockOre;
 import com.sosnitzka.taiga.util.Utils;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -40,7 +41,7 @@ public class Blocks {
     public static Block abyssumOre = new BasicBlock("abyssum_ore", Material.ROCK, 15.0f, 35.0f, COBALT, PREFIX_ORE);
 
     // Ore Castsee
-    public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.ROCK, 10.0f, 15f, STONE, 1f, PREFIX_BLOCK);
+    public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.GLASS, 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);
@@ -81,6 +82,11 @@ public class Blocks {
     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());
 
+    // Community
+
+    public static Block dilithiumOre = new BlockOre("dilithium_ore", Material.GLASS, 18f, 18f, DIAMOND, 0.73f, Items.dilithiumCrystal, 3, 10);
+    public static Block dilithiumBlock = new BasicBlock("dilithium_block", Material.GLASS, 18f, 18f, DIAMOND, 0.73f, PREFIX_ORE);
+
 
     /**
      * Registers all materials' ingots and nuggets <br>
diff --git a/src/main/java/com/sosnitzka/taiga/Fluids.java b/src/main/java/com/sosnitzka/taiga/Fluids.java
index 444d8a1..2d62a77 100644
--- a/src/main/java/com/sosnitzka/taiga/Fluids.java
+++ b/src/main/java/com/sosnitzka/taiga/Fluids.java
@@ -14,7 +14,7 @@ import static com.sosnitzka.taiga.util.Utils.registerFluid;
 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 tiberiumFluid = new BasicTinkerFluid("tiberium_fluid", 0xFFd4ff00, 400, 10, 8000);
     public static BasicTinkerFluid auroriumFluid = new BasicTinkerFluid("aurorium_fluid", 0xFFefae94, 750, 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);
@@ -29,7 +29,7 @@ public class Fluids {
     public static BasicTinkerFluid osramFluid = new BasicTinkerFluid("osram_fluid", 0xFFffbc90, 800, 10, 4000);
     public static BasicTinkerFluid abyssumFluid = new BasicTinkerFluid("abyssum_fluid", 0xFF21bcc2, 700, 10, 10000);
     public static BasicTinkerFluid eezoFluid = new BasicTinkerFluid("eezo_fluid", 0xFF58798a, 450, 0, 1000);
-    public static BasicTinkerFluid triberiumFluid = new BasicTinkerFluid("triberium_fluid", 0xFFe4ff00, 550, 10, 9000);
+    public static BasicTinkerFluid triberiumFluid = new BasicTinkerFluid("triberium_fluid", 0xFF66f136, 550, 10, 9000);
     public static BasicTinkerFluid fractumFluid = new BasicTinkerFluid("fractum_fluid", 0xFFd2c583, 750, 10, 10000);
     public static BasicTinkerFluid violiumFluid = new BasicTinkerFluid("violium_fluid", 0xFFbfb0e2, 850, 10, 10000);
     public static BasicTinkerFluid proxiiFluid = new BasicTinkerFluid("proxii_fluid", 0xFFcefde1, 750, 10, 10000);
@@ -52,6 +52,10 @@ public class Fluids {
     public static BasicTinkerFluid magmaFluid = new BasicTinkerFluid("magma_fluid", 0xFFffc000, 2000, 10, 5000);
     public static BasicTinkerFluid nitroniteFluid = new BasicTinkerFluid("nitronite_fluid", 0xFFCCFF00, 3100, 10, 5000);
 
+    // Community
+
+    public static BasicTinkerFluid dilithiumFluid = new BasicTinkerFluid("dilithium_fluid", 0xEEEEEEEE, 2500, 10, 5000);
+
     /**
      * Registers all materials' fluids <br>
      * Detailed summary: <br>
@@ -89,9 +93,13 @@ public class Fluids {
         TinkerRegistry.registerMelting(Blocks.blockMeteoriteCobble, meteoriteFluid, 288);
         TinkerRegistry.registerMelting(Blocks.blockObsidiorite, meteoriteFluid, 288);
         TinkerRegistry.registerMelting(net.minecraft.init.Blocks.MAGMA, magmaFluid, 288);
+        TinkerRegistry.registerMelting(Items.dilithiumCrystal, dilithiumFluid, 72);
+        TinkerRegistry.registerMelting(Items.tiberiumCrystal, dilithiumFluid, 72);
+
 
         TinkerRegistry.registerSmelteryFuel(new FluidStack(magmaFluid, 50), 100);
         TinkerRegistry.registerSmelteryFuel(new FluidStack(nitroniteFluid, 100), 500);
+        TinkerRegistry.registerSmelteryFuel(new FluidStack(dilithiumFluid, 50), 100);
     }
 
 }
diff --git a/src/main/java/com/sosnitzka/taiga/Items.java b/src/main/java/com/sosnitzka/taiga/Items.java
index be68acc..4655d73 100644
--- a/src/main/java/com/sosnitzka/taiga/Items.java
+++ b/src/main/java/com/sosnitzka/taiga/Items.java
@@ -161,6 +161,12 @@ public class Items {
     public static Item obsidioriteDust = new BasicItem("obsidiorite_dust", PREFIX_DUST);
     public static Item obsidioriteNugget = new BasicItem("obsidiorite_nugget", PREFIX_NUGGET);
 
+    public static Item dilithiumIngot = new BasicItem("dilithium_ingot", PREFIX_INGOT);
+    public static Item dilithiumDust = new BasicItem("dilithium_dust", PREFIX_DUST);
+    public static Item dilithiumCrystal = new BasicItem("dilithium_crystal", PREFIX_CRYSTAL);
+    public static Item tiberiumCrystal = new BasicItem("tiberium_crystal", PREFIX_CRYSTAL);
+    public static Item dilithiumNugget = new BasicItem("dilithium_nugget", PREFIX_NUGGET);
+
     /**
      * Registers all materials' ingots and nuggets <br>
      * Detailed summary: <br>
diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
index bc1a72a..bb1e57a 100644
--- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
+++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java
@@ -55,6 +55,9 @@ public class MaterialTraits {
     public static final AbstractTrait dev = new TraitDevelopement();
     public static final AbstractTrait carousel = new TraitCarousel();
     public static final AbstractTrait beserk = new TraitBeserk();
+    public static final AbstractTrait leveled1 = new TraitLeveled(1);
+    public static final AbstractTrait leveled2 = new TraitLeveled(2);
+    public static final AbstractTrait leveled3 = new TraitLeveled(3);
 
 
     /**
@@ -88,7 +91,7 @@ public class MaterialTraits {
     /**
      * With Dev
      **/
-    public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(beserk); //.addTrait(dev);
+    public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(beserk).addTrait(leveled1, MaterialTypes.EXTRA).addTrait(leveled2, MaterialTypes.HANDLE).addTrait(leveled3, MaterialTypes.HEAD); //.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);
diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java
index c8c0bfb..f22bb15 100644
--- a/src/main/java/com/sosnitzka/taiga/TAIGA.java
+++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java
@@ -125,5 +125,10 @@ public class TAIGA {
         integrateOre("Karmesine", karmesineFluid);
         integrateOre("Ovium", oviumFluid);
         integrateOre("Jauxum", jauxumFluid);
+        // Community Wishlist
+        integrateOre("Dilithium", dilithiumFluid);
+
+
+
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java
index 8216e00..e5bb638 100644
--- a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java
+++ b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java
@@ -49,6 +49,7 @@ public class TAIGAConfiguration {
     public static int OVIUM_VAL;
     public static int JAUXUM_VAL;
     public static int VIBRANIUM_VAL;
+    public static int DILITHIUM_VAL;
     public static int URU_VAL;
     public static int AURORIUM_VAL;
     public static int PALLADIUM_VAL;
@@ -95,6 +96,7 @@ public class TAIGAConfiguration {
         final int TIBERIUM_DEFAULT = 15;
         final int PROMETHEUM_DEFAULT = 25;
         final int VALYRIUM_DEFAULT = 10;
+        final int DILITHIUM_DEFAULT = 12;
         final int OSRAM_DEFAULT = 1;
         final int DURANITE_DEFAULT = 1;
         final int BASALT_DEFAULT = 10;
@@ -158,6 +160,8 @@ public class TAIGAConfiguration {
         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 dilithiumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Dilithium", DILITHIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE);
+        dilithiumValueProp.setLanguageKey("gui.taiga_configuration.dilithium_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);
@@ -185,6 +189,7 @@ public class TAIGAConfiguration {
         propOrderOreGen.add(duraniteValueProp.getName());
         propOrderOreGen.add(valyriumValueProp.getName());
         propOrderOreGen.add(vibraniumValueProp.getName());
+        propOrderOreGen.add(dilithiumValueProp.getName());
         propOrderOreGen.add(karmesineValueProp.getName());
         propOrderOreGen.add(oviumValueProp.getName());
         propOrderOreGen.add(jauxumValueProp.getName());
@@ -247,6 +252,10 @@ public class TAIGAConfiguration {
             if (VIBRANIUM_VAL > RESFAC_MAX_VALUE || VIBRANIUM_VAL < RESFAC_MIN_VALUE) {
                 VIBRANIUM_VAL = VIBRANIUM_DEFAULT;
             }
+            DILITHIUM_VAL = dilithiumValueProp.getInt(DILITHIUM_DEFAULT);
+            if (DILITHIUM_VAL > RESFAC_MAX_VALUE || DILITHIUM_VAL < RESFAC_MIN_VALUE) {
+                DILITHIUM_VAL = DILITHIUM_DEFAULT;
+            }
             URU_VAL = uruValueProp.getInt(URU_DEFAULT);
             if (URU_VAL > RESFAC_MAX_VALUE || URU_VAL < RESFAC_MIN_VALUE) {
                 URU_VAL = URU_DEFAULT;
@@ -278,6 +287,7 @@ public class TAIGAConfiguration {
         oviumValueProp.set(OVIUM_VAL);
         jauxumValueProp.set(JAUXUM_VAL);
         vibraniumValueProp.set(VIBRANIUM_VAL);
+        dilithiumValueProp.set(DILITHIUM_VAL);
         uruValueProp.set(URU_VAL);
         auroriumValueProp.set(AURORIUM_VAL);
         palladiumValueProp.set(PALLADIUM_VAL);
diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java
index 069cd37..18d92a0 100644
--- a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java
+++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java
@@ -39,7 +39,7 @@ public class BlockTiberium extends BasicBlock {
 
     @Override
     public Item getItemDropped(IBlockState state, Random rand, int fortune) {
-        return Items.tiberiumDust;
+        return Items.tiberiumCrystal;
     }
 
     @Override
diff --git a/src/main/java/com/sosnitzka/taiga/generic/BlockOre.java b/src/main/java/com/sosnitzka/taiga/generic/BlockOre.java
new file mode 100644
index 0000000..55737c3
--- /dev/null
+++ b/src/main/java/com/sosnitzka/taiga/generic/BlockOre.java
@@ -0,0 +1,62 @@
+package com.sosnitzka.taiga.generic;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.item.Item;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.Explosion;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+import java.util.Random;
+
+import static slimeknights.tconstruct.TConstruct.random;
+
+public class BlockOre extends Block {
+
+    private Item dropItem;
+    private int itemAmount;
+    private int xpAmount;
+
+    public BlockOre(String name, Material material, float hardness, float resistance, int harvest, float lightLevel, Item item, int amount, int xp) {
+        super(material);
+        setUnlocalizedName(name);
+        setRegistryName(name);
+        setHardness(hardness);
+        setResistance(resistance);
+        setHarvestLevel("pickaxe", harvest);
+        setLightLevel(lightLevel);
+        this.dropItem = item;
+        this.itemAmount = amount;
+        this.xpAmount = xp;
+
+    }
+
+    @Override
+    public int getExpDrop(IBlockState state, IBlockAccess world, BlockPos pos, int fortune) {
+        return random.nextInt(xpAmount) + fortune;
+
+    }
+
+    @Override
+    @ParametersAreNonnullByDefault
+    public int quantityDropped(IBlockState state, int fortune, Random random) {
+        return (random.nextInt(itemAmount + fortune) + 1);
+    }
+
+    @Override
+    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
+        return dropItem;
+    }
+
+    @Override
+    public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn) {
+        if (!worldIn.isRemote) {
+            if (random.nextFloat() < 0.5) {
+                worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), random.nextFloat() * 4f + 1.5f, true, true);
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
index 75ff267..b2d03be 100644
--- a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
+++ b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
@@ -37,6 +37,7 @@ public class ClientProxy extends CommonProxy {
 
     private static void registerItemModel(Item item) {
         Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory"));
+
     }
 
     @Override
diff --git a/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java b/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java
index 70eb7cb..21b12df 100644
--- a/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java
+++ b/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java
@@ -7,7 +7,5 @@ import net.minecraftforge.oredict.OreDictionary;
 public class SmeltingRegistry {
     public static void register() {
         ItemStack nugget_iron = OreDictionary.getOres("nuggetIron").get(OreDictionary.getOres("nuggetIron").size() - 1);
-        //GameRegistry.addSmelting(tiberiumOre, new ItemStack(tiberiumShardInstable, 6), (1F));
-        //GameRegistry.addSmelting(tiberiumShardInstable, new ItemStack(tiberiumIngot), (.1F));
     }
 }
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java
new file mode 100644
index 0000000..bc2107d
--- /dev/null
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java
@@ -0,0 +1,16 @@
+package com.sosnitzka.taiga.traits;
+
+import net.minecraftforge.common.MinecraftForge;
+import slimeknights.tconstruct.library.traits.AbstractTraitLeveled;
+
+
+public class TraitDeflection extends AbstractTraitLeveled {
+
+
+    public TraitDeflection(int levels) {
+        super(TraitDeflection.class.getSimpleName().toLowerCase().substring(5), 0xFFFF5500, 3, levels);
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+
+}
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java b/src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java
new file mode 100644
index 0000000..da40dea
--- /dev/null
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java
@@ -0,0 +1,16 @@
+package com.sosnitzka.taiga.traits;
+
+import net.minecraftforge.common.MinecraftForge;
+import slimeknights.tconstruct.library.traits.AbstractTraitLeveled;
+
+
+public class TraitLeveled extends AbstractTraitLeveled {
+
+
+    public TraitLeveled(int levels) {
+        super(TraitLeveled.class.getSimpleName().toLowerCase().substring(5), 0xFFFF5500, 3, levels);
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+
+}
diff --git a/src/main/java/com/sosnitzka/taiga/util/Utils.java b/src/main/java/com/sosnitzka/taiga/util/Utils.java
index 6a508c6..b4e8bf5 100644
--- a/src/main/java/com/sosnitzka/taiga/util/Utils.java
+++ b/src/main/java/com/sosnitzka/taiga/util/Utils.java
@@ -28,6 +28,7 @@ public class Utils {
     public static String PREFIX_ORE = "ore";
     public static String PREFIX_BLOCK = "block";
     public static String PREFIX_DUST = "dust";
+    public static String PREFIX_CRYSTAL = "crystal";
 
     /**
      * Registers the block and its corresponding item (block as item in inventory)
diff --git a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java
index bd5c614..4a10999 100644
--- a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java
+++ b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java
@@ -9,7 +9,6 @@ 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;
 
@@ -34,7 +33,8 @@ public class WorldGen implements IWorldGenerator {
         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, VIBRANIUM_VAL, 100, 0, 64, 2, 6, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT));
+        Generator.generateOre(dilithiumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, DILITHIUM_VAL, 100, 0, 64, 2, 8, newArrayList(Biomes.DESERT, Biomes.DESERT_HILLS, Biomes.MUTATED_DESERT, Biomes.OCEAN, Biomes.DEEP_OCEAN, Biomes.FROZEN_OCEAN, Biomes.BEACH));
         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);
diff --git a/src/main/resources/assets/taiga/blockstates/dilithium_block.json b/src/main/resources/assets/taiga/blockstates/dilithium_block.json
new file mode 100644
index 0000000..9dddf6d
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/dilithium_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/dilithium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/dilithium_ore.json b/src/main/resources/assets/taiga/blockstates/dilithium_ore.json
new file mode 100644
index 0000000..c1ed6f6
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/dilithium_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/dilithium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json
index 475cd6f..a367a7d 100644
--- a/src/main/resources/assets/taiga/blockstates/fluid_block.json
+++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json
@@ -18,6 +18,13 @@
         }
       }
     ],
+    "dilithium_fluid": [
+      {
+        "custom": {
+          "fluid": "dilithium_fluid"
+        }
+      }
+    ],
     "nitronite_fluid": [
       {
         "custom": {
diff --git a/src/main/resources/assets/taiga/book/en_US/intro/welcome.json b/src/main/resources/assets/taiga/book/en_US/intro/welcome.json
deleted file mode 100644
index 31907d1..0000000
--- a/src/main/resources/assets/taiga/book/en_US/intro/welcome.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "title": "TEST Title",
-  "text": [
-    {
-      "text": "Test text."
-    }
-  ]
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/book/en_US/ores/firstwords.json b/src/main/resources/assets/taiga/book/en_US/ores/firstwords.json
new file mode 100644
index 0000000..cfac3fe
--- /dev/null
+++ b/src/main/resources/assets/taiga/book/en_US/ores/firstwords.json
@@ -0,0 +1,20 @@
+{
+  "title": "New ores",
+  "image": {
+    "file": "taiga:textures/logo_s.png"
+  },
+  "text": [
+    {
+      "text": "TAIGA adds various new blocks and ores. You need to combine them in different alloys to get higher tiers,1 some better stats and special traits."
+    },
+    {
+      "text": "\n"
+    },
+    {
+      "text": "\n"
+    },
+    {
+      "text": "The ores have to be found at special places. On the next pages, you will be teached where to find the ores and how they have to be handeled."
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/book/en_US/ores/intro.json b/src/main/resources/assets/taiga/book/en_US/ores/intro.json
new file mode 100644
index 0000000..2d5801b
--- /dev/null
+++ b/src/main/resources/assets/taiga/book/en_US/ores/intro.json
@@ -0,0 +1,11 @@
+{
+  "title": "TAIGA: Tinkers' Alloying Addon",
+  "image": {
+    "file": "taiga:textures/logo.png"
+  },
+  "text": [
+    {
+      "text": "Thank you for downloading TAIGA. TAIGA is an addon for Tinker's Construct with a lot of end game materials. On the next pages you will see and learn how to find the new added Ores and what other features you can find in TAIGA."
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/book/en_US/ores/multiblock.json b/src/main/resources/assets/taiga/book/en_US/ores/multiblock.json
new file mode 100644
index 0000000..53a0cf4
--- /dev/null
+++ b/src/main/resources/assets/taiga/book/en_US/ores/multiblock.json
@@ -0,0 +1,3 @@
+{
+  "data": "structure/tank.json"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/book/en_US/ores/structure.json b/src/main/resources/assets/taiga/book/en_US/ores/structure.json
new file mode 100644
index 0000000..1999813
--- /dev/null
+++ b/src/main/resources/assets/taiga/book/en_US/ores/structure.json
@@ -0,0 +1,12 @@
+{
+  "title": "",
+  "text": [
+    {
+      "text": "The Tinker Tank can be any size from 3x3 to 11x11, and with any height from a minimum of 3. Larger structues increase the size of the tank. In order to be a valid structure, it requires a floor and ceiling, along with a frame around the whole structure"
+    },
+    {
+      "text": "The Tinker Tank can be built using any combination of seared blocks, glass, and drains. The floor and ceiling frame must be either seared blocks or drains. A single Tinker Tank controller is required. It can be placed on any layer except the ceiling, and must not be placed on the outside edges of the frame. The ceiling additionally supports slabs and stairs, even in the frame, provided they are downwards facing.",
+      "paragraph": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/book/index.json b/src/main/resources/assets/taiga/book/index.json
index 2990b81..59f0abd 100644
--- a/src/main/resources/assets/taiga/book/index.json
+++ b/src/main/resources/assets/taiga/book/index.json
@@ -3,7 +3,9 @@
     "name": "index_title",
     "data": "sections/intro.json",
     "icon": {
-      "file": "taiga:textures/gui/book/logo.png"
+      "item": {
+        "id": "taiga:ignitz_block"
+      }
     }
   }
 ]
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/book/sections/intro.json b/src/main/resources/assets/taiga/book/sections/intro.json
index 276837e..5d3586e 100644
--- a/src/main/resources/assets/taiga/book/sections/intro.json
+++ b/src/main/resources/assets/taiga/book/sections/intro.json
@@ -1,7 +1,15 @@
 [
   {
-    "name": "welcome",
-    "type": "text",
-    "data": "intro/welcome.json"
+    "name": "intro",
+    "type": "image with text below",
+    "data": "ores/intro.json"
+  },
+  {
+    "name": "firstwords",
+    "type": "text with right image etch",
+    "data": "ores/firstwords.json"
+  },
+  {
+    "type": "blank"
   }
 ]
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang
index 42636a2..7b322ba 100644
--- a/src/main/resources/assets/taiga/lang/en_US.lang
+++ b/src/main/resources/assets/taiga/lang/en_US.lang
@@ -1,4 +1,5 @@
 material.basalt.name=Basalt
+material.dilithium.name=Dilithium
 material.tiberium.name=Tiberium
 material.aurorium.name=Aurorium
 material.prometheum.name=Prometheum
@@ -38,6 +39,7 @@ material.magma.name=Magma
 material.nitronite.name=Nitronit
 
 tile.basalt_block.name=Basalt Block
+tile.dilithium_block.name=Dilithium Block
 tile.tiberium_block.name=Tiberium Block
 tile.aurorium_block.name=Aurorium Block
 tile.prometheum_block.name=Prometheum Block
@@ -79,8 +81,10 @@ 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.dilithium_ore.name=Dilithium Ore
 tile.aurorium_ore.name=Aurorium Ore
 tile.prometheum_ore.name=Prometheum Ore
 tile.duranite_ore.name=Duranite Ore
@@ -118,8 +122,12 @@ tile.obsidiorite_ore.name=Obsidiorite Ore
 tile.magma_ore.name=Magma Ore
 tile.nitronite_ore.name=Nitronite Ore
 
+item.dilithium_crystal.name=Dilithium Crystal
+item.tiberium_crystal.name=Tiberium Crystal
+
 
 item.basalt_nugget.name=Basalt Nugget
+item.dilithium_nugget.name=Dilithium Nugget
 item.tiberium_nugget.name=Tiberium Nugget
 item.aurorium_nugget.name=Aurorium Nugget
 item.prometheum_nugget.name=Prometheum Nugget
@@ -162,6 +170,7 @@ item.iron_nugget.name=Iron Nugget
 
 item.basalt_dust.name=Basalt Dust
 item.tiberium_dust.name=Tiberium Dust
+item.dilithium_dust.name=Dilithium Dust
 item.aurorium_dust.name=Aurorium Dust
 item.prometheum_dust.name=Prometheum Dust
 item.duranite_dust.name=Duranite Dust
@@ -201,6 +210,7 @@ item.nitronite_dust.name=Nitronite Dust
 
 item.basalt_ingot.name=Basalt Ingot
 item.tiberium_ingot.name=Tiberium Ingot
+item.dilithium_ingot.name=Dilithium Ingot
 item.aurorium_ingot.name=Aurorium Ingot
 item.prometheum_ingot.name=Prometheum Ingot
 item.duranite_ingot.name=Duranite Ingot
@@ -240,6 +250,7 @@ item.nitronite_ingot.name=Nitronite Ingot
 
 fluid.tconstruct.basalt_fluid.name=Basalt Fluid
 fluid.tconstruct.tiberium_fluid.name=Tiberium Fluid
+fluid.tconstruct.dilithium_fluid.name=Dilithium Fluid
 fluid.tconstruct.aurorium_fluid.name=Aurorium Fluid
 fluid.tconstruct.prometheum_fluid.name=Prometheum Fluid
 fluid.tconstruct.duranite_fluid.name=Duranite Fluid
diff --git a/src/main/resources/assets/taiga/models/item/dilithium_crystal.json b/src/main/resources/assets/taiga/models/item/dilithium_crystal.json
new file mode 100644
index 0000000..6d2de2e
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/dilithium_crystal.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/crystal/dilithium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/dilithium_dust.json b/src/main/resources/assets/taiga/models/item/dilithium_dust.json
new file mode 100644
index 0000000..8de43b5
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/dilithium_dust.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/dust/dilithium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/dilithium_ingot.json b/src/main/resources/assets/taiga/models/item/dilithium_ingot.json
new file mode 100644
index 0000000..82a6f9b
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/dilithium_ingot.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/ingot/dilithium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/dilithium_nugget.json b/src/main/resources/assets/taiga/models/item/dilithium_nugget.json
new file mode 100644
index 0000000..07b9644
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/dilithium_nugget.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/nugget/dilithium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/models/item/tiberium_crystal.json b/src/main/resources/assets/taiga/models/item/tiberium_crystal.json
new file mode 100644
index 0000000..597e831
--- /dev/null
+++ b/src/main/resources/assets/taiga/models/item/tiberium_crystal.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "taiga:items/crystal/tiberium"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/textures/blocks/block/dilithium.png b/src/main/resources/assets/taiga/textures/blocks/block/dilithium.png
new file mode 100644
index 0000000..bfbcb54
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/block/dilithium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/block/duranite.png b/src/main/resources/assets/taiga/textures/blocks/block/duranite.png
index 33ebb6f..e17478f 100644
--- a/src/main/resources/assets/taiga/textures/blocks/block/duranite.png
+++ b/src/main/resources/assets/taiga/textures/blocks/block/duranite.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png b/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png
index 317e11b..c2dfcfa 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/dilithium.png b/src/main/resources/assets/taiga/textures/blocks/ore/dilithium.png
new file mode 100644
index 0000000..9aad72b
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/dilithium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/jauxum.png b/src/main/resources/assets/taiga/textures/blocks/ore/jauxum.png
index 7792421..eb1f115 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ore/jauxum.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/jauxum.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png
index 811c9f0..3e9c071 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/ovium.png b/src/main/resources/assets/taiga/textures/blocks/ore/ovium.png
index 7f32a67..8e9cfcc 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ore/ovium.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/ovium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png b/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png
index b389832..fd7d3f9 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png b/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png
index 7e18f41..f4ed596 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png b/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png
index 54fde77..547617e 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/uru.png b/src/main/resources/assets/taiga/textures/blocks/ore/uru.png
index bc108a4..a815588 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ore/uru.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/uru.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png b/src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png
index a2ef123..2812a78 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/valyrium.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png b/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png
index 7f57ab8..7c118ce 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png
diff --git a/src/main/resources/assets/taiga/textures/items/crystal/dilithium.png b/src/main/resources/assets/taiga/textures/items/crystal/dilithium.png
new file mode 100644
index 0000000..100783b
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/crystal/dilithium.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/dilithium.png b/src/main/resources/assets/taiga/textures/items/dust/dilithium.png
new file mode 100644
index 0000000..a691ad2
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/dust/dilithium.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/tiberium.png b/src/main/resources/assets/taiga/textures/items/dust/tiberium.png
index e5ba3d8..70b0d8c 100644
--- a/src/main/resources/assets/taiga/textures/items/dust/tiberium.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/tiberium.png
diff --git a/src/main/resources/assets/taiga/textures/items/dust/triberium.png b/src/main/resources/assets/taiga/textures/items/dust/triberium.png
index 70b0d8c..e5ba3d8 100644
--- a/src/main/resources/assets/taiga/textures/items/dust/triberium.png
+++ b/src/main/resources/assets/taiga/textures/items/dust/triberium.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/adamant.png b/src/main/resources/assets/taiga/textures/items/ingot/adamant.png
index fdca4b4..17172ba 100644
--- a/src/main/resources/assets/taiga/textures/items/ingot/adamant.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/adamant.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/astrium.png b/src/main/resources/assets/taiga/textures/items/ingot/astrium.png
index 0117982..8d39829 100644
--- a/src/main/resources/assets/taiga/textures/items/ingot/astrium.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/astrium.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/aurorium.png b/src/main/resources/assets/taiga/textures/items/ingot/aurorium.png
index b9711f5..5ca4a48 100644
--- a/src/main/resources/assets/taiga/textures/items/ingot/aurorium.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/aurorium.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/basalt.png b/src/main/resources/assets/taiga/textures/items/ingot/basalt.png
index 29f6648..4e8eb4a 100644
--- a/src/main/resources/assets/taiga/textures/items/ingot/basalt.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/basalt.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/dilithium.png b/src/main/resources/assets/taiga/textures/items/ingot/dilithium.png
new file mode 100644
index 0000000..9e78d39
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/ingot/dilithium.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/tiberium.png b/src/main/resources/assets/taiga/textures/items/ingot/tiberium.png
index fb6395d..1577e4a 100644
--- a/src/main/resources/assets/taiga/textures/items/ingot/tiberium.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/tiberium.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/triberium.png b/src/main/resources/assets/taiga/textures/items/ingot/triberium.png
index 1577e4a..fb6395d 100644
--- a/src/main/resources/assets/taiga/textures/items/ingot/triberium.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/triberium.png
diff --git a/src/main/resources/assets/taiga/textures/items/ingot/valyrium.png b/src/main/resources/assets/taiga/textures/items/ingot/valyrium.png
index ad2bc73..0adcd37 100644
--- a/src/main/resources/assets/taiga/textures/items/ingot/valyrium.png
+++ b/src/main/resources/assets/taiga/textures/items/ingot/valyrium.png
diff --git a/src/main/resources/assets/taiga/textures/items/nugget/dilithium.png b/src/main/resources/assets/taiga/textures/items/nugget/dilithium.png
new file mode 100644
index 0000000..4b3d345
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/items/nugget/dilithium.png
diff --git a/src/main/resources/assets/taiga/textures/items/nugget/tiberium.png b/src/main/resources/assets/taiga/textures/items/nugget/tiberium.png
index 8f64822..7b524ba 100644
--- a/src/main/resources/assets/taiga/textures/items/nugget/tiberium.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/tiberium.png
diff --git a/src/main/resources/assets/taiga/textures/items/nugget/triberium.png b/src/main/resources/assets/taiga/textures/items/nugget/triberium.png
index 7b524ba..8f64822 100644
--- a/src/main/resources/assets/taiga/textures/items/nugget/triberium.png
+++ b/src/main/resources/assets/taiga/textures/items/nugget/triberium.png
diff --git a/src/main/resources/assets/taiga/textures/logo.png b/src/main/resources/assets/taiga/textures/logo.png
new file mode 100644
index 0000000..ef1862b
--- /dev/null
+++ b/src/main/resources/assets/taiga/textures/logo.png
diff --git a/taiga.svg b/taiga.svg
index 03637d6..e21272f 100644
--- a/taiga.svg
+++ b/taiga.svg
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">

-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"

-	 viewBox="0 0 800 300" enable-background="new 0 0 800 300" xml:space="preserve">

-<rect x="-78.7" y="-11.5" fill="#133C33" stroke="#000000" stroke-miterlimit="10" width="913.9" height="329.6"/>

-<g>

-	<polygon fill="#0B241F" points="178.5,205.3 220.6,196.6 213.1,179.7 169.9,174.2 208.1,168.4 200.2,150.8 173.4,147 196.6,142.5 

-		190.1,127.9 169.9,125 187,120.9 179.9,105 169.7,101.6 176.9,98.2 165.8,73.3 155.9,95.8 148.6,112.4 161.2,115.2 145.1,120.1 

-		139.4,132.8 162.3,136.1 135.5,141.6 129.6,155 162.5,160.2 125,165.4 119.6,177.4 162.7,187.8 116,185.5 109.1,201 154.8,208 

-		156.4,212.1 148.7,232 182.9,232 175.2,212.1 	"/>

-	<g>

-		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="264.4947" y1="232.5931" x2="264.4947" y2="72.9881">

-			<stop  offset="0" style="stop-color:#133C33"/>

-			<stop  offset="1" style="stop-color:#000000"/>

-		</linearGradient>

-		<path fill="url(#SVGID_1_)" d="M262.4,77.2h-36.5v-2V73h76.9v2.2v2.2l0.2-0.2H267v155.4h-2.4h-2.2V77.2z"/>

-		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="360.8934" y1="232.5931" x2="360.8934" y2="72.7684">

-			<stop  offset="0" style="stop-color:#133C33"/>

-			<stop  offset="1" style="stop-color:#000000"/>

-		</linearGradient>

-		<path fill="url(#SVGID_2_)" d="M395,232.6h-4.8l-9.9-48.1H342l-10.3,48.1h-4.8l32.3-159.8h3.7L395,232.6z M378.9,179.8l-17.8-95

-			l-18.5,95H378.9z M360.2,72.8h0.2h0.4h0.2h0.2h0.4H360.2z"/>

-		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="434.4281" y1="232.5931" x2="434.4281" y2="72.7684">

-			<stop  offset="0" style="stop-color:#133C33"/>

-			<stop  offset="1" style="stop-color:#000000"/>

-		</linearGradient>

-		<path fill="url(#SVGID_3_)" d="M432.1,232.6V72.8h2.3h2.3v159.8h-2.3H432.1z"/>

-		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="514.0542" y1="234.7913" x2="514.0542" y2="70.5701">

-			<stop  offset="0" style="stop-color:#133C33"/>

-			<stop  offset="1" style="stop-color:#000000"/>

-		</linearGradient>

-		<path fill="url(#SVGID_4_)" d="M517.6,162.7v-4.6l28.8,0.2V198c0,0.4,0,1.6-0.1,3.5c-0.1,1.9-0.4,4.2-0.9,6.8

-			c-0.5,2.6-1.4,5.5-2.7,8.6c-1.3,3.1-3.2,6-5.5,8.6c-5.7,6.2-13.6,9.3-23.5,9.3c-10.1,0-17.8-3-23.1-9c-2.6-2.8-4.6-5.8-5.8-9

-			c-1.2-3.2-2.1-6.3-2.5-9.1c-0.4-2.9-0.6-5.3-0.5-7.4c0.1-2.1,0.1-3.3,0.1-3.7v-90.4c0-11.7,3.5-20.9,10.6-27.5

-			c2.8-2.5,6-4.5,9.8-5.9c3.7-1.5,7.6-2.2,11.5-2.2c3.7,0,7.4,0.7,11.1,2.1c3.7,1.4,7.1,3.7,10.2,6.8c3.1,3.1,5.6,7.1,7.5,11.9

-			c1.9,4.8,2.9,10.4,2.9,17h-4.6c0-5.7-0.8-10.7-2.4-14.8c-1.6-4.2-3.7-7.6-6.3-10.3c-2.6-2.7-5.5-4.7-8.7-6c-3.2-1.3-6.5-2-9.7-2

-			c-3.4,0-6.7,0.6-10,1.8c-3.3,1.2-6.2,3-8.8,5.6c-2.6,2.6-4.6,5.8-6.2,9.7c-1.5,3.9-2.3,8.5-2.3,13.8v90.7v0.2

-			c0,3.7,0.2,6.8,0.5,9.4c0.4,2.6,1.1,5.3,2.2,8.3c1.1,2.9,2.7,5.6,4.9,7.9c4.7,5.1,11.2,7.7,19.6,7.7c8.6,0,15.4-2.6,20.2-7.7

-			c2.2-2.3,3.8-4.9,4.9-7.7c1.1-2.8,1.9-5.4,2.3-7.8c0.4-2.4,0.7-5.3,0.7-8.7v-0.2l-0.2-35.2L517.6,162.7z"/>

-		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="613.264" y1="232.5931" x2="613.264" y2="72.7684">

-			<stop  offset="0" style="stop-color:#133C33"/>

-			<stop  offset="1" style="stop-color:#000000"/>

-		</linearGradient>

-		<path fill="url(#SVGID_5_)" d="M647.3,232.6h-4.8l-9.9-48.1h-38.3L584,232.6h-4.8l32.3-159.8h3.7L647.3,232.6z M631.3,179.8

-			l-17.8-95l-18.5,95H631.3z M612.6,72.8h0.2h0.4h0.2h0.2h0.4H612.6z"/>

-	</g>

-	<g>

-		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="260.7135" y1="232.5931" x2="260.7135" y2="72.9881">

-			<stop  offset="0" style="stop-color:#133C33"/>

-			<stop  offset="1" style="stop-color:#FFFFFF"/>

-		</linearGradient>

-		<path fill="url(#SVGID_6_)" d="M258.6,77.2h-36.5v-2V73h76.9v2.2v2.2l0.2-0.2h-36.1v155.4h-2.4h-2.2V77.2z"/>

-		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="357.1122" y1="232.5931" x2="357.1122" y2="72.7684">

-			<stop  offset="0" style="stop-color:#133C33"/>

-			<stop  offset="1" style="stop-color:#FFFFFF"/>

-		</linearGradient>

-		<path fill="url(#SVGID_7_)" d="M391.2,232.6h-4.8l-9.9-48.1h-38.3l-10.3,48.1H323l32.3-159.8h3.7L391.2,232.6z M375.1,179.8

-			l-17.8-95l-18.5,95H375.1z M356.5,72.8h0.2h0.4h0.2h0.2h0.4H356.5z"/>

-		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="430.6468" y1="232.5931" x2="430.6468" y2="72.7684">

-			<stop  offset="0" style="stop-color:#133C33"/>

-			<stop  offset="1" style="stop-color:#FFFFFF"/>

-		</linearGradient>

-		<path fill="url(#SVGID_8_)" d="M428.3,232.6V72.8h2.3h2.3v159.8h-2.3H428.3z"/>

-		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="510.2729" y1="234.7913" x2="510.2729" y2="70.5701">

-			<stop  offset="0" style="stop-color:#133C33"/>

-			<stop  offset="1" style="stop-color:#FFFFFF"/>

-		</linearGradient>

-		<path fill="url(#SVGID_9_)" d="M513.9,162.7v-4.6l28.8,0.2V198c0,0.4,0,1.6-0.1,3.5c-0.1,1.9-0.4,4.2-0.9,6.8

-			c-0.5,2.6-1.4,5.5-2.7,8.6c-1.3,3.1-3.2,6-5.5,8.6c-5.7,6.2-13.6,9.3-23.5,9.3c-10.1,0-17.8-3-23.1-9c-2.6-2.8-4.6-5.8-5.8-9

-			c-1.2-3.2-2.1-6.3-2.5-9.1c-0.4-2.9-0.6-5.3-0.5-7.4c0.1-2.1,0.1-3.3,0.1-3.7v-90.4c0-11.7,3.5-20.9,10.6-27.5

-			c2.8-2.5,6-4.5,9.8-5.9c3.7-1.5,7.6-2.2,11.5-2.2c3.7,0,7.4,0.7,11.1,2.1c3.7,1.4,7.1,3.7,10.2,6.8c3.1,3.1,5.6,7.1,7.5,11.9

-			c1.9,4.8,2.9,10.4,2.9,17h-4.6c0-5.7-0.8-10.7-2.4-14.8c-1.6-4.2-3.7-7.6-6.3-10.3c-2.6-2.7-5.5-4.7-8.7-6c-3.2-1.3-6.5-2-9.7-2

-			c-3.4,0-6.7,0.6-10,1.8c-3.3,1.2-6.2,3-8.8,5.6c-2.6,2.6-4.6,5.8-6.2,9.7c-1.5,3.9-2.3,8.5-2.3,13.8v90.7v0.2

-			c0,3.7,0.2,6.8,0.5,9.4c0.4,2.6,1.1,5.3,2.2,8.3c1.1,2.9,2.7,5.6,4.9,7.9c4.7,5.1,11.2,7.7,19.6,7.7c8.6,0,15.4-2.6,20.2-7.7

-			c2.2-2.3,3.8-4.9,4.9-7.7c1.1-2.8,1.9-5.4,2.3-7.8c0.4-2.4,0.7-5.3,0.7-8.7v-0.2l-0.2-35.2L513.9,162.7z"/>

-		<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="609.4827" y1="232.5931" x2="609.4827" y2="72.7684">

-			<stop  offset="0" style="stop-color:#133C33"/>

-			<stop  offset="1" style="stop-color:#FFFFFF"/>

-		</linearGradient>

-		<path fill="url(#SVGID_10_)" d="M643.6,232.6h-4.8l-9.9-48.1h-38.3l-10.3,48.1h-4.8l32.3-159.8h3.7L643.6,232.6z M627.5,179.8

-			l-17.8-95l-18.5,95H627.5z M608.8,72.8h0.2h0.4h0.2h0.2h0.4H608.8z"/>

-	</g>

-</g>

-</svg>

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 800 300" enable-background="new 0 0 800 300" xml:space="preserve">
+<rect x="-78.7" y="-11.5" fill="#133C33" stroke="#000000" stroke-miterlimit="10" width="913.9" height="329.6"/>
+<g>
+	<polygon fill="#0B241F" points="178.5,205.3 220.6,196.6 213.1,179.7 169.9,174.2 208.1,168.4 200.2,150.8 173.4,147 196.6,142.5 
+		190.1,127.9 169.9,125 187,120.9 179.9,105 169.7,101.6 176.9,98.2 165.8,73.3 155.9,95.8 148.6,112.4 161.2,115.2 145.1,120.1 
+		139.4,132.8 162.3,136.1 135.5,141.6 129.6,155 162.5,160.2 125,165.4 119.6,177.4 162.7,187.8 116,185.5 109.1,201 154.8,208 
+		156.4,212.1 148.7,232 182.9,232 175.2,212.1 	"/>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="264.4947" y1="232.5931" x2="264.4947" y2="72.9881">
+			<stop  offset="0" style="stop-color:#133C33"/>
+			<stop  offset="1" style="stop-color:#000000"/>
+		</linearGradient>
+		<path fill="url(#SVGID_1_)" d="M262.4,77.2h-36.5v-2V73h76.9v2.2v2.2l0.2-0.2H267v155.4h-2.4h-2.2V77.2z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="360.8934" y1="232.5931" x2="360.8934" y2="72.7684">
+			<stop  offset="0" style="stop-color:#133C33"/>
+			<stop  offset="1" style="stop-color:#000000"/>
+		</linearGradient>
+		<path fill="url(#SVGID_2_)" d="M395,232.6h-4.8l-9.9-48.1H342l-10.3,48.1h-4.8l32.3-159.8h3.7L395,232.6z M378.9,179.8l-17.8-95
+			l-18.5,95H378.9z M360.2,72.8h0.2h0.4h0.2h0.2h0.4H360.2z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="434.4281" y1="232.5931" x2="434.4281" y2="72.7684">
+			<stop  offset="0" style="stop-color:#133C33"/>
+			<stop  offset="1" style="stop-color:#000000"/>
+		</linearGradient>
+		<path fill="url(#SVGID_3_)" d="M432.1,232.6V72.8h2.3h2.3v159.8h-2.3H432.1z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="514.0542" y1="234.7913" x2="514.0542" y2="70.5701">
+			<stop  offset="0" style="stop-color:#133C33"/>
+			<stop  offset="1" style="stop-color:#000000"/>
+		</linearGradient>
+		<path fill="url(#SVGID_4_)" d="M517.6,162.7v-4.6l28.8,0.2V198c0,0.4,0,1.6-0.1,3.5c-0.1,1.9-0.4,4.2-0.9,6.8
+			c-0.5,2.6-1.4,5.5-2.7,8.6c-1.3,3.1-3.2,6-5.5,8.6c-5.7,6.2-13.6,9.3-23.5,9.3c-10.1,0-17.8-3-23.1-9c-2.6-2.8-4.6-5.8-5.8-9
+			c-1.2-3.2-2.1-6.3-2.5-9.1c-0.4-2.9-0.6-5.3-0.5-7.4c0.1-2.1,0.1-3.3,0.1-3.7v-90.4c0-11.7,3.5-20.9,10.6-27.5
+			c2.8-2.5,6-4.5,9.8-5.9c3.7-1.5,7.6-2.2,11.5-2.2c3.7,0,7.4,0.7,11.1,2.1c3.7,1.4,7.1,3.7,10.2,6.8c3.1,3.1,5.6,7.1,7.5,11.9
+			c1.9,4.8,2.9,10.4,2.9,17h-4.6c0-5.7-0.8-10.7-2.4-14.8c-1.6-4.2-3.7-7.6-6.3-10.3c-2.6-2.7-5.5-4.7-8.7-6c-3.2-1.3-6.5-2-9.7-2
+			c-3.4,0-6.7,0.6-10,1.8c-3.3,1.2-6.2,3-8.8,5.6c-2.6,2.6-4.6,5.8-6.2,9.7c-1.5,3.9-2.3,8.5-2.3,13.8v90.7v0.2
+			c0,3.7,0.2,6.8,0.5,9.4c0.4,2.6,1.1,5.3,2.2,8.3c1.1,2.9,2.7,5.6,4.9,7.9c4.7,5.1,11.2,7.7,19.6,7.7c8.6,0,15.4-2.6,20.2-7.7
+			c2.2-2.3,3.8-4.9,4.9-7.7c1.1-2.8,1.9-5.4,2.3-7.8c0.4-2.4,0.7-5.3,0.7-8.7v-0.2l-0.2-35.2L517.6,162.7z"/>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="613.264" y1="232.5931" x2="613.264" y2="72.7684">
+			<stop  offset="0" style="stop-color:#133C33"/>
+			<stop  offset="1" style="stop-color:#000000"/>
+		</linearGradient>
+		<path fill="url(#SVGID_5_)" d="M647.3,232.6h-4.8l-9.9-48.1h-38.3L584,232.6h-4.8l32.3-159.8h3.7L647.3,232.6z M631.3,179.8
+			l-17.8-95l-18.5,95H631.3z M612.6,72.8h0.2h0.4h0.2h0.2h0.4H612.6z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="260.7135" y1="232.5931" x2="260.7135" y2="72.9881">
+			<stop  offset="0" style="stop-color:#133C33"/>
+			<stop  offset="1" style="stop-color:#FFFFFF"/>
+		</linearGradient>
+		<path fill="url(#SVGID_6_)" d="M258.6,77.2h-36.5v-2V73h76.9v2.2v2.2l0.2-0.2h-36.1v155.4h-2.4h-2.2V77.2z"/>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="357.1122" y1="232.5931" x2="357.1122" y2="72.7684">
+			<stop  offset="0" style="stop-color:#133C33"/>
+			<stop  offset="1" style="stop-color:#FFFFFF"/>
+		</linearGradient>
+		<path fill="url(#SVGID_7_)" d="M391.2,232.6h-4.8l-9.9-48.1h-38.3l-10.3,48.1H323l32.3-159.8h3.7L391.2,232.6z M375.1,179.8
+			l-17.8-95l-18.5,95H375.1z M356.5,72.8h0.2h0.4h0.2h0.2h0.4H356.5z"/>
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="430.6468" y1="232.5931" x2="430.6468" y2="72.7684">
+			<stop  offset="0" style="stop-color:#133C33"/>
+			<stop  offset="1" style="stop-color:#FFFFFF"/>
+		</linearGradient>
+		<path fill="url(#SVGID_8_)" d="M428.3,232.6V72.8h2.3h2.3v159.8h-2.3H428.3z"/>
+		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="510.2729" y1="234.7913" x2="510.2729" y2="70.5701">
+			<stop  offset="0" style="stop-color:#133C33"/>
+			<stop  offset="1" style="stop-color:#FFFFFF"/>
+		</linearGradient>
+		<path fill="url(#SVGID_9_)" d="M513.9,162.7v-4.6l28.8,0.2V198c0,0.4,0,1.6-0.1,3.5c-0.1,1.9-0.4,4.2-0.9,6.8
+			c-0.5,2.6-1.4,5.5-2.7,8.6c-1.3,3.1-3.2,6-5.5,8.6c-5.7,6.2-13.6,9.3-23.5,9.3c-10.1,0-17.8-3-23.1-9c-2.6-2.8-4.6-5.8-5.8-9
+			c-1.2-3.2-2.1-6.3-2.5-9.1c-0.4-2.9-0.6-5.3-0.5-7.4c0.1-2.1,0.1-3.3,0.1-3.7v-90.4c0-11.7,3.5-20.9,10.6-27.5
+			c2.8-2.5,6-4.5,9.8-5.9c3.7-1.5,7.6-2.2,11.5-2.2c3.7,0,7.4,0.7,11.1,2.1c3.7,1.4,7.1,3.7,10.2,6.8c3.1,3.1,5.6,7.1,7.5,11.9
+			c1.9,4.8,2.9,10.4,2.9,17h-4.6c0-5.7-0.8-10.7-2.4-14.8c-1.6-4.2-3.7-7.6-6.3-10.3c-2.6-2.7-5.5-4.7-8.7-6c-3.2-1.3-6.5-2-9.7-2
+			c-3.4,0-6.7,0.6-10,1.8c-3.3,1.2-6.2,3-8.8,5.6c-2.6,2.6-4.6,5.8-6.2,9.7c-1.5,3.9-2.3,8.5-2.3,13.8v90.7v0.2
+			c0,3.7,0.2,6.8,0.5,9.4c0.4,2.6,1.1,5.3,2.2,8.3c1.1,2.9,2.7,5.6,4.9,7.9c4.7,5.1,11.2,7.7,19.6,7.7c8.6,0,15.4-2.6,20.2-7.7
+			c2.2-2.3,3.8-4.9,4.9-7.7c1.1-2.8,1.9-5.4,2.3-7.8c0.4-2.4,0.7-5.3,0.7-8.7v-0.2l-0.2-35.2L513.9,162.7z"/>
+		<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="609.4827" y1="232.5931" x2="609.4827" y2="72.7684">
+			<stop  offset="0" style="stop-color:#133C33"/>
+			<stop  offset="1" style="stop-color:#FFFFFF"/>
+		</linearGradient>
+		<path fill="url(#SVGID_10_)" d="M643.6,232.6h-4.8l-9.9-48.1h-38.3l-10.3,48.1h-4.8l32.3-159.8h3.7L643.6,232.6z M627.5,179.8
+			l-17.8-95l-18.5,95H627.5z M608.8,72.8h0.2h0.4h0.2h0.2h0.4H608.8z"/>
+	</g>
+</g>
+</svg>