From e167f0da5b3ffb6ca7017ca6f2b02d90f1004f60 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Sun, 18 Dec 2016 14:09:46 +0100 Subject: [PATCH] Balanced out block hardness. It's tinkers alloying addon, not tinkers annoying addon! Fixed some language files and fluid models. --- src/main/java/com/sosnitzka/taiga/Blocks.java | 98 +++++++++---------- .../sosnitzka/taiga/blocks/BlockTiberium.java | 2 +- .../com/sosnitzka/taiga/util/Generator.java | 2 +- .../assets/taiga/blockstates/fluid_block.json | 4 +- .../resources/assets/taiga/lang/de_DE.lang | 21 ++++ .../resources/assets/taiga/lang/en_US.lang | 21 ++++ 6 files changed, 95 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/sosnitzka/taiga/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java index c35c702..6fe20e2 100644 --- a/src/main/java/com/sosnitzka/taiga/Blocks.java +++ b/src/main/java/com/sosnitzka/taiga/Blocks.java @@ -23,63 +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 oviumOre = new BasicBlock("ovium_ore", Material.ROCK, 13.0f, 10f, COBALT, PREFIX_ORE); - public static Block jauxumOre = new BasicBlock("jauxum_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 oviumBlock = new BasicBlock("ovium_block", Material.ROCK, 13.0f, 12f, COBALT, PREFIX_BLOCK); - public static Block jauxumBlock = new BasicBlock("jauxum_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); + 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 terraxBlock = new BasicBlock("terrax_block", Material.ROCK, 13.0f, 12f, 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()); /** diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java index c3167a0..069cd37 100644 --- 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 diff --git a/src/main/java/com/sosnitzka/taiga/util/Generator.java b/src/main/java/com/sosnitzka/taiga/util/Generator.java index dc1cbd2..9890bff 100644 --- a/src/main/java/com/sosnitzka/taiga/util/Generator.java +++ b/src/main/java/com/sosnitzka/taiga/util/Generator.java @@ -202,7 +202,7 @@ public class Generator { } 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); diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json index 70510af..8ea98d9 100644 --- a/src/main/resources/assets/taiga/blockstates/fluid_block.json +++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json @@ -88,10 +88,10 @@ } } ], - "jaxum_fluid": [ + "jauxum_fluid": [ { "custom": { - "fluid": "jaxum_fluid" + "fluid": "jauxum_fluid" } } ], diff --git a/src/main/resources/assets/taiga/lang/de_DE.lang b/src/main/resources/assets/taiga/lang/de_DE.lang index eacf957..b96f169 100644 --- a/src/main/resources/assets/taiga/lang/de_DE.lang +++ b/src/main/resources/assets/taiga/lang/de_DE.lang @@ -6,6 +6,9 @@ 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 @@ -42,6 +45,9 @@ 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 @@ -78,6 +84,9 @@ 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 @@ -114,6 +123,9 @@ item.duranite_nugget.name=Duranite Nugget item.valyrium_nugget.name=Valyrium Nugget item.vibranium_nugget.name=Vibranium Nugget item.karmesine_nugget.name=Karmesine Nugget +tile.jauxum_nugget.name=Jauxum Nugget +tile.ovium_nugget.name=Ovium Nugget +tile.terrax_nugget.name=Terrax Nugget item.palladium_nugget.name=Palladium Nugget item.uru_nugget.name=Uru Nugget item.osram_nugget.name=Osram Nugget @@ -150,6 +162,9 @@ item.duranite_dust.name=Duranite Staub item.valyrium_dust.name=Valyrium Staub item.vibranium_dust.name=Vibranium Staub item.karmesine_dust.name=Karmesine Staub +tile.jauxum_dust.name=Jauxum Staub +tile.ovium_dust.name=Ovium Staub +tile.terrax_dust.name=Terrax Staub item.palladium_dust.name=Palladium Staub item.uru_dust.name=Uru Staub item.osram_dust.name=Osram Staub @@ -186,6 +201,9 @@ item.duranite_ingot.name=Duranite Barren item.valyrium_ingot.name=Valyrium Barren item.vibranium_ingot.name=Vibranium Barren item.karmesine_ingot.name=Karmesine Barren +tile.jauxum_ingot.name=Jauxum Barren +tile.ovium_ingot.name=Ovium Barren +tile.terrax_ingot.name=Terrax Barren item.palladium_ingot.name=Palladium Barren item.uru_ingot.name=Uru Barren item.osram_ingot.name=Osram Barren @@ -222,6 +240,9 @@ 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 diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang index 557c5af..75cc117 100644 --- a/src/main/resources/assets/taiga/lang/en_US.lang +++ b/src/main/resources/assets/taiga/lang/en_US.lang @@ -6,6 +6,9 @@ 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 @@ -42,6 +45,9 @@ 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 @@ -78,6 +84,9 @@ tile.duranite_ore.name=Duranite Ore tile.valyrium_ore.name=Valyrium Ore tile.vibranium_ore.name=Vibranium 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 @@ -114,6 +123,9 @@ item.duranite_nugget.name=Duranite Nugget item.valyrium_nugget.name=Valyrium Nugget item.vibranium_nugget.name=Vibranium Nugget item.karmesine_nugget.name=Karmesine Nugget +tile.jauxum_nugget.name=Jauxum Nugget +tile.ovium_nugget.name=Ovium Nugget +tile.terrax_nugget.name=Terrax Nugget item.palladium_nugget.name=Palladium Nugget item.uru_nugget.name=Uru Nugget item.osram_nugget.name=Osram Nugget @@ -150,6 +162,9 @@ item.duranite_dust.name=Duranite Dust item.valyrium_dust.name=Valyrium Dust item.vibranium_dust.name=Vibranium Dust item.karmesine_dust.name=Karmesine Dust +tile.jauxum_dust.name=Jauxum Dust +tile.ovium_dust.name=Ovium Dust +tile.terrax_dust.name=Terrax Dust item.palladium_dust.name=Palladium Dust item.uru_dust.name=Uru Dust item.osram_dust.name=Osram Dust @@ -186,6 +201,9 @@ item.duranite_ingot.name=Duranite Ingot item.valyrium_ingot.name=Valyrium Ingot item.vibranium_ingot.name=Vibranium Ingot item.karmesine_ingot.name=Karmesine Ingot +tile.jauxum_ingot.name=Jauxum Ingot +tile.ovium_ingot.name=Ovium Ingot +tile.terrax_ingot.name=Terrax Ingot item.palladium_ingot.name=Palladium Ingot item.uru_ingot.name=Uru Ingot item.osram_ingot.name=Osram Ingot @@ -222,6 +240,9 @@ 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