Final adjustments, 2 additional traits, 1 trait rewritten. Liquids + textures included. German and english translation added.

2016-07-18 00:16:46 +02:00
parent 77e86d4281
commit 302ef6cccb
28 changed files with 717 additions and 380 deletions
--- a/src/main/resources/assets/ztic_addon/blockstates/fluid_block.json
+++ b/src/main/resources/assets/ztic_addon/blockstates/fluid_block.json
@@ -11,6 +11,55 @@
        }
      }
    ],
+    "tiberium": [
+      {
+        "custom": {
+          "fluid": "tiberium"
+        }
+      }
+    ],
+    "prometheum": [
+      {
+        "custom": {
+          "fluid": "prometheum"
+        }
+      }
+    ],
+    "rubium": [
+      {
+        "custom": {
+          "fluid": "rubium"
+        }
+      }
+    ],
+    "violium": [
+      {
+        "custom": {
+          "fluid": "violium"
+        }
+      }
+    ],
+    "bismuth": [
+      {
+        "custom": {
+          "fluid": "bismuth"
+        }
+      }
+    ],
+    "karmesine": [
+      {
+        "custom": {
+          "fluid": "karmesine"
+        }
+      }
+    ],
+    "mindorite": [
+      {
+        "custom": {
+          "fluid": "mindorite"
+        }
+      }
+    ],
    "titanite": [
      {
        "custom": {
@@ -18,6 +67,132 @@
        }
      }
    ],
+    "meteorite": [
+      {
+        "custom": {
+          "fluid": "meteorite"
+        }
+      }
+    ],
+    "adamantite": [
+      {
+        "custom": {
+          "fluid": "adamantite"
+        }
+      }
+    ],
+    "vibranium": [
+      {
+        "custom": {
+          "fluid": "vibranium"
+        }
+      }
+    ],
+    "ignitite": [
+      {
+        "custom": {
+          "fluid": "ignitite"
+        }
+      }
+    ],
+    "palladium": [
+      {
+        "custom": {
+          "fluid": "palladium"
+        }
+      }
+    ],
+    "eternite": [
+      {
+        "custom": {
+          "fluid": "eternite"
+        }
+      }
+    ],
+    "mythril": [
+      {
+        "custom": {
+          "fluid": "mythril"
+        }
+      }
+    ],
+    "astrium": [
+      {
+        "custom": {
+          "fluid": "astrium"
+        }
+      }
+    ],
+    "nitronite": [
+      {
+        "custom": {
+          "fluid": "nitronite"
+        }
+      }
+    ],
+    "proxideum": [
+      {
+        "custom": {
+          "fluid": "proxideum"
+        }
+      }
+    ],
+    "noctunyx": [
+      {
+        "custom": {
+          "fluid": "noctunyx"
+        }
+      }
+    ],
+    "imperomite": [
+      {
+        "custom": {
+          "fluid": "imperomite"
+        }
+      }
+    ],
+    "cryptogen": [
+      {
+        "custom": {
+          "fluid": "cryptogen"
+        }
+      }
+    ],
+    "fractoryte": [
+      {
+        "custom": {
+          "fluid": "fractoryte"
+        }
+      }
+    ],
+    "seismodium": [
+      {
+        "custom": {
+          "fluid": "seismodium"
+        }
+      }
+    ],
+    "terramite": [
+      {
+        "custom": {
+          "fluid": "terramite"
+        }
+      }
+    ],
+    "lumixyl": [
+      {
+        "custom": {
+          "fluid": "lumixyl"
+        }
+      }
+    ],
+    "solarium": [
+      {
+        "custom": {
+          "fluid": "solarium"
+        }
+      }
+    ],
    "dyonite": [
      {
        "custom": {
@@ -25,10 +200,80 @@
        }
      }
    ],
