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.

45 files changed, 144 insertions, 12 deletions

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