From e1048038547ec21ed29cb5c27618fe85991befd1 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Wed, 14 Dec 2016 02:10:56 +0100 Subject: [PATCH] Added missing names and two missing textures for liquids. Reworked Configuration, did not work - still need to be fixed. Changed some Temperatures, added two additional liquids for melting. --- src/main/java/com/sosnitzka/taiga/Alloys.java | 1 + src/main/java/com/sosnitzka/taiga/Fluids.java | 16 +- .../sosnitzka/taiga/TAIGAConfiguration.java | 331 +++---------- .../com/sosnitzka/taiga/TAIGAGuiFactory.java | 17 - .../com/sosnitzka/taiga/world/WorldGen.java | 42 +- .../assets/taiga/blockstates/fluid_block.json | 14 + .../resources/assets/taiga/lang/de_DE.lang | 446 ++++++++++-------- .../resources/assets/taiga/lang/en_US.lang | 422 +++++++++-------- .../taiga/textures/items/dust/triberium.png | Bin 0 -> 16066 bytes .../taiga/textures/items/ingot/triberium.png | Bin 0 -> 15955 bytes .../taiga/textures/items/nugget/triberium.png | Bin 0 -> 15605 bytes .../taiga/textures/materials/triberium.png | Bin 0 -> 18957 bytes 12 files changed, 596 insertions(+), 693 deletions(-) create mode 100644 src/main/resources/assets/taiga/textures/items/dust/triberium.png create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/triberium.png create mode 100644 src/main/resources/assets/taiga/textures/items/nugget/triberium.png create mode 100644 src/main/resources/assets/taiga/textures/materials/triberium.png diff --git a/src/main/java/com/sosnitzka/taiga/Alloys.java b/src/main/java/com/sosnitzka/taiga/Alloys.java index d08957e..1b0b9df 100644 --- a/src/main/java/com/sosnitzka/taiga/Alloys.java +++ b/src/main/java/com/sosnitzka/taiga/Alloys.java @@ -38,6 +38,7 @@ public class Alloys { registerTinkerAlloy(new FluidStack(nucleumFluid, 3), new FluidStack(niobFluid, 3), new FluidStack(eezoFluid, 1), new FluidStack(abyssumFluid, 1)); registerTinkerAlloy(new FluidStack(dyoniteFluid, 3), new FluidStack(triberiumFluid, 3), new FluidStack(fractumFluid, 1), new FluidStack(seismumFluid, 1), new FluidStack(osramFluid, 1)); registerTinkerAlloy(new FluidStack(dyoniteFluid, 3), new FluidStack(tiberiumFluid, 12), new FluidStack(fractumFluid, 1), new FluidStack(seismumFluid, 1), new FluidStack(osramFluid, 1)); + registerTinkerAlloy(new FluidStack(nitroniteFluid, 6), new FluidStack(magmaFluid, 6), new FluidStack(osramFluid, 1)); } } diff --git a/src/main/java/com/sosnitzka/taiga/Fluids.java b/src/main/java/com/sosnitzka/taiga/Fluids.java index 901b501..8ecd85e 100644 --- a/src/main/java/com/sosnitzka/taiga/Fluids.java +++ b/src/main/java/com/sosnitzka/taiga/Fluids.java @@ -3,6 +3,7 @@ package com.sosnitzka.taiga; import com.sosnitzka.taiga.generic.BasicTinkerFluid; import com.sosnitzka.taiga.util.Utils; +import net.minecraftforge.fluids.FluidStack; import slimeknights.tconstruct.library.TinkerRegistry; import slimeknights.tconstruct.smeltery.block.BlockMolten; @@ -16,9 +17,9 @@ public class Fluids { public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium_fluid", 0xFF66f136, 400, 10, 8000); public static BasicTinkerFluid auroriumFluid = new BasicTinkerFluid("aurorium_fluid", 0xFFefae94, 750, 10, 10000); public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum_fluid", 0xFF271c29, 850, 10, 10000); - public static BasicTinkerFluid duraniteFluid = new BasicTinkerFluid("duranite_fluid", 0xFFacddeb, 10000, 10, 10000); - public static BasicTinkerFluid valyriumFluid = new BasicTinkerFluid("valyrium_fluid", 0xFFe85c31, 1250, 10, 10000); - public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium_fluid", 0xFFbad2d9, 1400, 10, 10000); + public static BasicTinkerFluid duraniteFluid = new BasicTinkerFluid("duranite_fluid", 0xFFacddeb, 1400, 10, 10000); + public static BasicTinkerFluid valyriumFluid = new BasicTinkerFluid("valyrium_fluid", 0xFFe85c31, 1915, 10, 10000); + public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium_fluid", 0xFFbad2d9, 3050, 10, 10000); public static BasicTinkerFluid karmesineFluid = new BasicTinkerFluid("karmesine_fluid", 0xFFeb484a, 750, 10, 9000); public static BasicTinkerFluid palladiumFluid = new BasicTinkerFluid("palladium_fluid", 0xFFee8736, 690, 10, 10000); public static BasicTinkerFluid uruFluid = new BasicTinkerFluid("uru_fluid", 0xFFbfb9f0, 1200, 10, 10000); @@ -45,6 +46,8 @@ public class Fluids { public static BasicTinkerFluid ioxFluid = new BasicTinkerFluid("iox_fluid", 0xFF99323c, 900, 10, 10000); public static BasicTinkerFluid meteoriteFluid = new BasicTinkerFluid("meteorite_fluid", 0xFF374f3d, 950, 10, 7000); public static BasicTinkerFluid obsidioriteFluid = new BasicTinkerFluid("obsidiorite_fluid", 0xFF224853, 1050, 10, 7000); + public static BasicTinkerFluid magmaFluid = new BasicTinkerFluid("magma_fluid", 0xFFffc000, 2000, 10, 5000); + public static BasicTinkerFluid nitroniteFluid = new BasicTinkerFluid("nitronite_fluid", 0xFFCCFF00, 3100, 10, 5000); /** * Registers all materials' fluids
@@ -80,7 +83,12 @@ public class Fluids { * Registers special smeltery recipes (not alloying) */ static void registerfromItem() { - TinkerRegistry.registerMelting(Blocks.blockMeteoriteCobble, meteoriteFluid, 144); + TinkerRegistry.registerMelting(Blocks.blockMeteoriteCobble, meteoriteFluid, 288); + TinkerRegistry.registerMelting(Blocks.blockObsidiorite, meteoriteFluid, 288); + TinkerRegistry.registerMelting(net.minecraft.init.Blocks.MAGMA, magmaFluid, 288); + + TinkerRegistry.registerSmelteryFuel(new FluidStack(magmaFluid, 50), 100); + TinkerRegistry.registerSmelteryFuel(new FluidStack(nitroniteFluid, 100), 500); } } diff --git a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java index b6e5990..65d6abb 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java @@ -15,34 +15,27 @@ import java.util.List; public class TAIGAConfiguration { public static final String CATEGORY_NAME_GENERAL = "category_general"; public static final String CATEGORY_NAME_ORE_GEN = "category_ore_gen"; - public static final String CATEGORY_NAME_ORE_VAL = "category_ore_val"; - public static double speedFactorGeneral; - public static double attackFactorGeneral; - public static double durabilityFactorGeneral; + public static double RESFAC_MIN_VALUE = 0; + public static double RESFAC_MAX_VALUE = 9999; - public static double ironFactor; - public static double titaniteFactor; - public static double adamantiteFactor; - public static double arcaniteFactor; - public static double violiumFactor; - public static double bismuthFactor; - public static double eterniteFactor; - public static double ignititeFactor; - public static double karmesineFactor; - public static double meteoriteFactor; - public static double mindoriteFactor; - public static double mythrilFactor; - public static double palladiumFactor; - public static double prometheumFactor; - public static double tiberiumFactor; - public static double vibraniumFactor; - public static double rubiumFactor; - public static double basaltFactor; - public static double rottengroundFactor; - public static double ligniteFactor; + public static int IRON_VAL = 20; + public static int TIBERIUM_VAL = 15; + public static int PROMETHEUM_VAL = 25; + public static int VALYRIUM_VAL = 10; + public static int OSRAM_VAL = 1; + public static int DURANITE_VAL = 1; + public static int BASALT_VAL = 10; + public static int EEZO_VAL = 3; + public static int KARMESINE_VAL = 15; + public static int VIBRANIUM_VAL = 10; + public static int URU_VAL = 1; + public static int AURORIUM_VAL = 10; + public static int PALLADIUM_VAL = 10; + public static int ABYSSUM_VAL = 4; - public static boolean ironGen; + public static boolean ironGen = false; + public static boolean endGen = true; private static Configuration config = null; public static void preInit() { @@ -83,257 +76,83 @@ public class TAIGAConfiguration { * Ore generation chance multiplier */ - final boolean GENERATION_DEFAULT_VALUE = true; - final double RESFAC_MIN_VALUE = 0; - final double RESFAC_MAX_VALUE = 9999; - final double RESFAC_DEFAULT_VALUE = 1.0; - - Property slagIronSwitch = config.get(CATEGORY_NAME_GENERAL, "SlagIron Switch", GENERATION_DEFAULT_VALUE); - slagIronSwitch.setComment("Switch ore on/off"); - slagIronSwitch.setLanguageKey("gui.taiga_configuration.gen_slagiron"); - Property slagGoldSwitch = config.get(CATEGORY_NAME_GENERAL, "SlagGold Switch", GENERATION_DEFAULT_VALUE); - slagGoldSwitch.setComment("Switch ore on/off"); - slagGoldSwitch.setLanguageKey("gui.taiga_configuration.gen_slaggold"); - Property ironSwitch = config.get(CATEGORY_NAME_GENERAL, "Extra Iron Switch", GENERATION_DEFAULT_VALUE); + Property ironSwitch = config.get(CATEGORY_NAME_GENERAL, "Extra Iron Switch", ironGen); ironSwitch.setComment("Switch ore on/off"); ironSwitch.setLanguageKey("gui.taiga_configuration.gen_iron"); + Property endSwitch = config.get(CATEGORY_NAME_GENERAL, "Extra Endstone Switch", endGen); + endSwitch.setComment("Switch extra End on/off"); + endSwitch.setLanguageKey("gui.taiga_configuration.gen_end"); + + /* + Stuff which probably gonna come back + Property durabilityFactorGeneralProp = config.get(CATEGORY_NAME_GENERAL, "Durability factor", RESFAC_DEFAULT_VALUE, "General multiplier for all TAIGA materials", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); durabilityFactorGeneralProp.setLanguageKey("gui.taiga_configuration.durability_multiplier"); durabilityFactorGeneralProp.setRequiresMcRestart(true); - Property speedFactorGeneralProp = config.get(CATEGORY_NAME_GENERAL, "Speed factor", RESFAC_DEFAULT_VALUE, - "General multiplier for all TAIGA materials", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - speedFactorGeneralProp.setLanguageKey("gui.taiga_configuration.speed_multiplier"); - speedFactorGeneralProp.setRequiresMcRestart(true); - Property attackFactorGeneralProp = config.get(CATEGORY_NAME_GENERAL, "Attack factor", RESFAC_DEFAULT_VALUE, - "General multiplier for all TAIGA materials", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - attackFactorGeneralProp.setLanguageKey("gui.taiga_configuration.attack_multiplier"); - attackFactorGeneralProp.setRequiresMcRestart(true); + + */ List propOrderGeneral = new ArrayList(); propOrderGeneral.add(ironSwitch.getName()); - propOrderGeneral.add(slagIronSwitch.getName()); - propOrderGeneral.add(slagGoldSwitch.getName()); - propOrderGeneral.add(durabilityFactorGeneralProp.getName()); - propOrderGeneral.add(speedFactorGeneralProp.getName()); - propOrderGeneral.add(attackFactorGeneralProp.getName()); + propOrderGeneral.add(endSwitch.getName()); + // propOrderGeneral.add(durabilityFactorGeneralProp.getName()); config.setCategoryPropertyOrder(CATEGORY_NAME_GENERAL, propOrderGeneral); /* * Declaration of specific ore generation values:
* Generation chance multiplier */ - Property ironFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Iron factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - ironFactorProp.setLanguageKey("gui.taiga_configuration.titanite_multiplier"); - Property titaniteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Titanite factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - titaniteFactorProp.setLanguageKey("gui.taiga_configuration.titanite_multiplier"); - Property adamantiteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Adamantite factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - adamantiteFactorProp.setLanguageKey("gui.taiga_configuration.adamantite_multiplier"); - Property arcaniteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Arcanite factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - arcaniteFactorProp.setLanguageKey("gui.taiga_configuration.arcanite_multiplier"); - Property violiumFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Violium factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - violiumFactorProp.setLanguageKey("gui.taiga_configuration.violium_multiplier"); - Property bismuthFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Bismuth factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - bismuthFactorProp.setLanguageKey("gui.taiga_configuration.bismuth_multiplier"); - Property eterniteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Eternite factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - eterniteFactorProp.setLanguageKey("gui.taiga_configuration.eternite_multiplier"); - Property ignititeFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Ignitite factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - ignititeFactorProp.setLanguageKey("gui.taiga_configuration.ignitite_multiplier"); - Property karmesineFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Karmesine factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - karmesineFactorProp.setLanguageKey("gui.taiga_configuration.karmesine_multiplier"); - Property meteoriteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Meteorite factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - meteoriteFactorProp.setLanguageKey("gui.taiga_configuration.meteorite_multiplier"); - Property mindoriteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Mindorite factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - mindoriteFactorProp.setLanguageKey("gui.taiga_configuration.mindorite_multiplier"); - Property mythrilFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Mythril factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - mythrilFactorProp.setLanguageKey("gui.taiga_configuration.mythril_multiplier"); - Property palladiumFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Palladium factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - palladiumFactorProp.setLanguageKey("gui.taiga_configuration.palladium_multiplier"); - Property prometheumFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Prometheum factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - prometheumFactorProp.setLanguageKey("gui.taiga_configuration.prometheum_multiplier"); - Property tiberiumFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Tiberium factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - tiberiumFactorProp.setLanguageKey("gui.taiga_configuration.tiberium_multiplier"); - Property vibraniumFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Vibranium factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - vibraniumFactorProp.setLanguageKey("gui.taiga_configuration.vibranium_multiplier"); - Property rubiumFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Rubium factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - rubiumFactorProp.setLanguageKey("gui.taiga_configuration.rubium_multiplier"); - // RottenGround + Basalt - Property basaltFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Basalt factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - basaltFactorProp.setLanguageKey("gui.taiga_configuration.basalt_multiplier"); - Property rottengroundFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "RottenGround factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - rottengroundFactorProp.setLanguageKey("gui.taiga_configuration.rottenground_multiplier"); - Property ligniteFactorProp = config.get(CATEGORY_NAME_ORE_GEN, "Lignite factor", RESFAC_DEFAULT_VALUE, - "specific generation multiplier", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); - ligniteFactorProp.setLanguageKey("gui.taiga_configuration.lignite_multiplier"); + + Property ironValue = config.get(CATEGORY_NAME_ORE_GEN, "Iron", IRON_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + ironValue.setLanguageKey("gui.taiga_configuration.iron_multiplier"); + Property basaltValue = config.get(CATEGORY_NAME_ORE_GEN, "Basalt", BASALT_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + basaltValue.setLanguageKey("gui.taiga_configuration.basalt_multiplier"); + Property tiberiumValue = config.get(CATEGORY_NAME_ORE_GEN, "Tiberium", TIBERIUM_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + tiberiumValue.setLanguageKey("gui.taiga_configuration.tiberium_multiplier"); + Property auroriumValue = config.get(CATEGORY_NAME_ORE_GEN, "Aurorium", AURORIUM_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + auroriumValue.setLanguageKey("gui.taiga_configuration.aurorium_multiplier"); + Property prometheumValue = config.get(CATEGORY_NAME_ORE_GEN, "Prometheum", PROMETHEUM_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + prometheumValue.setLanguageKey("gui.taiga_configuration.prometheum_multiplier"); + Property duraniteValue = config.get(CATEGORY_NAME_ORE_GEN, "Duranite", DURANITE_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + duraniteValue.setLanguageKey("gui.taiga_configuration.duranite_multiplier"); + Property valyriumValue = config.get(CATEGORY_NAME_ORE_GEN, "Valyrium", VALYRIUM_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + valyriumValue.setLanguageKey("gui.taiga_configuration.valyrium_multiplier"); + Property vibraniumValue = config.get(CATEGORY_NAME_ORE_GEN, "Vibranium", VIBRANIUM_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + vibraniumValue.setLanguageKey("gui.taiga_configuration.vibranium_multiplier"); + Property karmesineValue = config.get(CATEGORY_NAME_ORE_GEN, "Karmesine", KARMESINE_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + karmesineValue.setLanguageKey("gui.taiga_configuration.karmesine_multiplier"); + Property palladiumValue = config.get(CATEGORY_NAME_ORE_GEN, "Palladium", PALLADIUM_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + palladiumValue.setLanguageKey("gui.taiga_configuration.palladium_multiplier"); + Property uruValue = config.get(CATEGORY_NAME_ORE_GEN, "Uru", URU_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + uruValue.setLanguageKey("gui.taiga_configuration.uru_multiplier"); + Property osramValue = config.get(CATEGORY_NAME_ORE_GEN, "Osram", OSRAM_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + osramValue.setLanguageKey("gui.taiga_configuration.osram_multiplier"); + Property abyssumValue = config.get(CATEGORY_NAME_ORE_GEN, "Abyssum", ABYSSUM_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + abyssumValue.setLanguageKey("gui.taiga_configuration.abyssum_multiplier"); + Property eezoValue = config.get(CATEGORY_NAME_ORE_GEN, "Eezo", EEZO_VAL, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + eezoValue.setLanguageKey("gui.taiga_configuration.eezo_multiplier"); + List propOrderOreGen = new ArrayList(); - propOrderOreGen.add(ironFactorProp.getName()); - propOrderOreGen.add(ligniteFactorProp.getName()); - propOrderOreGen.add(basaltFactorProp.getName()); - propOrderOreGen.add(rottengroundFactorProp.getName()); - propOrderOreGen.add(titaniteFactorProp.getName()); - propOrderOreGen.add(adamantiteFactorProp.getName()); - propOrderOreGen.add(arcaniteFactorProp.getName()); - propOrderOreGen.add(violiumFactorProp.getName()); - propOrderOreGen.add(bismuthFactorProp.getName()); - propOrderOreGen.add(eterniteFactorProp.getName()); - propOrderOreGen.add(ignititeFactorProp.getName()); - propOrderOreGen.add(karmesineFactorProp.getName()); - propOrderOreGen.add(meteoriteFactorProp.getName()); - propOrderOreGen.add(mindoriteFactorProp.getName()); - propOrderOreGen.add(mythrilFactorProp.getName()); - propOrderOreGen.add(palladiumFactorProp.getName()); - propOrderOreGen.add(prometheumFactorProp.getName()); - propOrderOreGen.add(tiberiumFactorProp.getName()); - propOrderOreGen.add(vibraniumFactorProp.getName()); - propOrderOreGen.add(rubiumFactorProp.getName()); + propOrderOreGen.add(ironValue.getName()); + propOrderOreGen.add(basaltValue.getName()); + propOrderOreGen.add(tiberiumValue.getName()); + propOrderOreGen.add(auroriumValue.getName()); + propOrderOreGen.add(prometheumValue.getName()); + propOrderOreGen.add(duraniteValue.getName()); + propOrderOreGen.add(valyriumValue.getName()); + propOrderOreGen.add(vibraniumValue.getName()); + propOrderOreGen.add(karmesineValue.getName()); + propOrderOreGen.add(palladiumValue.getName()); + propOrderOreGen.add(uruValue.getName()); + propOrderOreGen.add(osramValue.getName()); + propOrderOreGen.add(abyssumValue.getName()); + propOrderOreGen.add(eezoValue.getName()); config.setCategoryPropertyOrder(CATEGORY_NAME_ORE_GEN, propOrderOreGen); - List propOrderOreVal = new ArrayList(); - config.setCategoryPropertyOrder(CATEGORY_NAME_ORE_VAL, propOrderOreVal); - - - if (readFieldsFromConfig) { - durabilityFactorGeneral = durabilityFactorGeneralProp.getDouble(RESFAC_DEFAULT_VALUE); - if (durabilityFactorGeneral > RESFAC_MAX_VALUE || durabilityFactorGeneral < RESFAC_MIN_VALUE) { - durabilityFactorGeneral = RESFAC_DEFAULT_VALUE; - } - speedFactorGeneral = speedFactorGeneralProp.getDouble(RESFAC_DEFAULT_VALUE); - if (speedFactorGeneral > RESFAC_MAX_VALUE || speedFactorGeneral < RESFAC_MIN_VALUE) { - speedFactorGeneral = RESFAC_DEFAULT_VALUE; - } - attackFactorGeneral = attackFactorGeneralProp.getDouble(RESFAC_DEFAULT_VALUE); - if (attackFactorGeneral > RESFAC_MAX_VALUE || attackFactorGeneral < RESFAC_MIN_VALUE) { - attackFactorGeneral = RESFAC_DEFAULT_VALUE; - } - ironGen = ironSwitch.getBoolean(GENERATION_DEFAULT_VALUE); - ironFactor = ironFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (ironFactor > RESFAC_MAX_VALUE || ironFactor < RESFAC_MIN_VALUE) { - ironFactor = RESFAC_DEFAULT_VALUE; - } - titaniteFactor = titaniteFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (titaniteFactor > RESFAC_MAX_VALUE || titaniteFactor < RESFAC_MIN_VALUE) { - titaniteFactor = RESFAC_DEFAULT_VALUE; - } - adamantiteFactor = adamantiteFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (adamantiteFactor > RESFAC_MAX_VALUE || adamantiteFactor < RESFAC_MIN_VALUE) { - adamantiteFactor = RESFAC_DEFAULT_VALUE; - } - arcaniteFactor = arcaniteFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (arcaniteFactor > RESFAC_MAX_VALUE || arcaniteFactor < RESFAC_MIN_VALUE) { - arcaniteFactor = RESFAC_DEFAULT_VALUE; - } - violiumFactor = violiumFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (violiumFactor > RESFAC_MAX_VALUE || violiumFactor < RESFAC_MIN_VALUE) { - violiumFactor = RESFAC_DEFAULT_VALUE; - } - bismuthFactor = bismuthFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (bismuthFactor > RESFAC_MAX_VALUE || bismuthFactor < RESFAC_MIN_VALUE) { - bismuthFactor = RESFAC_DEFAULT_VALUE; - } - eterniteFactor = eterniteFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (eterniteFactor > RESFAC_MAX_VALUE || eterniteFactor < RESFAC_MIN_VALUE) { - eterniteFactor = RESFAC_DEFAULT_VALUE; - } - ignititeFactor = ignititeFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (ignititeFactor > RESFAC_MAX_VALUE || ignititeFactor < RESFAC_MIN_VALUE) { - ignititeFactor = RESFAC_DEFAULT_VALUE; - } - karmesineFactor = karmesineFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (karmesineFactor > RESFAC_MAX_VALUE || karmesineFactor < RESFAC_MIN_VALUE) { - karmesineFactor = RESFAC_DEFAULT_VALUE; - } - meteoriteFactor = meteoriteFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (meteoriteFactor > RESFAC_MAX_VALUE || meteoriteFactor < RESFAC_MIN_VALUE) { - meteoriteFactor = RESFAC_DEFAULT_VALUE; - } - mindoriteFactor = mindoriteFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (mindoriteFactor > RESFAC_MAX_VALUE || mindoriteFactor < RESFAC_MIN_VALUE) { - mindoriteFactor = RESFAC_DEFAULT_VALUE; - } - mythrilFactor = mythrilFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (mythrilFactor > RESFAC_MAX_VALUE || mythrilFactor < RESFAC_MIN_VALUE) { - mythrilFactor = RESFAC_DEFAULT_VALUE; - } - palladiumFactor = palladiumFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (palladiumFactor > RESFAC_MAX_VALUE || palladiumFactor < RESFAC_MIN_VALUE) { - palladiumFactor = RESFAC_DEFAULT_VALUE; - } - prometheumFactor = prometheumFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (prometheumFactor > RESFAC_MAX_VALUE || prometheumFactor < RESFAC_MIN_VALUE) { - prometheumFactor = RESFAC_DEFAULT_VALUE; - } - tiberiumFactor = tiberiumFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (tiberiumFactor > RESFAC_MAX_VALUE || tiberiumFactor < RESFAC_MIN_VALUE) { - tiberiumFactor = RESFAC_DEFAULT_VALUE; - } - vibraniumFactor = vibraniumFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (vibraniumFactor > RESFAC_MAX_VALUE || vibraniumFactor < RESFAC_MIN_VALUE) { - vibraniumFactor = RESFAC_DEFAULT_VALUE; - } - rubiumFactor = rubiumFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (rubiumFactor > RESFAC_MAX_VALUE || rubiumFactor < RESFAC_MIN_VALUE) { - rubiumFactor = RESFAC_DEFAULT_VALUE; - } - basaltFactor = basaltFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (basaltFactor > RESFAC_MAX_VALUE || basaltFactor < RESFAC_MIN_VALUE) { - basaltFactor = RESFAC_DEFAULT_VALUE; - } - rottengroundFactor = rottengroundFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (rottengroundFactor > RESFAC_MAX_VALUE || rottengroundFactor < RESFAC_MIN_VALUE) { - rottengroundFactor = RESFAC_DEFAULT_VALUE; - } - ligniteFactor = ligniteFactorProp.getDouble(RESFAC_DEFAULT_VALUE); - if (ligniteFactor > RESFAC_MAX_VALUE || ligniteFactor < RESFAC_MIN_VALUE) { - ligniteFactor = RESFAC_DEFAULT_VALUE; - } - } - - ironSwitch.set(ironGen); - durabilityFactorGeneralProp.set(durabilityFactorGeneral); - speedFactorGeneralProp.set(speedFactorGeneral); - attackFactorGeneralProp.set(attackFactorGeneral); - titaniteFactorProp.set(titaniteFactor); - adamantiteFactorProp.set(adamantiteFactor); - arcaniteFactorProp.set(arcaniteFactor); - violiumFactorProp.set(violiumFactor); - bismuthFactorProp.set(bismuthFactor); - eterniteFactorProp.set(eterniteFactor); - ignititeFactorProp.set(ignititeFactor); - karmesineFactorProp.set(karmesineFactor); - meteoriteFactorProp.set(meteoriteFactor); - mindoriteFactorProp.set(mindoriteFactor); - mythrilFactorProp.set(mythrilFactor); - palladiumFactorProp.set(palladiumFactor); - prometheumFactorProp.set(prometheumFactor); - tiberiumFactorProp.set(tiberiumFactor); - vibraniumFactorProp.set(vibraniumFactor); - rubiumFactorProp.set(rubiumFactor); - basaltFactorProp.set(basaltFactor); - rottengroundFactorProp.set(rottengroundFactor); - ligniteFactorProp.set(ligniteFactor); - if (config.hasChanged()) { config.save(); } @@ -343,7 +162,7 @@ public class TAIGAConfiguration { @SubscribeEvent(priority = EventPriority.NORMAL) public void onEvent(ConfigChangedEvent.OnConfigChangedEvent event) { if (TAIGA.MODID.equals(event.getModID()) && !event.isWorldRunning()) { - if (event.getConfigID().equals(CATEGORY_NAME_GENERAL) || event.getConfigID().equals(CATEGORY_NAME_ORE_GEN) || event.getConfigID().equals(CATEGORY_NAME_ORE_VAL)) { + if (event.getConfigID().equals(CATEGORY_NAME_GENERAL) || event.getConfigID().equals(CATEGORY_NAME_ORE_GEN)) { syncFromGUI(); } } diff --git a/src/main/java/com/sosnitzka/taiga/TAIGAGuiFactory.java b/src/main/java/com/sosnitzka/taiga/TAIGAGuiFactory.java index d75d1bc..2e41236 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGAGuiFactory.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGAGuiFactory.java @@ -45,7 +45,6 @@ public class TAIGAGuiFactory implements IModGuiFactory { List list = new ArrayList(); list.add(new DummyConfigElement.DummyCategoryElement("Basics configuration", "gui.taiga_configuration.ctgy.general", CategoryEntryGeneral.class)); list.add(new DummyConfigElement.DummyCategoryElement("Specific ore generation", "gui.taiga_configuration.ctgy.oregen", CategoryEntryOreGen.class)); - //list.add(new DummyConfigElement.DummyCategoryElement("Specific ore values", "gui.taiga_configuration.ctgy.oreval", CategoryEntryOreVal.class)); return list; } @@ -80,21 +79,5 @@ public class TAIGAGuiFactory implements IModGuiFactory { return new GuiConfig(this.owningScreen, propertiesOnThisScreen, this.owningScreen.modID, TAIGAConfiguration.CATEGORY_NAME_ORE_GEN, this.configElement.requiresWorldRestart() || this.owningScreen.allRequireWorldRestart, this.configElement.requiresMcRestart() || this.owningScreen.allRequireMcRestart, windowTitle); } } - - public static class CategoryEntryOreVal extends GuiConfigEntries.CategoryEntry { - public CategoryEntryOreVal(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement prop) { - super(owningScreen, owningEntryList, prop); - } - - @Override - protected GuiScreen buildChildScreen() { - Configuration configuration = TAIGAConfiguration.getConfig(); - ConfigElement cat_general = new ConfigElement(configuration.getCategory(TAIGAConfiguration.CATEGORY_NAME_ORE_VAL)); - List propertiesOnThisScreen = cat_general.getChildElements(); - String windowTitle = configuration.toString(); - - return new GuiConfig(this.owningScreen, propertiesOnThisScreen, this.owningScreen.modID, TAIGAConfiguration.CATEGORY_NAME_ORE_VAL, this.configElement.requiresWorldRestart() || this.owningScreen.allRequireWorldRestart, this.configElement.requiresMcRestart() || this.owningScreen.allRequireMcRestart, windowTitle); - } - } } } \ No newline at end of file diff --git a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java index 8e022fb..a3c821a 100644 --- a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java +++ b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java @@ -14,39 +14,41 @@ import java.util.Random; import static com.google.common.collect.Lists.newArrayList; import static com.sosnitzka.taiga.Blocks.*; -import static com.sosnitzka.taiga.TAIGAConfiguration.ironGen; +import static com.sosnitzka.taiga.TAIGAConfiguration.*; @SuppressWarnings("unchecked") public class WorldGen implements IWorldGenerator { private void nether(Random random, int x, int z, World world) { - Generator.generateOre(false, Blocks.NETHERRACK.getDefaultState(), tiberiumOre.getDefaultState(), random, x, z, world, 15, 0, 128, 10, 35); - Generator.generateOre(true, Blocks.NETHERRACK.getDefaultState(), prometheumOre.getDefaultState(), random, x, z, world, 25, 0, 128, 2, 4); - Generator.generateOre(true, Blocks.NETHERRACK.getDefaultState(), valyriumOre.getDefaultState(), random, x, z, world, 10, 0, 32, 2, 4); - Generator.generateOreDescending(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), osramOre.getDefaultState(), random, x, z, world, 1, 0, 64, 5); + Generator.generateOre(false, Blocks.NETHERRACK.getDefaultState(), tiberiumOre.getDefaultState(), random, x, z, world, TIBERIUM_VAL, 0, 128, 10, 35); + Generator.generateOre(true, Blocks.NETHERRACK.getDefaultState(), prometheumOre.getDefaultState(), random, x, z, world, PROMETHEUM_VAL, 0, 128, 2, 4); + Generator.generateOre(true, Blocks.NETHERRACK.getDefaultState(), valyriumOre.getDefaultState(), random, x, z, world, VALYRIUM_VAL, 0, 32, 2, 4); + Generator.generateOreDescending(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), osramOre.getDefaultState(), random, x, z, world, OSRAM_VAL, 0, 64, 15); } private void world(Random random, int x, int z, World world) { // Optional - if (!ironGen) { - Generator.generateOre(false, Blocks.STONE.getDefaultState(), Blocks.IRON_ORE.getDefaultState(), random, x, z, world, 20, 0, 128, 1, 8); - } - Generator.generateMeteor(duraniteOre.getDefaultState(), blockMeteorite.getDefaultState(), random, x, z, world, 1, 4, 16, 112); - Generator.generateOreDescending(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), basaltBlock.getDefaultState(), random, x, z, world, 10, 0, 64); - Generator.generateOreDescending(newArrayList(Blocks.BEDROCK.getDefaultState()), eezoOre.getDefaultState(), random, x, z, world, 3, 0, 10); - Generator.generateOre(karmesineOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 15, 0, 96, 3, 4, null); - Generator.generateOre(karmesineOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 15, 0, 96, 3, 4, null); - Generator.generateOre(karmesineOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 15, 0, 96, 3, 4, null); - Generator.generateOreDense(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 10, 0, 64, 2, 12, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT)); + if (ironGen) + Generator.generateOre(false, Blocks.STONE.getDefaultState(), Blocks.IRON_ORE.getDefaultState(), random, x, z, world, IRON_VAL, 0, 128, 1, 8); + System.out.println("IRON GEN: " + ironGen); + System.out.println("Duranite ore Numer: " + DURANITE_VAL); + Generator.generateMeteor(duraniteOre.getDefaultState(), blockMeteorite.getDefaultState(), random, x, z, world, DURANITE_VAL, 4, 16, 112); + Generator.generateOreDescending(newArrayList(Blocks.LAVA.getDefaultState(), Blocks.FLOWING_LAVA.getDefaultState()), basaltBlock.getDefaultState(), random, x, z, world, BASALT_VAL, 0, 64); + Generator.generateOreDescending(newArrayList(Blocks.BEDROCK.getDefaultState()), eezoOre.getDefaultState(), random, x, z, world, EEZO_VAL, 0, 10); + Generator.generateOre(karmesineOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, KARMESINE_VAL, 0, 96, 3, 4, null); + Generator.generateOre(karmesineOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, KARMESINE_VAL, 0, 96, 3, 4, null); + Generator.generateOre(karmesineOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, KARMESINE_VAL, 0, 96, 3, 4, null); + Generator.generateOreDense(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, VIBRANIUM_VAL, 0, 64, 2, 12, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT)); } private void end(Random random, int x, int z, World world) { - Generator.generateCube(true, uruOre.getDefaultState(), blockObsidiorite.getDefaultState(), random, x, z, world, 1, 2, 0, 96, 3); - Generator.generateOre(Blocks.END_STONE.getDefaultState(), Blocks.AIR.getDefaultState(), null, null, random, x, z, world, 1, 3, 64, 3, 8, null); - Generator.generateOre(false, Blocks.END_STONE.getDefaultState(), auroriumOre.getDefaultState(), random, x, z, world, 10, 32, 48, 2, 4); - Generator.generateOre(true, Blocks.END_STONE.getDefaultState(), palladiumOre.getDefaultState(), random, x, z, world, 10, 48, 64, 2, 4); - Generator.generateOreBottom(Blocks.END_STONE.getDefaultState(), abyssumOre.getDefaultState(), random, x, z, world, 12, 4, 64); + Generator.generateCube(true, uruOre.getDefaultState(), blockObsidiorite.getDefaultState(), random, x, z, world, URU_VAL, 2, 0, 96, 3); + if (endGen) + Generator.generateOre(Blocks.END_STONE.getDefaultState(), Blocks.AIR.getDefaultState(), null, null, random, x, z, world, 1, 3, 64, 3, 8, null); + Generator.generateOre(false, Blocks.END_STONE.getDefaultState(), auroriumOre.getDefaultState(), random, x, z, world, AURORIUM_VAL, 32, 48, 2, 4); + Generator.generateOre(true, Blocks.END_STONE.getDefaultState(), palladiumOre.getDefaultState(), random, x, z, world, PALLADIUM_VAL, 48, 64, 2, 4); + Generator.generateOreBottom(Blocks.END_STONE.getDefaultState(), abyssumOre.getDefaultState(), random, x, z, world, ABYSSUM_VAL, 4, 64); } @Override diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json index b135075..20fbe16 100644 --- a/src/main/resources/assets/taiga/blockstates/fluid_block.json +++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json @@ -11,6 +11,20 @@ } } ], + "magma_fluid": [ + { + "custom": { + "fluid": "magma_fluid" + } + } + ], + "nitronite_fluid": [ + { + "custom": { + "fluid": "nitronite_fluid" + } + } + ], "meteorite_fluid": [ { "custom": { diff --git a/src/main/resources/assets/taiga/lang/de_DE.lang b/src/main/resources/assets/taiga/lang/de_DE.lang index cd5a982..eacf957 100644 --- a/src/main/resources/assets/taiga/lang/de_DE.lang +++ b/src/main/resources/assets/taiga/lang/de_DE.lang @@ -1,203 +1,254 @@ -item.slagiron.name=Unreiner Eisenbarren -item.lignite.name=Braunkohle - -tile.adamantite_ore.name=Adamantiterz -tile.arcanite_ore.name=Arcaniterz -tile.basalt.name=Basalt -tile.bismuth_ore.name=Bismutherz -tile.eternite_ore.name=Eterniterz -tile.karmesine_ore.name=Karmesinerz -tile.lignite_ore.name=Braunkohleerz -tile.meteorite_ore.name=Meteoriterz -tile.mindorite_ore.name=Mindoriterz -tile.mythril_ore.name=Mythrilerz -tile.palladium_ore.name=Palladiumerz -tile.prometheum_ore.name=Prometheumerz -tile.slagiron_ore.name=Unreines Eisenerz -tile.slaggold_ore.name=Unreines Golderz -tile.tiberium_ore.name=Tiberiumerz -tile.vibranium_ore.name=Vibraniumerz -tile.rubium_ore.name=Rubiumerz -tile.titanite_ore.name=Titaniteerz -tile.ignitite_ore.name=Ignititerz -tile.violium_ore.name=Violiumerz - -item.slagiron_ingot.name=Unreiner Eisenbarren -item.slaggold_ingot.name=Unreiner Goldbarren -item.fuel_brick.name=Brennstoffziegel -item.iron_nugget.name=Eisennugget - -material.titanite.name=Titanit -material.meteorite.name=Meteorit -material.vibranium.name=Vibranium -material.adamantite.name=Adamantit -material.prometheum.name=Prometheum -material.rubium.name=Rubium +material.basalt.name=Basalt material.tiberium.name=Tiberium -material.arcanite.name=Arcanit -material.eternite.name=Eternit -material.mythril.name=Mythril +material.aurorium.name=Aurorium +material.prometheum.name=Prometheum +material.duranite.name=Duranite +material.valyrium.name=Valyrium +material.vibranium.name=Vibranium +material.karmesine.name=Karmesine material.palladium.name=Palladium -material.ignitite.name=Ignitit +material.uru.name=Uru +material.osram.name=Osram +material.abyssum.name=Abyssum +material.eezo.name=Eezo +material.triberium.name=Triberium +material.fractum.name=Fractum material.violium.name=Violium -material.bismuth.name=Bismuth -material.mindorite.name=Mindorit -material.karmesine.name=Karmesin -material.imperomite.name=Imperomit -material.fractoryte.name=Fractoryt -material.noctunyx.name=Noctunyx -material.nitronite.name=Nitronit -material.cryptogen.name=Cryptogen -material.seismodium.name=Seismodium -material.aegisalt.name=Aegisalt -material.ultranite.name=Ultranit -material.bysmuid.name=Bysmuid -material.nucleum.name=Nucleum -material.terramite.name=Terramit +material.proxii.name=Proxii +material.tritonite.name=Tritonite +material.ignitz.name=Ignitz +material.imperomite.name=Imperomite material.solarium.name=Solarium -material.lumixyl.name=Lumixyl -material.dyonite.name=Dyonit -material.proxideum.name=Proxideum +material.nihilite.name=Nihilite +material.adamant.name=Adamant +material.dyonite.name=Dyonite +material.nucleum.name=Nucleum +material.lumix.name=Lumix +material.seismum.name=Seismum material.astrium.name=Astrium +material.niob.name=Niob +material.yrdeen.name=Yrdeen +material.iox.name=Iox +material.meteorite.name=Meteorite +material.obsidiorite.name=Obsidiorite +material.magma.name=Magma +material.nitronite.name=Nitronite -tile.titanite_block.name=Titanitblock -tile.meteorite_block.name=Meteoritblock -tile.vibranium_block.name=Vibraniumblock -tile.adamantite_block.name=Adamantitblock -tile.prometheum_block.name=Prometheumblock -tile.rubium_block.name=Rubiumblock -tile.tiberium_block.name=Tiberiumblock -tile.arcanite_block.name=Arcanitblock -tile.eternite_block.name=Eternitblock -tile.mythril_block.name=Mythrilblock -tile.palladium_block.name=Palladiumblock -tile.ignitite_block.name=Ignititblock -tile.violium_block.name=Violiumblock -tile.bismuth_block.name=Bismuthblock -tile.mindorite_block.name=Mindoritblock -tile.karmesine_block.name=Karmesinblock -tile.imperomite_block.name=Imperomitblock -tile.fractoryte_block.name=Fractorytblock -tile.noctunyx_block.name=Noctunyxblock -tile.nitronite_block.name=Nitronitblock -tile.cryptogen_block.name=Cryptogenblock -tile.seismodium_block.name=Seismodiumblock -tile.aegisalt_block.name=Aegisaltblock -tile.ultranite_block.name=Ultranitblock -tile.bysmuid_block.name=Bysmuidblock -tile.nucleum_block.name=Nucleumblock -tile.terramite_block.name=Terramitblock -tile.solarium_block.name=Solariumblock -tile.lumixyl_block.name=Lumixylblock -tile.dyonite_block.name=Dyonitblock -tile.proxideum_block.name=Proxideumblock -tile.astrium_block.name=Astriumblock +tile.basalt_block.name=Basalt Block +tile.tiberium_block.name=Tiberium Block +tile.aurorium_block.name=Aurorium Block +tile.prometheum_block.name=Prometheum Block +tile.duranite_block.name=Duranite Block +tile.valyrium_block.name=Valyrium Block +tile.vibranium_block.name=Vibranium Block +tile.karmesine_block.name=Karmesine Block +tile.palladium_block.name=Palladium Block +tile.uru_block.name=Uru Block +tile.osram_block.name=Osram Block +tile.abyssum_block.name=Abyssum Block +tile.eezo_block.name=Eezo Block +tile.triberium_block.name=Triberium Block +tile.fractum_block.name=Fractum Block +tile.violium_block.name=Violium Block +tile.proxii_block.name=Proxii Block +tile.tritonite_block.name=Tritonite Block +tile.ignitz_block.name=Ignitz Block +tile.imperomite_block.name=Imperomite Block +tile.solarium_block.name=Solarium Block +tile.nihilite_block.name=Nihilite Block +tile.adamant_block.name=Adamant Block +tile.dyonite_block.name=Dyonite Block +tile.nucleum_block.name=Nucleum Block +tile.lumix_block.name=Lumix Block +tile.seismum_block.name=Seismum Block +tile.astrium_block.name=Astrium Block +tile.niob_block.name=Niob Block +tile.yrdeen_block.name=Yrdeen Block +tile.iox_block.name=Iox Block +tile.meteorite_block.name=Meteorite Block +tile.obsidiorite_block.name=Obsidiorite Block +tile.magma_block.name=Magma Block +tile.nitronite_block.name=Nitronite Block -item.titanite_ingot.name=Titanitbarren -item.meteorite_ingot.name=Meteoritbarren -item.vibranium_ingot.name=Vibraniumbarren -item.adamantite_ingot.name=Adamantitbarren -item.prometheum_ingot.name=Prometheumbarren -item.rubium_ingot.name=Rubiumbarren -item.tiberium_ingot.name=Tiberiumbarren -item.arcanite_ingot.name=Arcanitbarren -item.eternite_ingot.name=Eternitbarren -item.mythril_ingot.name=Mythrilbarren -item.palladium_ingot.name=Palladiumbarren -item.ignitite_ingot.name=Ignititbarren -item.violium_ingot.name=Violiumbarren -item.bismuth_ingot.name=Bismuthbarren -item.mindorite_ingot.name=Mindoritbarren -item.karmesine_ingot.name=Karmesinbarren -item.imperomite_ingot.name=Imperomitbarren -item.fractoryte_ingot.name=Fractorytbarren -item.noctunyx_ingot.name=Noctunyxbarren -item.nitronite_ingot.name=Nitronitbarren -item.cryptogen_ingot.name=Cryptogenbarren -item.seismodium_ingot.name=Seismodiumbarren -item.aegisalt_ingot.name=Aegisaltbarren -item.ultranite_ingot.name=Ultranitbarren -item.bysmuid_ingot.name=Bysmuidbarren -item.nucleum_ingot.name=Nucleumbarren -item.terramite_ingot.name=Terramitbarren -item.solarium_ingot.name=Solariumbarren -item.lumixyl_ingot.name=Lumixylbarren -item.dyonite_ingot.name=Dyonitbarren -item.proxideum_ingot.name=Proxideumbarren -item.astrium_ingot.name=Astriumbarren +tile.basalt_ore.name=Basalt Erz +tile.tiberium_ore.name=Tiberium Erz +tile.aurorium_ore.name=Aurorium Erz +tile.prometheum_ore.name=Prometheum Erz +tile.duranite_ore.name=Duranite Erz +tile.valyrium_ore.name=Valyrium Erz +tile.vibranium_ore.name=Vibranium Erz +tile.karmesine_ore.name=Karmesine Erz +tile.palladium_ore.name=Palladium Erz +tile.uru_ore.name=Uru Erz +tile.osram_ore.name=Osram Erz +tile.abyssum_ore.name=Abyssum Erz +tile.eezo_ore.name=Eezo Erz +tile.triberium_ore.name=Triberium Erz +tile.fractum_ore.name=Fractum Erz +tile.violium_ore.name=Violium Erz +tile.proxii_ore.name=Proxii Erz +tile.tritonite_ore.name=Tritonite Erz +tile.ignitz_ore.name=Ignitz Erz +tile.imperomite_ore.name=Imperomite Erz +tile.solarium_ore.name=Solarium Erz +tile.nihilite_ore.name=Nihilite Erz +tile.adamant_ore.name=Adamant Erz +tile.dyonite_ore.name=Dyonite Erz +tile.nucleum_ore.name=Nucleum Erz +tile.lumix_ore.name=Lumix Erz +tile.seismum_ore.name=Seismum Erz +tile.astrium_ore.name=Astrium Erz +tile.niob_ore.name=Niob Erz +tile.yrdeen_ore.name=Yrdeen Erz +tile.iox_ore.name=Iox Erz +tile.meteorite_ore.name=Meteorite Erz +tile.obsidiorite_ore.name=Obsidiorite Erz +tile.magma_ore.name=Magma Erz +tile.nitronite_ore.name=Nitronite Erz -item.titanite_nugget.name=Titanitklumpen -item.meteorite_nugget.name=Meteoritklumpen -item.vibranium_nugget.name=Vibraniumklumpen -item.adamantite_nugget.name=Adamantitklumpen -item.prometheum_nugget.name=Prometheumklumpen -item.rubium_nugget.name=Rubiumklumpen -item.tiberium_nugget.name=Tiberiumklumpen -item.arcanite_nugget.name=Arcanitklumpen -item.eternite_nugget.name=Eternitklumpen -item.mythril_nugget.name=Mythrilklumpen -item.palladium_nugget.name=Palladiumklumpen -item.ignitite_nugget.name=Ignititklumpen -item.violium_nugget.name=Violiumklumpen -item.bismuth_nugget.name=Bismuthklumpen -item.mindorite_nugget.name=Mindoritklumpen -item.karmesine_nugget.name=Karmesinklumpen -item.imperomite_nugget.name=Imperomitklumpen -item.fractoryte_nugget.name=Fractorytklumpen -item.noctunyx_nugget.name=Noctunyxklumpen -item.nitronite_nugget.name=Nitronitklumpen -item.cryptogen_nugget.name=Cryptogenklumpen -item.seismodium_nugget.name=Seismodiumklumpen -item.aegisalt_nugget.name=Aegisaltklumpen -item.ultranite_nugget.name=Ultranitklumpen -item.bysmuid_nugget.name=Bysmuidklumpen -item.nucleum_nugget.name=Nucleumklumpen -item.terramite_nugget.name=Terramitklumpen -item.solarium_nugget.name=Solariumklumpen -item.lumixyl_nugget.name=Lumixylklumpen -item.dyonite_nugget.name=Dyonitklumpen -item.proxideum_nugget.name=Proxideumklumpen -item.astrium_nugget.name=Astriumklumpen +item.basalt_nugget.name=Basalt Nugget +item.tiberium_nugget.name=Tiberium Nugget +item.aurorium_nugget.name=Aurorium Nugget +item.prometheum_nugget.name=Prometheum Nugget +item.duranite_nugget.name=Duranite Nugget +item.valyrium_nugget.name=Valyrium Nugget +item.vibranium_nugget.name=Vibranium Nugget +item.karmesine_nugget.name=Karmesine Nugget +item.palladium_nugget.name=Palladium Nugget +item.uru_nugget.name=Uru Nugget +item.osram_nugget.name=Osram Nugget +item.abyssum_nugget.name=Abyssum Nugget +item.eezo_nugget.name=Eezo Nugget +item.triberium_nugget.name=Triberium Nugget +item.fractum_nugget.name=Fractum Nugget +item.violium_nugget.name=Violium Nugget +item.proxii_nugget.name=Proxii Nugget +item.tritonite_nugget.name=Tritonite Nugget +item.ignitz_nugget.name=Ignitz Nugget +item.imperomite_nugget.name=Imperomite Nugget +item.solarium_nugget.name=Solarium Nugget +item.nihilite_nugget.name=Nihilite Nugget +item.adamant_nugget.name=Adamant Nugget +item.dyonite_nugget.name=Dyonite Nugget +item.nucleum_nugget.name=Nucleum Nugget +item.lumix_nugget.name=Lumix Nugget +item.seismum_nugget.name=Seismum Nugget +item.astrium_nugget.name=Astrium Nugget +item.niob_nugget.name=Niob Nugget +item.yrdeen_nugget.name=Yrdeen Nugget +item.iox_nugget.name=Iox Nugget +item.meteorite_nugget.name=Meteorite Nugget +item.obsidiorite_nugget.name=Obsidiorite Nugget +item.magma_nugget.name=Magma Nugget +item.nitronite_nugget.name=Nitronite Nugget -fluid.tconstruct.arcanite.name=Arcanit -fluid.tconstruct.tiberium.name=Tiberium -fluid.tconstruct.prometheum.name=Prometheum -fluid.tconstruct.rubium.name=Rubium -fluid.tconstruct.violium.name=Violium -fluid.tconstruct.bismuth.name=Bismuth -fluid.tconstruct.karmesine.name=Karmesin -fluid.tconstruct.mindorite.name=Mindorit -fluid.tconstruct.titanite.name=Titanit -fluid.tconstruct.meteorite.name=Meteorit -fluid.tconstruct.adamantite.name=Adamantit -fluid.tconstruct.vibranium.name=Vibranium -fluid.tconstruct.ignitite.name=Ignitit -fluid.tconstruct.palladium.name=Palladium -fluid.tconstruct.eternite.name=Eternit -fluid.tconstruct.mythril.name=Mythril -fluid.tconstruct.astrium.name=Astrium -fluid.tconstruct.nitronite.name=Nitronit -fluid.tconstruct.proxideum.name=Proxideum -fluid.tconstruct.noctunyx.name=Noctunyx -fluid.tconstruct.imperomite.name=Imperomit -fluid.tconstruct.cryptogen.name=Cryptogen -fluid.tconstruct.fractoryte.name=Fractoryt -fluid.tconstruct.seismodium.name=Seismodium -fluid.tconstruct.terramite.name=Terramit -fluid.tconstruct.lumixyl.name=Lumixyl -fluid.tconstruct.solarium.name=Solarium -fluid.tconstruct.dyonite.name=Dyonite -fluid.tconstruct.ultranite.name=Ultranit -fluid.tconstruct.nucleum.name=Nucleum -fluid.tconstruct.aegisalt.name=Aegisalt -fluid.tconstruct.bysmuid.name=Bysmuid -fluid.tconstruct.radiant_enderium.name=Radiant Enderium -fluid.tconstruct.glimming_enderium.name=Glimming Enderium -fluid.tconstruct.energy_enderium.name=Energy Enderium -fluid.tconstruct.glimmercoal_fluid.name=Flüssige Glimmerkohle -fluid.tconstruct.nitro_fluid.name=Flüssiges Nitro -fluid.tconstruct.anthracite_fluid.name=Flüssiges Anthracit -fluid.tconstruct.spectrum_fluid.name=Spektrumfluid +item.basalt_dust.name=Basalt Staub +item.tiberium_dust.name=Tiberium Staub +item.aurorium_dust.name=Aurorium Staub +item.prometheum_dust.name=Prometheum Staub +item.duranite_dust.name=Duranite Staub +item.valyrium_dust.name=Valyrium Staub +item.vibranium_dust.name=Vibranium Staub +item.karmesine_dust.name=Karmesine Staub +item.palladium_dust.name=Palladium Staub +item.uru_dust.name=Uru Staub +item.osram_dust.name=Osram Staub +item.abyssum_dust.name=Abyssum Staub +item.eezo_dust.name=Eezo Staub +item.triberium_dust.name=Triberium Staub +item.fractum_dust.name=Fractum Staub +item.violium_dust.name=Violium Staub +item.proxii_dust.name=Proxii Staub +item.tritonite_dust.name=Tritonite Staub +item.ignitz_dust.name=Ignitz Staub +item.imperomite_dust.name=Imperomite Staub +item.solarium_dust.name=Solarium Staub +item.nihilite_dust.name=Nihilite Staub +item.adamant_dust.name=Adamant Staub +item.dyonite_dust.name=Dyonite Staub +item.nucleum_dust.name=Nucleum Staub +item.lumix_dust.name=Lumix Staub +item.seismum_dust.name=Seismum Staub +item.astrium_dust.name=Astrium Staub +item.niob_dust.name=Niob Staub +item.yrdeen_dust.name=Yrdeen Staub +item.iox_dust.name=Iox Staub +item.meteorite_dust.name=Meteorite Staub +item.obsidiorite_dust.name=Obsidiorite Staub +item.magma_dust.name=Magma Staub +item.nitronite_dust.name=Nitronite Staub + +item.basalt_ingot.name=Basalt Barren +item.tiberium_ingot.name=Tiberium Barren +item.aurorium_ingot.name=Aurorium Barren +item.prometheum_ingot.name=Prometheum Barren +item.duranite_ingot.name=Duranite Barren +item.valyrium_ingot.name=Valyrium Barren +item.vibranium_ingot.name=Vibranium Barren +item.karmesine_ingot.name=Karmesine Barren +item.palladium_ingot.name=Palladium Barren +item.uru_ingot.name=Uru Barren +item.osram_ingot.name=Osram Barren +item.abyssum_ingot.name=Abyssum Barren +item.eezo_ingot.name=Eezo Barren +item.triberium_ingot.name=Triberium Barren +item.fractum_ingot.name=Fractum Barren +item.violium_ingot.name=Violium Barren +item.proxii_ingot.name=Proxii Barren +item.tritonite_ingot.name=Tritonite Barren +item.ignitz_ingot.name=Ignitz Barren +item.imperomite_ingot.name=Imperomite Barren +item.solarium_ingot.name=Solarium Barren +item.nihilite_ingot.name=Nihilite Barren +item.adamant_ingot.name=Adamant Barren +item.dyonite_ingot.name=Dyonite Barren +item.nucleum_ingot.name=Nucleum Barren +item.lumix_ingot.name=Lumix Barren +item.seismum_ingot.name=Seismum Barren +item.astrium_ingot.name=Astrium Barren +item.niob_ingot.name=Niob Barren +item.yrdeen_ingot.name=Yrdeen Barren +item.iox_ingot.name=Iox Barren +item.meteorite_ingot.name=Meteorite Barren +item.obsidiorite_ingot.name=Obsidiorite Barren +item.magma_ingot.name=Magma Barren +item.nitronite_ingot.name=Nitronite Barren + +fluid.tconstruct.basalt_fluid.name=Basalt Fluid +fluid.tconstruct.tiberium_fluid.name=Tiberium Fluid +fluid.tconstruct.aurorium_fluid.name=Aurorium Fluid +fluid.tconstruct.prometheum_fluid.name=Prometheum Fluid +fluid.tconstruct.duranite_fluid.name=Duranite Fluid +fluid.tconstruct.valyrium_fluid.name=Valyrium Fluid +fluid.tconstruct.vibranium_fluid.name=Vibranium Fluid +fluid.tconstruct.karmesine_fluid.name=Karmesine Fluid +fluid.tconstruct.palladium_fluid.name=Palladium Fluid +fluid.tconstruct.uru_fluid.name=Uru Fluid +fluid.tconstruct.osram_fluid.name=Osram Fluid +fluid.tconstruct.abyssum_fluid.name=Abyssum Fluid +fluid.tconstruct.eezo_fluid.name=Eezo Fluid +fluid.tconstruct.triberium_fluid.name=Triberium Fluid +fluid.tconstruct.fractum_fluid.name=Fractum Fluid +fluid.tconstruct.violium_fluid.name=Violium Fluid +fluid.tconstruct.proxii_fluid.name=Proxii Fluid +fluid.tconstruct.tritonite_fluid.name=Tritonite Fluid +fluid.tconstruct.ignitz_fluid.name=Ignitz Fluid +fluid.tconstruct.imperomite_fluid.name=Imperomite Fluid +fluid.tconstruct.solarium_fluid.name=Solarium Fluid +fluid.tconstruct.nihilite_fluid.name=Nihilite Fluid +fluid.tconstruct.adamant_fluid.name=Adamant Fluid +fluid.tconstruct.dyonite_fluid.name=Dyonite Fluid +fluid.tconstruct.nucleum_fluid.name=Nucleum Fluid +fluid.tconstruct.lumix_fluid.name=Lumix Fluid +fluid.tconstruct.seismum_fluid.name=Seismum Fluid +fluid.tconstruct.astrium_fluid.name=Astrium Fluid +fluid.tconstruct.niob_fluid.name=Niob Fluid +fluid.tconstruct.yrdeen_fluid.name=Yrdeen Fluid +fluid.tconstruct.iox_fluid.name=Iox Fluid +fluid.tconstruct.meteorite_fluid.name=Meteorite Fluid +fluid.tconstruct.obsidiorite_fluid.name=Obsidiorite Fluid +fluid.tconstruct.magma_fluid.name=Magma Fluid +fluid.tconstruct.nitronite_fluid.name=Nitronite Fluid modifier.analysing.name=Analysierend modifier.analysing.desc=§oIch kenne dich!§r\ERFAHRRRUNG! @@ -254,19 +305,6 @@ modifier.reviving.desc=§oTöte es doch endlich!§r\Zombies!? modifier.melting.name=Schmelzend modifier.melting.desc=§oUnendlich heiß!§r\Burrrrrrn! - -item.glimmercoal.name=Glimmerkohle -item.glimmer_pearl.name=Glimmerperle -item.glimmerstone_dust.name=Glimmerstein Staub -item.energy_pearl.name=Energieperle -item.nitro_brick.name=Nitroziegel -item.anthracite_dust.name=Anthracitstaub -item.spectrum_dust.name=Spektrumstaub -item.tiberium_shard_instable.name=Instabile Tiberiumscherbe -item.tiberium_nugget.name=Tiberium Nugget -item.radiant_pearl.name=Radiumperle -item.luminar_dust.name=Luminarstaub - gui.taiga_configuration.mainTitle=TAIGA Configuration itemGroup.taiga_block=TAIGA Blocks itemGroup.taiga_item=TAIGA Items \ 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 669205d..557c5af 100644 --- a/src/main/resources/assets/taiga/lang/en_US.lang +++ b/src/main/resources/assets/taiga/lang/en_US.lang @@ -1,203 +1,254 @@ -item.slagiron.name=Slagiron Bar -item.lignite.name=Lignite - -tile.adamantite_ore.name=Adamantite Ore -tile.arcanite_ore.name=Arcanite Ore -tile.basalt.name=Basalt -tile.bismuth_ore.name=Bismuth Ore -tile.eternite_ore.name=Eternite Ore -tile.karmesine_ore.name=Karmesine Ore -tile.lignite_ore.name=Lignite Ore -tile.meteorite_ore.name=Meteorite Ore -tile.mindorite_ore.name=Mindorite Ore -tile.mythril_ore.name=Mythril Ore -tile.palladium_ore.name=Palladium Ore -tile.prometheum_ore.name=Prometheum Ore -tile.slagiron_ore.name=Slagiron Ore -tile.slaggold_ore.name=Slaggold Ore -tile.tiberium_ore.name=Tiberium Ore -tile.vibranium_ore.name=Vibranium Ore -tile.rubium_ore.name=Rubium Ore -tile.titanite_ore.name=Titanite Ore -tile.ignitite_ore.name=Ignitite Ore -tile.violium_ore.name=Violium Ore - -item.slagiron_ingot.name=Slagiron Ingot -item.slaggold_ingot.name=Slaggold Ingot -item.fuel_brick.name=Fuelbrick -item.iron_nugget.name=Iron Nugget - -material.titanite.name=Titanite -material.meteorite.name=Meteorite -material.vibranium.name=Vibranium -material.adamantite.name=Adamantite -material.prometheum.name=Prometheum -material.rubium.name=Rubium +material.basalt.name=Basalt material.tiberium.name=Tiberium -material.arcanite.name=Arcanite -material.eternite.name=Eternite -material.mythril.name=Mythril -material.palladium.name=Palladium -material.ignitite.name=Ignitite -material.violium.name=Violium -material.bismuth.name=Bismuth -material.mindorite.name=Mindorite +material.aurorium.name=Aurorium +material.prometheum.name=Prometheum +material.duranite.name=Duranite +material.valyrium.name=Valyrium +material.vibranium.name=Vibranium material.karmesine.name=Karmesine +material.palladium.name=Palladium +material.uru.name=Uru +material.osram.name=Osram +material.abyssum.name=Abyssum +material.eezo.name=Eezo +material.triberium.name=Triberium +material.fractum.name=Fractum +material.violium.name=Violium +material.proxii.name=Proxii +material.tritonite.name=Tritonite +material.ignitz.name=Ignitz material.imperomite.name=Imperomite -material.fractoryte.name=Fractoryte -material.noctunyx.name=Noctunyx -material.nitronite.name=Nitronite -material.cryptogen.name=Cryptogen -material.seismodium.name=Seismodium -material.aegisalt.name=Aegisalt -material.ultranite.name=Ultranite -material.bysmuid.name=Bysmuid -material.nucleum.name=Nucleum -material.terramite.name=Terramite material.solarium.name=Solarium -material.lumixyl.name=Lumixyl +material.nihilite.name=Nihilite +material.adamant.name=Adamant material.dyonite.name=Dyonite -material.proxideum.name=Proxideum +material.nucleum.name=Nucleum +material.lumix.name=Lumix +material.seismum.name=Seismum material.astrium.name=Astrium +material.niob.name=Niob +material.yrdeen.name=Yrdeen +material.iox.name=Iox +material.meteorite.name=Meteorite +material.obsidiorite.name=Obsidiorite +material.magma.name=Magma +material.nitronite.name=Nitronite -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 -tile.vibranium_block.name=Vibranium Block -tile.adamantite_block.name=Adamantite Block -tile.prometheum_block.name=Prometheum Block -tile.rubium_block.name=Rubium Block +tile.basalt_block.name=Basalt Block tile.tiberium_block.name=Tiberium Block -tile.arcanite_block.name=Arcanite Block -tile.eternite_block.name=Eternite Block -tile.mythril_block.name=Mythril Block -tile.palladium_block.name=Palladium Block -tile.ignitite_block.name=Ignitite Block -tile.violium_block.name=Violium Block -tile.bismuth_block.name=Bismuth Block -tile.mindorite_block.name=Mindorite Block +tile.aurorium_block.name=Aurorium Block +tile.prometheum_block.name=Prometheum Block +tile.duranite_block.name=Duranite Block +tile.valyrium_block.name=Valyrium Block +tile.vibranium_block.name=Vibranium Block tile.karmesine_block.name=Karmesine Block +tile.palladium_block.name=Palladium Block +tile.uru_block.name=Uru Block +tile.osram_block.name=Osram Block +tile.abyssum_block.name=Abyssum Block +tile.eezo_block.name=Eezo Block +tile.triberium_block.name=Triberium Block +tile.fractum_block.name=Fractum Block +tile.violium_block.name=Violium Block +tile.proxii_block.name=Proxii Block +tile.tritonite_block.name=Tritonite Block +tile.ignitz_block.name=Ignitz Block tile.imperomite_block.name=Imperomite Block -tile.fractoryte_block.name=Fractoryte Block -tile.noctunyx_block.name=Noctunyx Block -tile.nitronite_block.name=Nitronite Block -tile.cryptogen_block.name=Cryptogen Block -tile.seismodium_block.name=Seismodium Block -tile.aegisalt_block.name=Aegisalt Block -tile.ultranite_block.name=Ultranite Block -tile.bysmuid_block.name=Bysmuid Block -tile.nucleum_block.name=Nucleum Block -tile.terramite_block.name=Terramite Block tile.solarium_block.name=Solarium Block -tile.lumixyl_block.name=Lumixyl Block +tile.nihilite_block.name=Nihilite Block +tile.adamant_block.name=Adamant Block tile.dyonite_block.name=Dyonite Block -tile.proxideum_block.name=Proxideum Block +tile.nucleum_block.name=Nucleum Block +tile.lumix_block.name=Lumix Block +tile.seismum_block.name=Seismum Block tile.astrium_block.name=Astrium Block +tile.niob_block.name=Niob Block +tile.yrdeen_block.name=Yrdeen Block +tile.iox_block.name=Iox Block +tile.meteorite_block.name=Meteorite Block +tile.obsidiorite_block.name=Obsidiorite Block +tile.magma_block.name=Magma Block +tile.nitronite_block.name=Nitronite Block -item.titanite_ingot.name=Titanite Ingot -item.meteorite_ingot.name=Meteorite Ingot -item.vibranium_ingot.name=Vibranium Ingot -item.adamantite_ingot.name=Adamantite Ingot -item.prometheum_ingot.name=Prometheum Ingot -item.rubium_ingot.name=Rubium Ingot -item.tiberium_ingot.name=Tiberium Ingot -item.arcanite_ingot.name=Arcanite Ingot -item.eternite_ingot.name=Eternite Ingot -item.mythril_ingot.name=Mythril Ingot -item.palladium_ingot.name=Palladium Ingot -item.ignitite_ingot.name=Ignitite Ingot -item.violium_ingot.name=Violium Ingot -item.bismuth_ingot.name=Bismuth Ingot -item.mindorite_ingot.name=Mindorite Ingot -item.karmesine_ingot.name=Karmesine Ingot -item.imperomite_ingot.name=Imperomite Ingot -item.fractoryte_ingot.name=Fractoryte Ingot -item.noctunyx_ingot.name=Noctunyx Ingot -item.nitronite_ingot.name=Nitronite Ingot -item.cryptogen_ingot.name=Cryptogen Ingot -item.seismodium_ingot.name=Seismodium Ingot -item.aegisalt_ingot.name=Aegisalt Ingot -item.ultranite_ingot.name=Ultranite Ingot -item.bysmuid_ingot.name=Bysmuid Ingot -item.nucleum_ingot.name=Nucleum Ingot -item.terramite_ingot.name=Terramite Ingot -item.solarium_ingot.name=Solarium Ingot -item.lumixyl_ingot.name=Lumixyl Ingot -item.dyonite_ingot.name=Dyonite Ingot -item.proxideum_ingot.name=Proxideum Ingot -item.astrium_ingot.name=Astrium Ingot +tile.basalt_ore.name=Basalt Ore +tile.tiberium_ore.name=Tiberium Ore +tile.aurorium_ore.name=Aurorium Ore +tile.prometheum_ore.name=Prometheum Ore +tile.duranite_ore.name=Duranite Ore +tile.valyrium_ore.name=Valyrium Ore +tile.vibranium_ore.name=Vibranium Ore +tile.karmesine_ore.name=Karmesine Ore +tile.palladium_ore.name=Palladium Ore +tile.uru_ore.name=Uru Ore +tile.osram_ore.name=Osram Ore +tile.abyssum_ore.name=Abyssum Ore +tile.eezo_ore.name=Eezo Ore +tile.triberium_ore.name=Triberium Ore +tile.fractum_ore.name=Fractum Ore +tile.violium_ore.name=Violium Ore +tile.proxii_ore.name=Proxii Ore +tile.tritonite_ore.name=Tritonite Ore +tile.ignitz_ore.name=Ignitz Ore +tile.imperomite_ore.name=Imperomite Ore +tile.solarium_ore.name=Solarium Ore +tile.nihilite_ore.name=Nihilite Ore +tile.adamant_ore.name=Adamant Ore +tile.dyonite_ore.name=Dyonite Ore +tile.nucleum_ore.name=Nucleum Ore +tile.lumix_ore.name=Lumix Ore +tile.seismum_ore.name=Seismum Ore +tile.astrium_ore.name=Astrium Ore +tile.niob_ore.name=Niob Ore +tile.yrdeen_ore.name=Yrdeen Ore +tile.iox_ore.name=Iox Ore +tile.meteorite_ore.name=Meteorite Ore +tile.obsidiorite_ore.name=Obsidiorite Ore +tile.magma_ore.name=Magma Ore +tile.nitronite_ore.name=Nitronite Ore -item.titanite_nugget.name=Titanite Nugget -item.meteorite_nugget.name=Meteorite Nugget -item.vibranium_nugget.name=Vibranium Nugget -item.adamantite_nugget.name=Adamantite Nugget -item.prometheum_nugget.name=Prometheum Nugget -item.rubium_nugget.name=Rubium Nugget +item.basalt_nugget.name=Basalt Nugget item.tiberium_nugget.name=Tiberium Nugget -item.arcanite_nugget.name=Arcanite Nugget -item.eternite_nugget.name=Eternite Nugget -item.mythril_nugget.name=Mythril Nugget -item.palladium_nugget.name=Palladium Nugget -item.ignitite_nugget.name=Ignitite Nugget -item.violium_nugget.name=Violium Nugget -item.bismuth_nugget.name=Bismuth Nugget -item.mindorite_nugget.name=Mindorite Nugget +item.aurorium_nugget.name=Aurorium Nugget +item.prometheum_nugget.name=Prometheum Nugget +item.duranite_nugget.name=Duranite Nugget +item.valyrium_nugget.name=Valyrium Nugget +item.vibranium_nugget.name=Vibranium Nugget item.karmesine_nugget.name=Karmesine Nugget +item.palladium_nugget.name=Palladium Nugget +item.uru_nugget.name=Uru Nugget +item.osram_nugget.name=Osram Nugget +item.abyssum_nugget.name=Abyssum Nugget +item.eezo_nugget.name=Eezo Nugget +item.triberium_nugget.name=Triberium Nugget +item.fractum_nugget.name=Fractum Nugget +item.violium_nugget.name=Violium Nugget +item.proxii_nugget.name=Proxii Nugget +item.tritonite_nugget.name=Tritonite Nugget +item.ignitz_nugget.name=Ignitz Nugget item.imperomite_nugget.name=Imperomite Nugget -item.fractoryte_nugget.name=Fractoryte Nugget -item.noctunyx_nugget.name=Noctunyx Nugget -item.nitronite_nugget.name=Nitronite Nugget -item.cryptogen_nugget.name=Cryptogen Nugget -item.seismodium_nugget.name=Seismodium Nugget -item.aegisalt_nugget.name=Aegisalt Nugget -item.ultranite_nugget.name=Ultranite Nugget -item.bysmuid_nugget.name=Bysmuid Nugget -item.nucleum_nugget.name=Nucleum Nugget -item.terramite_nugget.name=Terramite Nugget item.solarium_nugget.name=Solarium Nugget -item.lumixyl_nugget.name=Lumixyl Nugget +item.nihilite_nugget.name=Nihilite Nugget +item.adamant_nugget.name=Adamant Nugget item.dyonite_nugget.name=Dyonite Nugget -item.proxideum_nugget.name=Proxideum Nugget +item.nucleum_nugget.name=Nucleum Nugget +item.lumix_nugget.name=Lumix Nugget +item.seismum_nugget.name=Seismum Nugget item.astrium_nugget.name=Astrium Nugget +item.niob_nugget.name=Niob Nugget +item.yrdeen_nugget.name=Yrdeen Nugget +item.iox_nugget.name=Iox Nugget +item.meteorite_nugget.name=Meteorite Nugget +item.obsidiorite_nugget.name=Obsidiorite Nugget +item.magma_nugget.name=Magma Nugget +item.nitronite_nugget.name=Nitronite Nugget + +item.basalt_dust.name=Basalt Dust +item.tiberium_dust.name=Tiberium Dust +item.aurorium_dust.name=Aurorium Dust +item.prometheum_dust.name=Prometheum Dust +item.duranite_dust.name=Duranite Dust +item.valyrium_dust.name=Valyrium Dust +item.vibranium_dust.name=Vibranium Dust +item.karmesine_dust.name=Karmesine Dust +item.palladium_dust.name=Palladium Dust +item.uru_dust.name=Uru Dust +item.osram_dust.name=Osram Dust +item.abyssum_dust.name=Abyssum Dust +item.eezo_dust.name=Eezo Dust +item.triberium_dust.name=Triberium Dust +item.fractum_dust.name=Fractum Dust +item.violium_dust.name=Violium Dust +item.proxii_dust.name=Proxii Dust +item.tritonite_dust.name=Tritonite Dust +item.ignitz_dust.name=Ignitz Dust +item.imperomite_dust.name=Imperomite Dust +item.solarium_dust.name=Solarium Dust +item.nihilite_dust.name=Nihilite Dust +item.adamant_dust.name=Adamant Dust +item.dyonite_dust.name=Dyonite Dust +item.nucleum_dust.name=Nucleum Dust +item.lumix_dust.name=Lumix Dust +item.seismum_dust.name=Seismum Dust +item.astrium_dust.name=Astrium Dust +item.niob_dust.name=Niob Dust +item.yrdeen_dust.name=Yrdeen Dust +item.iox_dust.name=Iox Dust +item.meteorite_dust.name=Meteorite Dust +item.obsidiorite_dust.name=Obsidiorite Dust +item.magma_dust.name=Magma Dust +item.nitronite_dust.name=Nitronite Dust + +item.basalt_ingot.name=Basalt Ingot +item.tiberium_ingot.name=Tiberium Ingot +item.aurorium_ingot.name=Aurorium Ingot +item.prometheum_ingot.name=Prometheum Ingot +item.duranite_ingot.name=Duranite Ingot +item.valyrium_ingot.name=Valyrium Ingot +item.vibranium_ingot.name=Vibranium Ingot +item.karmesine_ingot.name=Karmesine Ingot +item.palladium_ingot.name=Palladium Ingot +item.uru_ingot.name=Uru Ingot +item.osram_ingot.name=Osram Ingot +item.abyssum_ingot.name=Abyssum Ingot +item.eezo_ingot.name=Eezo Ingot +item.triberium_ingot.name=Triberium Ingot +item.fractum_ingot.name=Fractum Ingot +item.violium_ingot.name=Violium Ingot +item.proxii_ingot.name=Proxii Ingot +item.tritonite_ingot.name=Tritonite Ingot +item.ignitz_ingot.name=Ignitz Ingot +item.imperomite_ingot.name=Imperomite Ingot +item.solarium_ingot.name=Solarium Ingot +item.nihilite_ingot.name=Nihilite Ingot +item.adamant_ingot.name=Adamant Ingot +item.dyonite_ingot.name=Dyonite Ingot +item.nucleum_ingot.name=Nucleum Ingot +item.lumix_ingot.name=Lumix Ingot +item.seismum_ingot.name=Seismum Ingot +item.astrium_ingot.name=Astrium Ingot +item.niob_ingot.name=Niob Ingot +item.yrdeen_ingot.name=Yrdeen Ingot +item.iox_ingot.name=Iox Ingot +item.meteorite_ingot.name=Meteorite Ingot +item.obsidiorite_ingot.name=Obsidiorite Ingot +item.magma_ingot.name=Magma Ingot +item.nitronite_ingot.name=Nitronite Ingot + +fluid.tconstruct.basalt_fluid.name=Basalt Fluid +fluid.tconstruct.tiberium_fluid.name=Tiberium Fluid +fluid.tconstruct.aurorium_fluid.name=Aurorium Fluid +fluid.tconstruct.prometheum_fluid.name=Prometheum Fluid +fluid.tconstruct.duranite_fluid.name=Duranite Fluid +fluid.tconstruct.valyrium_fluid.name=Valyrium Fluid +fluid.tconstruct.vibranium_fluid.name=Vibranium Fluid +fluid.tconstruct.karmesine_fluid.name=Karmesine Fluid +fluid.tconstruct.palladium_fluid.name=Palladium Fluid +fluid.tconstruct.uru_fluid.name=Uru Fluid +fluid.tconstruct.osram_fluid.name=Osram Fluid +fluid.tconstruct.abyssum_fluid.name=Abyssum Fluid +fluid.tconstruct.eezo_fluid.name=Eezo Fluid +fluid.tconstruct.triberium_fluid.name=Triberium Fluid +fluid.tconstruct.fractum_fluid.name=Fractum Fluid +fluid.tconstruct.violium_fluid.name=Violium Fluid +fluid.tconstruct.proxii_fluid.name=Proxii Fluid +fluid.tconstruct.tritonite_fluid.name=Tritonite Fluid +fluid.tconstruct.ignitz_fluid.name=Ignitz Fluid +fluid.tconstruct.imperomite_fluid.name=Imperomite Fluid +fluid.tconstruct.solarium_fluid.name=Solarium Fluid +fluid.tconstruct.nihilite_fluid.name=Nihilite Fluid +fluid.tconstruct.adamant_fluid.name=Adamant Fluid +fluid.tconstruct.dyonite_fluid.name=Dyonite Fluid +fluid.tconstruct.nucleum_fluid.name=Nucleum Fluid +fluid.tconstruct.lumix_fluid.name=Lumix Fluid +fluid.tconstruct.seismum_fluid.name=Seismum Fluid +fluid.tconstruct.astrium_fluid.name=Astrium Fluid +fluid.tconstruct.niob_fluid.name=Niob Fluid +fluid.tconstruct.yrdeen_fluid.name=Yrdeen Fluid +fluid.tconstruct.iox_fluid.name=Iox Fluid +fluid.tconstruct.meteorite_fluid.name=Meteorite Fluid +fluid.tconstruct.obsidiorite_fluid.name=Obsidiorite Fluid +fluid.tconstruct.magma_fluid.name=Magma Fluid +fluid.tconstruct.nitronite_fluid.name=Nitronite Fluid modifier.analysing.name=Analysing modifier.analysing.desc=§oI know what you are!§r\nKill them, get all their knowledge, ignore loot. @@ -254,19 +305,6 @@ modifier.reviving.desc=§oPlease kill it already!§r\Zombies!? modifier.melting.name=Melting modifier.melting.desc=§oSo damn hot!§r\Burrrrrrn! - -item.glimmercoal.name=Glimmercoal -item.glimmer_pearl.name=Glimmerpearl -item.glimmerstone_dust.name=Glimmerstone Dust -item.energy_pearl.name=Energy Pearl -item.nitro_brick.name=Nitro Brick -item.anthracite_dust.name=Anthracite Dust -item.spectrum_dust.name=Spectrum Dust -item.tiberium_shard_instable.name=Unstable Tiberium Shard -item.tiberium_nugget.name=Tiberium Nugget -item.radiant_pearl.name=Radiant Pearl -item.luminar_dust.name=Luminar Dust - gui.taiga_configuration.mainTitle=TAIGA Configuration itemGroup.taiga_block=TAIGA Blocks itemGroup.taiga_item=TAIGA Items \ No newline at end of file diff --git a/src/main/resources/assets/taiga/textures/items/dust/triberium.png b/src/main/resources/assets/taiga/textures/items/dust/triberium.png new file mode 100644 index 0000000000000000000000000000000000000000..70b0d8ca2573b94eb7dac11fe8a3229d0f29071d GIT binary patch literal 16066 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qnj%#etZ2wxwokg&dz0$52&wylyQ$U=n(-v9;Y{GwC^Q$17NWCJ5Z1#?S1LsL_8b0ZxEBLhPd zeFH;%Lt|Y-ODhu-D+2=sC{VKFQczH^DN0GR3UYCST33{kW~-D@Qc_^0uU}qXu2*iX zmtT~wZ)j<0sc&GUZ)Bufl#-@fT$xvrSfQI&tPC*(W{yj0adJ^+K}lwQo&w0+#H9Sv z5?duDkVQ~i6`&SXl^ABV%1lWkzbNuoRN>iO1Lymiz{*qe0|||V|8zCE>^3HOI*uJ@arrNsVqp< z4@xc0FD*(=buCNHD^bSg`;yEwMC72j0VIRd?Wq-+IJALeAlkr50TM$t6}bgg&PAz- zCHX}m`T03^kW>}`3ql2FXK<=g&Fq(6f1LAC#HeZ2C8=gGT%Vd^qmLqra27-l$SR0}Ow8ycE(kERG$X|#x)(v7fdmCOfZ>I= zQHYVTm4T&|sUfWJMpA{_5Y+G_qF#ZRimDB_@yQv9dFiPscKR@%!35B?4Ca_4t~`VU z42dy^y~>0b1&&|za6&{sY7`8%n1jS8YMBTtXEDoA8&GS>%D*TxHLoNQT<#g#=wpZ> z!UCc`0#uIXl!Dcp8yOfF80Z^_fT__ZQSqiaRz49&|du``0&h9-=p3)G~8 zv^Rna5|dNy%uG#Okih0%2cWLBi+M7U(;rsfrA=I7ZNnnCrTOJLO)iAy7r1XLp= zs*w5#;A#va8sy?;$7Q1r?%sg9I$$YyokJ@I)M2zT9%AmOC6I6+k{k^#A_EGdY&5ta z;Xoug8eBvM6hzr*a6!U>NOCl|hzux*veDpzgaeV}XmAl3P!MIK!37BiBFWLsqfNH`Eljs_Qz0R>Su8eEWYAd(yn zE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb(f`kK+qqrn9U z2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr! zHX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fL_0a$K*np;~(X%xmjI5h`c!Z&tY>to42(@gn{}C zr=u}z+Ac8rzcg@sDZ;<4GT?M;M_TF1W|q^7>}U1O^P0jVDzwqrw)sV3&Wgz9sf%uZ z{&q!i+kqDe?e8B}|Jd{3bo+XSBl~-P>~Hj%?{YU*JId)_^?{3fn$KrzxdlC)Sk_>% zu9rFMgGSrUj)_^vJz^it4LtPoT#gxw$+xGU6c;X7ANSb%()sW#4*hULIcwkI{JdM1 z`*lO@I%ibQWL+olkg2<3#&OpZ1xAMPjaBLV=^>px2mXF^N(;Z!;;X-_a^iOFykm9q zQh!xjGVhvu+}QO8d)eoNZzB8t{awPiHP(_xx8lc)oJXZwdR|soI^OLQ+xYoSu%WE; z?-vz`Pw!Q;TjwgtuE>};<40isx3!ZVMrfX2ochK0X>qpE{CDB)FC=aKUQcdb@i(mN zjwFMwV)wKMg7e(Y8&3c9Awd7xv(ty~$k{q7ggD$@&^vKylnie)XV25l9)}})^q!b? zw%yyya`-BX)A1LT!4AI{@TyMeEmCH`IbU^7mufM$-%+JGU9Lw8J72B7t?@DM;gWJ| p)3v)N{Ed7R{-giEGMmf480N^I;M#ik=Woz1b5B=4mvv4FO#pP(ycPfe literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/taiga/textures/items/ingot/triberium.png b/src/main/resources/assets/taiga/textures/items/ingot/triberium.png new file mode 100644 index 0000000000000000000000000000000000000000..1577e4a22c6f55606ae8351451a823b925f29b6f GIT binary patch literal 15955 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tY8nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAchENr<6|m63s!p{2HgA>0fk zmFQ-qmL#SmmLw8o3bI-xb5fG6((;RP6HDwea}(23^$YUSZS)a>NGjo}%E~!EC%?!y zKPA=9*hU|lFp@5CO0)9JD=taQOHTE4v8%`}(96tBu`*9iG`2`fGu1UnGBMFLGBmN! zO*Bk1&`mQkH#bf(wzNn!u>=RAuP?H845MB0lS@Il#nZ(OQm~}tCugQuA)IBJlxCTh zXqKd#n38IuYiO8irfXqtZmyeRmS}2WXr5?bY-j|t2+1%Ei~Nf+(=+oDbCA@4{F0KH zVr6PgqdX%u4`23z7zI{^+mPb?w370~qEyH9)Vva6az4aV zRBhhs=)yaFXfCvjEt=eEUiopVWk`-z`&|-8-g01L=?afQ&F|yHaSu8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb( zf`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3 zf+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=# zBpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&G zMA>L?LBfGZ5^r#EAvWKp=B3ywl`GlX8C*CT&cMK+kn9oU%fL{j%D~Xj%)s#TKLbO< zO9qBg0|tgy2@DKYGZ+}e^C!h0bz@*)QulOm45_$vWOA&>O_j-xE*+_!8E%eEDrSM= znI#L|H21v!w_lHCu@dK=7YBC!k*$zBC)g0tb#xMQNa$a6@eoas5N!shj`?>M1q9Az z^>;Q<6<=GUGVy(s$ny2An=%gEoV`$HeVE3o%^!UFlVYxYa($PgHsQ#MIKSH^DqFvY z>9lZ!hPFO;GPwCP?NWE|ovQ78@e7&?D`)VlJW!v-`R(%JqaU5NUtXEJ)cdxN&$1c& zmu~P{xW=+abMK`5O?@XDx;2w#Ot@XK)bizw&Zj4Hn6_7cpHLn5@QA2(WhmEl`L$}6 z#~TW&n_te)UUFUhWPn2dcB5JB@!vlc96R_pQhjRq;ez;0lOFRf`uJ3jjfq`yO4+V0 zx=VKObSz$)R?}$wBh{vT&*~MmdCO~$xIOF@u(|G>A$#-0gr0N>>*OUyZd`YNl|`{# zn;e+t^kk07<;B)Nbnbq6&3DPmH>P&)v|sN`c}~^-DEQE+a?is$_psS4tHYVEc$P2A zRehPN*7ABv=QBfT*;TxR%9#xp_goMpJTcn347wmvrt=(mLF(zntGyaqHGeXSSZUC{MR!FXB~s zE?sa{qrSav`sO1i-laGutz(=Uu~A~jg(Ls>9g}Bfn0ZfAvGve=7SOhDPgg&ebxsLQ E0Q(G~*#H0l literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/taiga/textures/items/nugget/triberium.png b/src/main/resources/assets/taiga/textures/items/nugget/triberium.png new file mode 100644 index 0000000000000000000000000000000000000000..7b524ba123a31f444a8aa2b8a1f3a110f04fdc02 GIT binary patch literal 15605 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_tY8nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhJ1(0FtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rh2Bj$p%J-3g(u2hNh_{ffi_eM3D1eQcUilHqy^N{e#9PD@GFPt8fq zP0cGQ);H8M#Hz0#BfliSI3pj2m2hdC7FXmJ`1-=_#_HbOT&z|Xm$;Ud;MZ9kQdy9y zACy|0Us{x$>ROhXSE7u~_a&KWh{!>414ss^+fyqtacBd{K(v9A0wjiPDsl^~oQqNu zOY)0C^7C`-AgL?>7K94U&frv~pb?&#my%yztZAchENr<6|m63s!v5B^UA>0fk zmFQ-qmL#SmmLw8o3bI-xb5fG6((;RP6HDwea}(23^$YUSZS)a>NGjo}%E~!EC%?!y zKPA=9*hU|lFp@5CO0)9JD=taQOHTE4v8%`}(96tBu`)3gqdX%u4`23z7zI{^+mPb?w370~qEyH9)Vva6az4aV zRBhhs=)yaFXfCvjEt=eEUiopVWk`-z`&|-8-g01L=?afQ&F|yHaSu8eEWYAd(ynE+PX8qHHv{AmKnHIT~C<1{6fuXmCNofk<*RxQGlWh_cb( zf`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3 zf+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=# zBpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&G zMA>L?LBfGZ5^r#EAvWKp=B3ywl`GlX&Ho<~z`($ukn9oU%fL{j%D~Xj%)s#TKLbO< zO9qBg0|tgy2@DKYGZ+}e^C!h0bz@*)IO*x)7*cU7>Bs;7_ROj?5@$#)Shnogglk9s z?ay6&=>PQlCI2SpIOIs4{(tzp*MIw;@&ErHvcCV{JFoJe`pJgp_r?C!|5bnU|7*SJ z|LgXBKjrVA`Dedy-dp>NY%&$Wzw2M#ZTKG@pZeeb^@E@H_g?<}f6wc0|2?^mq<#%>GHv6;#U7J@3Q#+d`qFhgwz8ZC%GFK84QzOYOS2K>@;X&vZt$`%Q~lo FCIDB$7#IKm literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/taiga/textures/materials/triberium.png b/src/main/resources/assets/taiga/textures/materials/triberium.png new file mode 100644 index 0000000000000000000000000000000000000000..f3939ebb9257825fdfa851e5859ddccf0d7779c0 GIT binary patch literal 18957 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 E0L)NBl>h($ literal 0 HcmV?d00001