-    "astrium": [
+    "ultranite": [
      {
        "custom": {
-          "fluid": "astrium"
+          "fluid": "ultranite"
+        }
+      }
+    ],
+    "nucleum": [
+      {
+        "custom": {
+          "fluid": "nucleum"
+        }
+      }
+    ],
+    "aegisalt": [
+      {
+        "custom": {
+          "fluid": "aegisalt"
+        }
+      }
+    ],
+    "bysmuid": [
+      {
+        "custom": {
+          "fluid": "bysmuid"
+        }
+      }
+    ],
+    "radiant_enderium": [
+      {
+        "custom": {
+          "fluid": "radiant_enderium"
+        }
+      }
+    ],
+    "glimming_enderium": [
+      {
+        "custom": {
+          "fluid": "glimming_enderium"
+        }
+      }
+    ],
+    "energy_enderium": [
+      {
+        "custom": {
+          "fluid": "energy_enderium"
+        }
+      }
+    ],
+    "glimmercoal_fluid": [
+      {
+        "custom": {
+          "fluid": "glimmercoal_fluid"
+        }
+      }
+    ],
+    "nitro_fluid": [
+      {
+        "custom": {
+          "fluid": "nitro_fluid"
+        }
+      }
+    ],
+    "anthracite_fluid": [
+      {
+        "custom": {
+          "fluid": "anthracite_fluid"
+        }
+      }
+    ],
+    "spectrum_fluid": [
+      {
+        "custom": {
+          "fluid": "spectrum_fluid"
        }
      }
    ]
--- a/src/main/resources/assets/ztic_addon/lang/de_DE.lang
+++ b/src/main/resources/assets/ztic_addon/lang/de_DE.lang
@@ -61,105 +61,6 @@ material.dyonite.name=Dyonit
 material.proxideum.name=Proxideum
 material.astrium.name=Astrium

-fluid.titanite.name=Titanit
-fluid.meteorite.name=Meteorit
-fluid.vibranium.name=Vibranium
-fluid.adamantite.name=Adamantit
-fluid.prometheum.name=Prometheum
-fluid.rubium.name=Rubium
-fluid.tiberium.name=Tiberium
-fluid.arcanite.name=Arcanit
-fluid.eternite.name=Eternit
-fluid.mythril.name=Mythril
-fluid.palladium.name=Palladium
-fluid.ignitite.name=Ignitit
-fluid.violium.name=Violium
-fluid.bismuth.name=Bismuth
-fluid.mindorite.name=Mindorit
-fluid.karmesine.name=Karmesin
-fluid.imperomite.name=Imperomit
-fluid.fractoryte.name=Fractoryt
-fluid.noctunyx.name=Noctunyx
-fluid.nitronite.name=Nitronit
-fluid.cryptogen.name=Cryptogen
-fluid.seismodium.name=Seismodium
-fluid.aegisalt.name=Aegisalt
-fluid.ultranite.name=Ultranit
-fluid.bysmuid.name=Bysmuid
-fluid.nucleum.name=Nucleum
-fluid.terramite.name=Terramit
-fluid.solarium.name=Solarium
-fluid.lumixyl.name=Lumixyl
-fluid.dyonite.name=Dyonit
-fluid.proxideum.name=Proxideum
-fluid.astrium.name=Astrium
-
-fluid.titanite=Titanit
-fluid.meteorite=Meteorit
-fluid.vibranium=Vibranium
-fluid.adamantite=Adamantit
-fluid.prometheum=Prometheum
-fluid.rubium=Rubium
-fluid.tiberium=Tiberium
-fluid.arcanite=Arcanit
-fluid.eternite=Eternit
-fluid.mythril=Mythril
-fluid.palladium=Palladium
-fluid.ignitite=Ignitit
-fluid.violium=Violium
-fluid.bismuth=Bismuth
-fluid.mindorite=Mindorit
-fluid.karmesine=Karmesin
-fluid.imperomite=Imperomit
-fluid.fractoryte=Fractoryt
-fluid.noctunyx=Noctunyx
-fluid.nitronite=Nitronit
-fluid.cryptogen=Cryptogen
-fluid.seismodium=Seismodium
-fluid.aegisalt=Aegisalt
-fluid.ultranite=Ultranit
-fluid.bysmuid=Bysmuid
-fluid.nucleum=Nucleum
-fluid.terramite=Terramit
-fluid.solarium=Solarium
-fluid.lumixyl=Lumixyl
-fluid.dyonite=Dyonit
-fluid.proxideum=Proxideum
-fluid.astrium=Astrium
-
-Titanite.name=Titanit
-Meteorite.name=Meteorit
-Vibranium.name=Vibranium
-Adamantite.name=Adamantit
-Prometheum.name=Prometheum
-Rubium.name=Rubium
-Tiberium.name=Tiberium
-Arcanite.name=Arcanit
-Eternite.name=Eternit
-Mythril.name=Mythril
-Palladium.name=Palladium
-Ignitite.name=Ignitit
-Violium.name=Violium
-Bismuth.name=Bismuth
-Mindorite.name=Mindorit
-Karmesine.name=Karmesin
-Imperomite.name=Imperomit
-Fractoryte.name=Fractoryt
-Noctunyx.name=Noctunyx
-Nitronite.name=Nitronit
-Cryptogen.name=Cryptogen
-Seismodium.name=Seismodium
-Aegisalt.name=Aegisalt
-Ultranite.name=Ultranit
-Bysmuid.name=Bysmuid
-Nucleum.name=Nucleum
-Terramite.name=Terramit
-Solarium.name=Solarium
-Lumixyl.name=Lumixyl
-Dyonite.name=Dyonit
-Proxideum.name=Proxideum
-Astrium.name=Astrium
-
 tile.titanite_block.name=Titanitblock
 tile.meteorite_block.name=Meteoritblock
 tile.vibranium_block.name=Vibraniumblock
@@ -226,9 +127,49 @@ item.dyonite_ingot.name=Dyonitbarren
 item.proxideum_ingot.name=Proxideumbarren
 item.astrium_ingot.name=Astriumbarren

+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
+
 modifier.analysing.name=Analysing
 modifier.arcane.name=Arcane
-modifier.bentonite.name=Bentonite
+modifier.organizing.name=Organisieren
 modifier.blind.name=Blind
 modifier.bright.name=Bright
 modifier.cascade.name=Cascade
@@ -251,18 +192,17 @@ modifier.resonance.name=Resonance
 modifier.slaughtering.name=Slaughtering
 modifier.softy.name=Softy
 modifier.uncertain.name=Uncertain
+modifier.reviving.name=Wiederbelebend
+modifier.melting.name=Schmelzend

-fluid.radiant_enderium=Radiant Enderium
-fluid.glimming_enderium=Glimmer Enderium
-fluid.energy_enderium=Energy Enderium
-fluid.glimmercoal=Glimmerkohlenfluid
 item.glimmercoal.name=Glimmerkohle
 item.glimmer_pearl.name=Glimmerperle
 item.glimmerstone_dust.name=Glimmerstein Staub
 item.energy_pearl.name=Energieperle
-fluid.nitro=Nitro
 item.nitro_brick.name=Nitroziegel
-fluid.anthracite=Anthracitfluid
 item.anthracite_dust.name=Anthracitstaub
-fluid.spectrum=Spectrumfluid
-item.spectrum_dust.name=Spectrumstaub
+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
--- a/src/main/resources/assets/ztic_addon/lang/en_US.lang
+++ b/src/main/resources/assets/ztic_addon/lang/en_US.lang
@@ -61,104 +61,45 @@ material.dyonite.name=Dyonite
 material.proxideum.name=Proxideum
 material.astrium.name=Astrium

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

 tile.titanite_block.name=Titanite Block
 tile.meteorite_block.name=Meteorite Block
@@ -228,7 +169,7 @@ item.astrium_ingot.name=Astrium Ingot

 modifier.analysing.name=Analysing
 modifier.arcane.name=Arcane
-modifier.bentonite.name=Bentonite
+modifier.organizing.name=Organizing
 modifier.blind.name=Blind
 modifier.bright.name=Bright
 modifier.cascade.name=Cascade
@@ -250,19 +191,19 @@ modifier.randomize.name=Randomize
 modifier.resonance.name=Resonance
 modifier.slaughtering.name=Slaughtering
 modifier.softy.name=Softy
-modifier.uncertain.name=Uncertai
+modifier.uncertain.name=Uncertain
+modifier.reviving.name=Reviving
+modifier.melting.name=Melting
+

-fluid.radiant_enderium=Radiant enderium
-fluid.glimming_enderium=Glimming enderium
-fluid.energy_enderium=Energy enderium
-fluid.glimmercoal=Glimmercoal fluid
 item.glimmercoal.name=Glimmercoal
 item.glimmer_pearl.name=Glimmerpearl
-item.glimmerstone_dust.name=Glimmerstone dust
-item.energy_pearl.name=Energy pearl
-fluid.nitro=Nitro
-item.nitro_brick.name=Nitro brick
-fluid.anthracite=Anthracite fluid
-item.anthracite_dust.name=Anthracite dust
-fluid.spectrum=Spectrum fluid
-item.spectrum_dust.name=Spectrum dust
+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=Instable Tiberium Shard
+item.tiberium_nugget.name=Tiberium Nugget
+item.radiant_pearl.name=Radiant Pearl
+item.luminar_dust.name=Luminar Dust
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,8 +1,8 @@
 [{
  "modid": "ztic_addon",
  "name": "Tinkers ",
-  "description": "A modification for Tinkers' Construct, adding several ores and materials",
-  "version": "0.5",
+  "description": "A modification for Tinkers' Construct! 32 New Materials including a special alloy system",
+  "version": "0.9",
  "mcversion": "1.9",
  "url": "www.sosnitzka.com",
  "updateUrl": "",