From 18bd88e7f98bb62d704d933341599bbb7b2ce3c7 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Sun, 1 Jan 2017 21:39:02 +0100 Subject: [PATCH] Added Dilithium Ore and assigned crystals. Added some Book pages as a test (need to be fixed before next release). Removed deprecated stuff. Removed 2016, Added 2017. --- src/main/java/com/sosnitzka/taiga/Blocks.java | 8 +- src/main/java/com/sosnitzka/taiga/Fluids.java | 12 +- src/main/java/com/sosnitzka/taiga/Items.java | 6 + .../com/sosnitzka/taiga/MaterialTraits.java | 5 +- src/main/java/com/sosnitzka/taiga/TAIGA.java | 5 + .../sosnitzka/taiga/TAIGAConfiguration.java | 10 ++ .../sosnitzka/taiga/blocks/BlockTiberium.java | 2 +- .../com/sosnitzka/taiga/generic/BlockOre.java | 62 +++++++ .../sosnitzka/taiga/proxy/ClientProxy.java | 1 + .../taiga/recipes/SmeltingRegistry.java | 2 - .../taiga/traits/TraitDeflection.java | 16 ++ .../sosnitzka/taiga/traits/TraitLeveled.java | 16 ++ .../java/com/sosnitzka/taiga/util/Utils.java | 1 + .../com/sosnitzka/taiga/world/WorldGen.java | 4 +- .../taiga/blockstates/dilithium_block.json | 18 ++ .../taiga/blockstates/dilithium_ore.json | 18 ++ .../assets/taiga/blockstates/fluid_block.json | 7 + .../taiga/book/en_US/intro/welcome.json | 8 - .../taiga/book/en_US/ores/firstwords.json | 20 +++ .../assets/taiga/book/en_US/ores/intro.json | 11 ++ .../taiga/book/en_US/ores/multiblock.json | 3 + .../taiga/book/en_US/ores/structure.json | 12 ++ .../resources/assets/taiga/book/index.json | 4 +- .../assets/taiga/book/sections/intro.json | 14 +- .../resources/assets/taiga/lang/en_US.lang | 11 ++ .../taiga/models/item/dilithium_crystal.json | 6 + .../taiga/models/item/dilithium_dust.json | 6 + .../taiga/models/item/dilithium_ingot.json | 6 + .../taiga/models/item/dilithium_nugget.json | 6 + .../taiga/models/item/tiberium_crystal.json | 6 + .../taiga/textures/blocks/block/dilithium.png | Bin 0 -> 16440 bytes .../taiga/textures/blocks/block/duranite.png | Bin 16512 -> 16887 bytes .../taiga/textures/blocks/ore/aurorium.png | Bin 16317 -> 16333 bytes .../taiga/textures/blocks/ore/dilithium.png | Bin 0 -> 16436 bytes .../taiga/textures/blocks/ore/jauxum.png | Bin 15703 -> 16192 bytes .../taiga/textures/blocks/ore/karmesine.png | Bin 16413 -> 16416 bytes .../taiga/textures/blocks/ore/ovium.png | Bin 16350 -> 16349 bytes .../taiga/textures/blocks/ore/palladium.png | Bin 16268 -> 16242 bytes .../taiga/textures/blocks/ore/prometheum.png | Bin 16359 -> 16381 bytes .../taiga/textures/blocks/ore/tiberium.png | Bin 16507 -> 16507 bytes .../assets/taiga/textures/blocks/ore/uru.png | Bin 17057 -> 17071 bytes .../taiga/textures/blocks/ore/valyrium.png | Bin 16402 -> 16402 bytes .../taiga/textures/blocks/ore/vibranium.png | Bin 16291 -> 16321 bytes .../textures/items/crystal/dilithium.png | Bin 0 -> 16147 bytes .../taiga/textures/items/dust/dilithium.png | Bin 0 -> 16075 bytes .../taiga/textures/items/dust/tiberium.png | Bin 16047 -> 16066 bytes .../taiga/textures/items/dust/triberium.png | Bin 16066 -> 16047 bytes .../taiga/textures/items/ingot/adamant.png | Bin 15932 -> 15936 bytes .../taiga/textures/items/ingot/astrium.png | Bin 15855 -> 15852 bytes .../taiga/textures/items/ingot/aurorium.png | Bin 15963 -> 15958 bytes .../taiga/textures/items/ingot/basalt.png | Bin 15904 -> 15905 bytes .../taiga/textures/items/ingot/dilithium.png | Bin 0 -> 15984 bytes .../taiga/textures/items/ingot/tiberium.png | Bin 15958 -> 15955 bytes .../taiga/textures/items/ingot/triberium.png | Bin 15955 -> 15958 bytes .../taiga/textures/items/ingot/valyrium.png | Bin 15971 -> 15961 bytes .../taiga/textures/items/nugget/dilithium.png | Bin 0 -> 15626 bytes .../taiga/textures/items/nugget/tiberium.png | Bin 15595 -> 15605 bytes .../taiga/textures/items/nugget/triberium.png | Bin 15605 -> 15595 bytes .../resources/assets/taiga/textures/logo.png | Bin 0 -> 44669 bytes taiga.svg | 170 +++++++++--------- 60 files changed, 370 insertions(+), 106 deletions(-) create mode 100644 src/main/java/com/sosnitzka/taiga/generic/BlockOre.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java create mode 100644 src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java create mode 100644 src/main/resources/assets/taiga/blockstates/dilithium_block.json create mode 100644 src/main/resources/assets/taiga/blockstates/dilithium_ore.json delete mode 100644 src/main/resources/assets/taiga/book/en_US/intro/welcome.json create mode 100644 src/main/resources/assets/taiga/book/en_US/ores/firstwords.json create mode 100644 src/main/resources/assets/taiga/book/en_US/ores/intro.json create mode 100644 src/main/resources/assets/taiga/book/en_US/ores/multiblock.json create mode 100644 src/main/resources/assets/taiga/book/en_US/ores/structure.json create mode 100644 src/main/resources/assets/taiga/models/item/dilithium_crystal.json create mode 100644 src/main/resources/assets/taiga/models/item/dilithium_dust.json create mode 100644 src/main/resources/assets/taiga/models/item/dilithium_ingot.json create mode 100644 src/main/resources/assets/taiga/models/item/dilithium_nugget.json create mode 100644 src/main/resources/assets/taiga/models/item/tiberium_crystal.json create mode 100644 src/main/resources/assets/taiga/textures/blocks/block/dilithium.png create mode 100644 src/main/resources/assets/taiga/textures/blocks/ore/dilithium.png create mode 100644 src/main/resources/assets/taiga/textures/items/crystal/dilithium.png create mode 100644 src/main/resources/assets/taiga/textures/items/dust/dilithium.png create mode 100644 src/main/resources/assets/taiga/textures/items/ingot/dilithium.png create mode 100644 src/main/resources/assets/taiga/textures/items/nugget/dilithium.png create mode 100644 src/main/resources/assets/taiga/textures/logo.png diff --git a/src/main/java/com/sosnitzka/taiga/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java index c3863e5..0a38c3e 100644 --- a/src/main/java/com/sosnitzka/taiga/Blocks.java +++ b/src/main/java/com/sosnitzka/taiga/Blocks.java @@ -5,6 +5,7 @@ import com.sosnitzka.taiga.blocks.BlockCobble; import com.sosnitzka.taiga.blocks.BlockMeteoriteRock; import com.sosnitzka.taiga.blocks.BlockTiberium; import com.sosnitzka.taiga.generic.BasicBlock; +import com.sosnitzka.taiga.generic.BlockOre; import com.sosnitzka.taiga.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -40,7 +41,7 @@ public class Blocks { public static Block abyssumOre = new BasicBlock("abyssum_ore", Material.ROCK, 15.0f, 35.0f, COBALT, PREFIX_ORE); // Ore Castsee - public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.ROCK, 10.0f, 15f, STONE, 1f, PREFIX_BLOCK); + public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.GLASS, 10.0f, 15f, STONE, 1f, PREFIX_BLOCK); public static Block auroriumBlock = new BasicBlock("aurorium_block", Material.ROCK, 15.0f, 15f, COBALT, PREFIX_BLOCK); public static Block prometheumBlock = new BasicBlock("prometheum_block", Material.ROCK, 20.0f, 15f, DURANITE, 0.5f, PREFIX_BLOCK); public static Block duraniteBlock = new BasicBlock("duranite_block", Material.ROCK, 20.0f, 800f, DURANITE, PREFIX_BLOCK); @@ -81,6 +82,11 @@ public class Blocks { public static Block blockMeteorite = new BlockMeteoriteRock("meteorite_block", Material.ROCK, 40f, 2000f, COBALT, 0.15f, PREFIX_BLOCK, blockMeteoriteCobble.getDefaultState()); public static Block blockObsidiorite = new BlockMeteoriteRock("obsidiorite_block", Material.ROCK, 50f, 4000f, DURANITE, 0.2f, PREFIX_BLOCK, blockObsidioriteCobble.getDefaultState()); + // Community + + public static Block dilithiumOre = new BlockOre("dilithium_ore", Material.GLASS, 18f, 18f, DIAMOND, 0.73f, Items.dilithiumCrystal, 3, 10); + public static Block dilithiumBlock = new BasicBlock("dilithium_block", Material.GLASS, 18f, 18f, DIAMOND, 0.73f, PREFIX_ORE); + /** * Registers all materials' ingots and nuggets
diff --git a/src/main/java/com/sosnitzka/taiga/Fluids.java b/src/main/java/com/sosnitzka/taiga/Fluids.java index 444d8a1..2d62a77 100644 --- a/src/main/java/com/sosnitzka/taiga/Fluids.java +++ b/src/main/java/com/sosnitzka/taiga/Fluids.java @@ -14,7 +14,7 @@ import static com.sosnitzka.taiga.util.Utils.registerFluid; public class Fluids { public static BasicTinkerFluid basaltFluid = new BasicTinkerFluid("basalt_fluid", 0xFFe4ddc3, 550, 10, 6000); - public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium_fluid", 0xFF66f136, 400, 10, 8000); + public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium_fluid", 0xFFd4ff00, 400, 10, 8000); public static BasicTinkerFluid auroriumFluid = new BasicTinkerFluid("aurorium_fluid", 0xFFefae94, 750, 10, 10000); public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum_fluid", 0xFF372c49, 850, 10, 10000); public static BasicTinkerFluid duraniteFluid = new BasicTinkerFluid("duranite_fluid", 0xFFacddeb, 1400, 10, 10000); @@ -29,7 +29,7 @@ public class Fluids { public static BasicTinkerFluid osramFluid = new BasicTinkerFluid("osram_fluid", 0xFFffbc90, 800, 10, 4000); public static BasicTinkerFluid abyssumFluid = new BasicTinkerFluid("abyssum_fluid", 0xFF21bcc2, 700, 10, 10000); public static BasicTinkerFluid eezoFluid = new BasicTinkerFluid("eezo_fluid", 0xFF58798a, 450, 0, 1000); - public static BasicTinkerFluid triberiumFluid = new BasicTinkerFluid("triberium_fluid", 0xFFe4ff00, 550, 10, 9000); + public static BasicTinkerFluid triberiumFluid = new BasicTinkerFluid("triberium_fluid", 0xFF66f136, 550, 10, 9000); public static BasicTinkerFluid fractumFluid = new BasicTinkerFluid("fractum_fluid", 0xFFd2c583, 750, 10, 10000); public static BasicTinkerFluid violiumFluid = new BasicTinkerFluid("violium_fluid", 0xFFbfb0e2, 850, 10, 10000); public static BasicTinkerFluid proxiiFluid = new BasicTinkerFluid("proxii_fluid", 0xFFcefde1, 750, 10, 10000); @@ -52,6 +52,10 @@ public class Fluids { public static BasicTinkerFluid magmaFluid = new BasicTinkerFluid("magma_fluid", 0xFFffc000, 2000, 10, 5000); public static BasicTinkerFluid nitroniteFluid = new BasicTinkerFluid("nitronite_fluid", 0xFFCCFF00, 3100, 10, 5000); + // Community + + public static BasicTinkerFluid dilithiumFluid = new BasicTinkerFluid("dilithium_fluid", 0xEEEEEEEE, 2500, 10, 5000); + /** * Registers all materials' fluids
* Detailed summary:
@@ -89,9 +93,13 @@ public class Fluids { TinkerRegistry.registerMelting(Blocks.blockMeteoriteCobble, meteoriteFluid, 288); TinkerRegistry.registerMelting(Blocks.blockObsidiorite, meteoriteFluid, 288); TinkerRegistry.registerMelting(net.minecraft.init.Blocks.MAGMA, magmaFluid, 288); + TinkerRegistry.registerMelting(Items.dilithiumCrystal, dilithiumFluid, 72); + TinkerRegistry.registerMelting(Items.tiberiumCrystal, dilithiumFluid, 72); + TinkerRegistry.registerSmelteryFuel(new FluidStack(magmaFluid, 50), 100); TinkerRegistry.registerSmelteryFuel(new FluidStack(nitroniteFluid, 100), 500); + TinkerRegistry.registerSmelteryFuel(new FluidStack(dilithiumFluid, 50), 100); } } diff --git a/src/main/java/com/sosnitzka/taiga/Items.java b/src/main/java/com/sosnitzka/taiga/Items.java index be68acc..4655d73 100644 --- a/src/main/java/com/sosnitzka/taiga/Items.java +++ b/src/main/java/com/sosnitzka/taiga/Items.java @@ -161,6 +161,12 @@ public class Items { public static Item obsidioriteDust = new BasicItem("obsidiorite_dust", PREFIX_DUST); public static Item obsidioriteNugget = new BasicItem("obsidiorite_nugget", PREFIX_NUGGET); + public static Item dilithiumIngot = new BasicItem("dilithium_ingot", PREFIX_INGOT); + public static Item dilithiumDust = new BasicItem("dilithium_dust", PREFIX_DUST); + public static Item dilithiumCrystal = new BasicItem("dilithium_crystal", PREFIX_CRYSTAL); + public static Item tiberiumCrystal = new BasicItem("tiberium_crystal", PREFIX_CRYSTAL); + public static Item dilithiumNugget = new BasicItem("dilithium_nugget", PREFIX_NUGGET); + /** * Registers all materials' ingots and nuggets
* Detailed summary:
diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index bc1a72a..bb1e57a 100644 --- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -55,6 +55,9 @@ public class MaterialTraits { public static final AbstractTrait dev = new TraitDevelopement(); public static final AbstractTrait carousel = new TraitCarousel(); public static final AbstractTrait beserk = new TraitBeserk(); + public static final AbstractTrait leveled1 = new TraitLeveled(1); + public static final AbstractTrait leveled2 = new TraitLeveled(2); + public static final AbstractTrait leveled3 = new TraitLeveled(3); /** @@ -88,7 +91,7 @@ public class MaterialTraits { /** * With Dev **/ - public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(beserk); //.addTrait(dev); + public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(beserk).addTrait(leveled1, MaterialTypes.EXTRA).addTrait(leveled2, MaterialTypes.HANDLE).addTrait(leveled3, MaterialTypes.HEAD); //.addTrait(dev); public static Material dyonite = new Material("dyonite", TextFormatting.GREEN).addTrait(tantrum); public static Material nucleum = new Material("nucleum", TextFormatting.YELLOW).addTrait(decay); public static Material lumix = new Material("lumix", TextFormatting.YELLOW).addTrait(bright, MaterialTypes.HANDLE).addTrait(glimmer, MaterialTypes.HEAD); diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java index c8c0bfb..f22bb15 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGA.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java @@ -125,5 +125,10 @@ public class TAIGA { integrateOre("Karmesine", karmesineFluid); integrateOre("Ovium", oviumFluid); integrateOre("Jauxum", jauxumFluid); + // Community Wishlist + integrateOre("Dilithium", dilithiumFluid); + + + } } \ No newline at end of file diff --git a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java index 8216e00..e5bb638 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGAConfiguration.java @@ -49,6 +49,7 @@ public class TAIGAConfiguration { public static int OVIUM_VAL; public static int JAUXUM_VAL; public static int VIBRANIUM_VAL; + public static int DILITHIUM_VAL; public static int URU_VAL; public static int AURORIUM_VAL; public static int PALLADIUM_VAL; @@ -95,6 +96,7 @@ public class TAIGAConfiguration { final int TIBERIUM_DEFAULT = 15; final int PROMETHEUM_DEFAULT = 25; final int VALYRIUM_DEFAULT = 10; + final int DILITHIUM_DEFAULT = 12; final int OSRAM_DEFAULT = 1; final int DURANITE_DEFAULT = 1; final int BASALT_DEFAULT = 10; @@ -158,6 +160,8 @@ public class TAIGAConfiguration { valyriumValueProp.setLanguageKey("gui.taiga_configuration.valyrium_multiplier"); Property vibraniumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Vibranium", VIBRANIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); vibraniumValueProp.setLanguageKey("gui.taiga_configuration.vibranium_multiplier"); + Property dilithiumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Dilithium", DILITHIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); + dilithiumValueProp.setLanguageKey("gui.taiga_configuration.dilithium_multiplier"); Property karmesineValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Karmesine", KARMESINE_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); karmesineValueProp.setLanguageKey("gui.taiga_configuration.karmesine_multiplier"); Property oviumValueProp = config.get(CATEGORY_NAME_ORE_GEN, "Ovium", OVIUM_DEFAULT, "value for generation", RESFAC_MIN_VALUE, RESFAC_MAX_VALUE); @@ -185,6 +189,7 @@ public class TAIGAConfiguration { propOrderOreGen.add(duraniteValueProp.getName()); propOrderOreGen.add(valyriumValueProp.getName()); propOrderOreGen.add(vibraniumValueProp.getName()); + propOrderOreGen.add(dilithiumValueProp.getName()); propOrderOreGen.add(karmesineValueProp.getName()); propOrderOreGen.add(oviumValueProp.getName()); propOrderOreGen.add(jauxumValueProp.getName()); @@ -247,6 +252,10 @@ public class TAIGAConfiguration { if (VIBRANIUM_VAL > RESFAC_MAX_VALUE || VIBRANIUM_VAL < RESFAC_MIN_VALUE) { VIBRANIUM_VAL = VIBRANIUM_DEFAULT; } + DILITHIUM_VAL = dilithiumValueProp.getInt(DILITHIUM_DEFAULT); + if (DILITHIUM_VAL > RESFAC_MAX_VALUE || DILITHIUM_VAL < RESFAC_MIN_VALUE) { + DILITHIUM_VAL = DILITHIUM_DEFAULT; + } URU_VAL = uruValueProp.getInt(URU_DEFAULT); if (URU_VAL > RESFAC_MAX_VALUE || URU_VAL < RESFAC_MIN_VALUE) { URU_VAL = URU_DEFAULT; @@ -278,6 +287,7 @@ public class TAIGAConfiguration { oviumValueProp.set(OVIUM_VAL); jauxumValueProp.set(JAUXUM_VAL); vibraniumValueProp.set(VIBRANIUM_VAL); + dilithiumValueProp.set(DILITHIUM_VAL); uruValueProp.set(URU_VAL); auroriumValueProp.set(AURORIUM_VAL); palladiumValueProp.set(PALLADIUM_VAL); diff --git a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java index 069cd37..18d92a0 100644 --- a/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java +++ b/src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java @@ -39,7 +39,7 @@ public class BlockTiberium extends BasicBlock { @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Items.tiberiumDust; + return Items.tiberiumCrystal; } @Override diff --git a/src/main/java/com/sosnitzka/taiga/generic/BlockOre.java b/src/main/java/com/sosnitzka/taiga/generic/BlockOre.java new file mode 100644 index 0000000..55737c3 --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/generic/BlockOre.java @@ -0,0 +1,62 @@ +package com.sosnitzka.taiga.generic; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.Item; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.Explosion; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.Random; + +import static slimeknights.tconstruct.TConstruct.random; + +public class BlockOre extends Block { + + private Item dropItem; + private int itemAmount; + private int xpAmount; + + public BlockOre(String name, Material material, float hardness, float resistance, int harvest, float lightLevel, Item item, int amount, int xp) { + super(material); + setUnlocalizedName(name); + setRegistryName(name); + setHardness(hardness); + setResistance(resistance); + setHarvestLevel("pickaxe", harvest); + setLightLevel(lightLevel); + this.dropItem = item; + this.itemAmount = amount; + this.xpAmount = xp; + + } + + @Override + public int getExpDrop(IBlockState state, IBlockAccess world, BlockPos pos, int fortune) { + return random.nextInt(xpAmount) + fortune; + + } + + @Override + @ParametersAreNonnullByDefault + public int quantityDropped(IBlockState state, int fortune, Random random) { + return (random.nextInt(itemAmount + fortune) + 1); + } + + @Override + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + return dropItem; + } + + @Override + public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn) { + if (!worldIn.isRemote) { + if (random.nextFloat() < 0.5) { + worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), random.nextFloat() * 4f + 1.5f, true, true); + } + } + } +} diff --git a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java index 75ff267..b2d03be 100644 --- a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java +++ b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java @@ -37,6 +37,7 @@ public class ClientProxy extends CommonProxy { private static void registerItemModel(Item item) { Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory")); + } @Override diff --git a/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java b/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java index 70eb7cb..21b12df 100644 --- a/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java +++ b/src/main/java/com/sosnitzka/taiga/recipes/SmeltingRegistry.java @@ -7,7 +7,5 @@ import net.minecraftforge.oredict.OreDictionary; public class SmeltingRegistry { public static void register() { ItemStack nugget_iron = OreDictionary.getOres("nuggetIron").get(OreDictionary.getOres("nuggetIron").size() - 1); - //GameRegistry.addSmelting(tiberiumOre, new ItemStack(tiberiumShardInstable, 6), (1F)); - //GameRegistry.addSmelting(tiberiumShardInstable, new ItemStack(tiberiumIngot), (.1F)); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java new file mode 100644 index 0000000..bc2107d --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDeflection.java @@ -0,0 +1,16 @@ +package com.sosnitzka.taiga.traits; + +import net.minecraftforge.common.MinecraftForge; +import slimeknights.tconstruct.library.traits.AbstractTraitLeveled; + + +public class TraitDeflection extends AbstractTraitLeveled { + + + public TraitDeflection(int levels) { + super(TraitDeflection.class.getSimpleName().toLowerCase().substring(5), 0xFFFF5500, 3, levels); + MinecraftForge.EVENT_BUS.register(this); + } + + +} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java b/src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java new file mode 100644 index 0000000..da40dea --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitLeveled.java @@ -0,0 +1,16 @@ +package com.sosnitzka.taiga.traits; + +import net.minecraftforge.common.MinecraftForge; +import slimeknights.tconstruct.library.traits.AbstractTraitLeveled; + + +public class TraitLeveled extends AbstractTraitLeveled { + + + public TraitLeveled(int levels) { + super(TraitLeveled.class.getSimpleName().toLowerCase().substring(5), 0xFFFF5500, 3, levels); + MinecraftForge.EVENT_BUS.register(this); + } + + +} diff --git a/src/main/java/com/sosnitzka/taiga/util/Utils.java b/src/main/java/com/sosnitzka/taiga/util/Utils.java index 6a508c6..b4e8bf5 100644 --- a/src/main/java/com/sosnitzka/taiga/util/Utils.java +++ b/src/main/java/com/sosnitzka/taiga/util/Utils.java @@ -28,6 +28,7 @@ public class Utils { public static String PREFIX_ORE = "ore"; public static String PREFIX_BLOCK = "block"; public static String PREFIX_DUST = "dust"; + public static String PREFIX_CRYSTAL = "crystal"; /** * Registers the block and its corresponding item (block as item in inventory) diff --git a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java index bd5c614..4a10999 100644 --- a/src/main/java/com/sosnitzka/taiga/world/WorldGen.java +++ b/src/main/java/com/sosnitzka/taiga/world/WorldGen.java @@ -9,7 +9,6 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkGenerator; import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.fml.common.IWorldGenerator; -import slimeknights.tconstruct.gadgets.block.BlockStoneTorch; import java.util.Random; @@ -34,7 +33,8 @@ public class WorldGen implements IWorldGenerator { Generator.generateOreStoneVariant(karmesineOre.getDefaultState(), BlockStone.EnumType.ANDESITE, random, x, z, world, KARMESINE_VAL); Generator.generateOreStoneVariant(oviumOre.getDefaultState(), BlockStone.EnumType.DIORITE, random, x, z, world, OVIUM_VAL); Generator.generateOreStoneVariant(jauxumOre.getDefaultState(), BlockStone.EnumType.GRANITE, random, x, z, world, JAUXUM_VAL); - Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, VIBRANIUM_VAL, 100, 0, 64, 2, 9, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT)); + Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, VIBRANIUM_VAL, 100, 0, 64, 2, 6, newArrayList(Biomes.DESERT_HILLS, Biomes.EXTREME_HILLS, Biomes.EXTREME_HILLS_EDGE, Biomes.EXTREME_HILLS_WITH_TREES, Biomes.DESERT)); + Generator.generateOre(dilithiumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, DILITHIUM_VAL, 100, 0, 64, 2, 8, newArrayList(Biomes.DESERT, Biomes.DESERT_HILLS, Biomes.MUTATED_DESERT, Biomes.OCEAN, Biomes.DEEP_OCEAN, Biomes.FROZEN_OCEAN, Biomes.BEACH)); Generator.generateOre(vibraniumOre.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, 1, 25, 0, 128, 1, 5, null); if (ironGen) { Generator.generateOre(Blocks.IRON_ORE.getDefaultState(), Blocks.STONE.getDefaultState(), random, x, z, world, IRON_VAL, 0, 32, 2, 8); diff --git a/src/main/resources/assets/taiga/blockstates/dilithium_block.json b/src/main/resources/assets/taiga/blockstates/dilithium_block.json new file mode 100644 index 0000000..9dddf6d --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/dilithium_block.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/block/dilithium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/dilithium_ore.json b/src/main/resources/assets/taiga/blockstates/dilithium_ore.json new file mode 100644 index 0000000..c1ed6f6 --- /dev/null +++ b/src/main/resources/assets/taiga/blockstates/dilithium_ore.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "taiga:blocks/ore/dilithium" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + {} + ], + "inventory": [ + {} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json index 475cd6f..a367a7d 100644 --- a/src/main/resources/assets/taiga/blockstates/fluid_block.json +++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json @@ -18,6 +18,13 @@ } } ], + "dilithium_fluid": [ + { + "custom": { + "fluid": "dilithium_fluid" + } + } + ], "nitronite_fluid": [ { "custom": { diff --git a/src/main/resources/assets/taiga/book/en_US/intro/welcome.json b/src/main/resources/assets/taiga/book/en_US/intro/welcome.json deleted file mode 100644 index 31907d1..0000000 --- a/src/main/resources/assets/taiga/book/en_US/intro/welcome.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "title": "TEST Title", - "text": [ - { - "text": "Test text." - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ores/firstwords.json b/src/main/resources/assets/taiga/book/en_US/ores/firstwords.json new file mode 100644 index 0000000..cfac3fe --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ores/firstwords.json @@ -0,0 +1,20 @@ +{ + "title": "New ores", + "image": { + "file": "taiga:textures/logo_s.png" + }, + "text": [ + { + "text": "TAIGA adds various new blocks and ores. You need to combine them in different alloys to get higher tiers,1 some better stats and special traits." + }, + { + "text": "\n" + }, + { + "text": "\n" + }, + { + "text": "The ores have to be found at special places. On the next pages, you will be teached where to find the ores and how they have to be handeled." + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ores/intro.json b/src/main/resources/assets/taiga/book/en_US/ores/intro.json new file mode 100644 index 0000000..2d5801b --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ores/intro.json @@ -0,0 +1,11 @@ +{ + "title": "TAIGA: Tinkers' Alloying Addon", + "image": { + "file": "taiga:textures/logo.png" + }, + "text": [ + { + "text": "Thank you for downloading TAIGA. TAIGA is an addon for Tinker's Construct with a lot of end game materials. On the next pages you will see and learn how to find the new added Ores and what other features you can find in TAIGA." + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ores/multiblock.json b/src/main/resources/assets/taiga/book/en_US/ores/multiblock.json new file mode 100644 index 0000000..53a0cf4 --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ores/multiblock.json @@ -0,0 +1,3 @@ +{ + "data": "structure/tank.json" +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/en_US/ores/structure.json b/src/main/resources/assets/taiga/book/en_US/ores/structure.json new file mode 100644 index 0000000..1999813 --- /dev/null +++ b/src/main/resources/assets/taiga/book/en_US/ores/structure.json @@ -0,0 +1,12 @@ +{ + "title": "", + "text": [ + { + "text": "The Tinker Tank can be any size from 3x3 to 11x11, and with any height from a minimum of 3. Larger structues increase the size of the tank. In order to be a valid structure, it requires a floor and ceiling, along with a frame around the whole structure" + }, + { + "text": "The Tinker Tank can be built using any combination of seared blocks, glass, and drains. The floor and ceiling frame must be either seared blocks or drains. A single Tinker Tank controller is required. It can be placed on any layer except the ceiling, and must not be placed on the outside edges of the frame. The ceiling additionally supports slabs and stairs, even in the frame, provided they are downwards facing.", + "paragraph": true + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/index.json b/src/main/resources/assets/taiga/book/index.json index 2990b81..59f0abd 100644 --- a/src/main/resources/assets/taiga/book/index.json +++ b/src/main/resources/assets/taiga/book/index.json @@ -3,7 +3,9 @@ "name": "index_title", "data": "sections/intro.json", "icon": { - "file": "taiga:textures/gui/book/logo.png" + "item": { + "id": "taiga:ignitz_block" + } } } ] \ No newline at end of file diff --git a/src/main/resources/assets/taiga/book/sections/intro.json b/src/main/resources/assets/taiga/book/sections/intro.json index 276837e..5d3586e 100644 --- a/src/main/resources/assets/taiga/book/sections/intro.json +++ b/src/main/resources/assets/taiga/book/sections/intro.json @@ -1,7 +1,15 @@ [ { - "name": "welcome", - "type": "text", - "data": "intro/welcome.json" + "name": "intro", + "type": "image with text below", + "data": "ores/intro.json" + }, + { + "name": "firstwords", + "type": "text with right image etch", + "data": "ores/firstwords.json" + }, + { + "type": "blank" } ] \ No newline at end of file diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang index 42636a2..7b322ba 100644 --- a/src/main/resources/assets/taiga/lang/en_US.lang +++ b/src/main/resources/assets/taiga/lang/en_US.lang @@ -1,4 +1,5 @@ material.basalt.name=Basalt +material.dilithium.name=Dilithium material.tiberium.name=Tiberium material.aurorium.name=Aurorium material.prometheum.name=Prometheum @@ -38,6 +39,7 @@ material.magma.name=Magma material.nitronite.name=Nitronit tile.basalt_block.name=Basalt Block +tile.dilithium_block.name=Dilithium Block tile.tiberium_block.name=Tiberium Block tile.aurorium_block.name=Aurorium Block tile.prometheum_block.name=Prometheum Block @@ -79,8 +81,10 @@ tile.meteoritecobble_block.name=Meteorite Cobble Block tile.obsidioritecobble_block.name=Meteorite Cobble Block + tile.basalt_ore.name=Basalt Ore tile.tiberium_ore.name=Tiberium Ore +tile.dilithium_ore.name=Dilithium Ore tile.aurorium_ore.name=Aurorium Ore tile.prometheum_ore.name=Prometheum Ore tile.duranite_ore.name=Duranite Ore @@ -118,8 +122,12 @@ tile.obsidiorite_ore.name=Obsidiorite Ore tile.magma_ore.name=Magma Ore tile.nitronite_ore.name=Nitronite Ore +item.dilithium_crystal.name=Dilithium Crystal +item.tiberium_crystal.name=Tiberium Crystal + item.basalt_nugget.name=Basalt Nugget +item.dilithium_nugget.name=Dilithium Nugget item.tiberium_nugget.name=Tiberium Nugget item.aurorium_nugget.name=Aurorium Nugget item.prometheum_nugget.name=Prometheum Nugget @@ -162,6 +170,7 @@ item.iron_nugget.name=Iron Nugget item.basalt_dust.name=Basalt Dust item.tiberium_dust.name=Tiberium Dust +item.dilithium_dust.name=Dilithium Dust item.aurorium_dust.name=Aurorium Dust item.prometheum_dust.name=Prometheum Dust item.duranite_dust.name=Duranite Dust @@ -201,6 +210,7 @@ item.nitronite_dust.name=Nitronite Dust item.basalt_ingot.name=Basalt Ingot item.tiberium_ingot.name=Tiberium Ingot +item.dilithium_ingot.name=Dilithium Ingot item.aurorium_ingot.name=Aurorium Ingot item.prometheum_ingot.name=Prometheum Ingot item.duranite_ingot.name=Duranite Ingot @@ -240,6 +250,7 @@ item.nitronite_ingot.name=Nitronite Ingot fluid.tconstruct.basalt_fluid.name=Basalt Fluid fluid.tconstruct.tiberium_fluid.name=Tiberium Fluid +fluid.tconstruct.dilithium_fluid.name=Dilithium Fluid fluid.tconstruct.aurorium_fluid.name=Aurorium Fluid fluid.tconstruct.prometheum_fluid.name=Prometheum Fluid fluid.tconstruct.duranite_fluid.name=Duranite Fluid diff --git a/src/main/resources/assets/taiga/models/item/dilithium_crystal.json b/src/main/resources/assets/taiga/models/item/dilithium_crystal.json new file mode 100644 index 0000000..6d2de2e --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/dilithium_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/crystal/dilithium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/dilithium_dust.json b/src/main/resources/assets/taiga/models/item/dilithium_dust.json new file mode 100644 index 0000000..8de43b5 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/dilithium_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/dust/dilithium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/dilithium_ingot.json b/src/main/resources/assets/taiga/models/item/dilithium_ingot.json new file mode 100644 index 0000000..82a6f9b --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/dilithium_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/ingot/dilithium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/dilithium_nugget.json b/src/main/resources/assets/taiga/models/item/dilithium_nugget.json new file mode 100644 index 0000000..07b9644 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/dilithium_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/nugget/dilithium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/models/item/tiberium_crystal.json b/src/main/resources/assets/taiga/models/item/tiberium_crystal.json new file mode 100644 index 0000000..597e831 --- /dev/null +++ b/src/main/resources/assets/taiga/models/item/tiberium_crystal.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "taiga:items/crystal/tiberium" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/taiga/textures/blocks/block/dilithium.png b/src/main/resources/assets/taiga/textures/blocks/block/dilithium.png new file mode 100644 index 0000000000000000000000000000000000000000..bfbcb54078da44d6aa565b00010e1a15400c6cee GIT binary patch literal 16440 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0WWg+Z8+Vb&Z8 z1_oQ>%#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(6f1ypHJp$m0beMC60fhXm1kaYNn&1ds;7%xMQ(v!W@d_2 zN>XB)k-530ZlZySk#35)Nt$j_qJ^cdd1{)4d2*_$fw6@JI7OpsM~Y`~iDCt_-O~j} zbeR|$CmAHC8tEomrlvqVZefsYs+(+VYH5;^Y-E~ZmIkv3$uJCy{EITvGxHL2kko+u zl9HKXWnh__YHnt1qH6%MBE`VOP}kBd(M;Dk&D7Y;!pPVt(aa2H1r}p4tn$bNrPfN+ z!~?Eof>R4oMG>hLTwN3-78R$03PW2ZSZN5aUm%4OgtP${s#b}~po+#W8B|uKrr7AC zh$5T?(F3vyq97A9I*AJc4DGn>D9=dE!&lZpi~_5|ZAfu`T1k0gQL1BlYF-I3#W2KF zRBhLWnqXih0uy}6Nrfq{X(A&7)(MV3a_8i`*kvNXC@gwD{s%n~~z zsBLJ%NV-4`QAjH(xF9h()y~Y+)Y#NUA6*z-M?hvpYEFbpW^QU;ab|v=ouL_254r?a zjgh!CB1u3sLZS+(cLT1*AfiDoZgyNY`ru9(sDlQUg4a2;Vn7{6E8`*Nj#>f<2O`PQ z;36`hAj(FA3la`QlB2;zWI#cbjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr!HX2-z za3GQ#4K5-B3ZiT@xFF#`Bsm&fLqG_5gAYr zWuw6b2?rv{(cmI7pdiXdg9{Q4M3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>( z7m)!4Q8pS}kZ>T991Sia0}7&SG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF z1Ciuta1j|$5M`sm1qlZt$xcd3`v2qW%lG#GSr}G|FkHyuX4r3A zd#R*$p~`a|1|PBPV>cGBejmO*?y={*r9mEonXefaOt_M*oAUE3^MT`U-+32XgnX^p zd)UTZtfONKD?>n&MZxn8@2uW4yVY!5y{z3f{ms?a-{*O7J&_k%9kx5{w#p}g12=B3 z;xE1ZzW-~z`R3E?0gGflNIcSbw8m0q=YbQG{g-aomc8p_ZE?}8wwG_8ojv=3XQuAe|NQ0d^0Qz2 zAIHu9{HSKaLeAR<5_Ybt&X&%NVVI+1-uK|-(-)t!CLei}RWk8NM5Te=o|$Xq8SwDC?|lk!G0fTL#j-MQRbt**`4cr7wFA@*nYrZb_h zoz7UWH!Qopccbt1YNZs0$w%)l%A9t(RPnKos^OxqbtT`vY!cUF+BITVFRlR(R}^#QoY?sh*dlKcD}ddE{qo>6@);N_%Xtz3w*`eBQ?~ xhg*?_flYw>;a>Iz1_39ABLYr`e*R}>m^`!Q?)u-dCqaArJzf1=);T3K0RW(}Q}6%) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/taiga/textures/blocks/block/duranite.png b/src/main/resources/assets/taiga/textures/blocks/block/duranite.png index 33ebb6fcedf68c6edae360c14468528185097778..e17478fdc35556b2154366f6e61089ad9fe1f715 100644 GIT binary patch delta 1028 zcmZo@Wc=RDIKhI+ZsJC(8fI=Ivk*fgD-&ZYW3$NznXOUy>?}_>3{6tajZFG)y(qwJ=CF)lD`wwKPddHZn~yOPd_XBR08#l^djC z@@tl8jzminQ^O?lB$z3@$;oL+X@+LWx`qacmYaXDXfvuY62) z80lJ?8yo6c7#pUUnOd3{o1~>~c4vFTLX^tMb2-iV42^V={I_`y_i;m(2OJN-PfoYh zuYcg_;uunK%je*0|KM~Ph6kVj|45xE;S;lb<~i;~9nBdgSpxZnX`h9*zi9X630};3 z(ypU3u#inOq+`VihfEf?w->gm3U_hn=K5Fb*}ktnS6%mh?z(rY&nI8m`sdEIo5lM+ z*F}fdAAh{CZ{NfC-R$~*K0ZqN{$T69aP!5%=5F`v=k5RbBIx~ti{0i~ufIt#uYVk) zwRG#1C@tM7VqV27IZ`DUS|11|O*^gn#CHCl-!9e53-eWuwIl@@YBrvpzZ1e#MZC;vwcrYWZb%pwM!?(aGY{sXz}Fh5t3T=`SbZ@k9_U7Nr%7Ztx)8Z zaAwd`-1c6X!?^ZM@yk=Q=Wm2}HiTI>ozonB7)I0H<;LV+{yr?Nf z@9yuaoVR_>$MzYA2hFT`b2ulb?AnpIW7`Z^xqlm{tv5?M>ZQ|3Ugvg! z2|ZqYnn#{J6Xw2o;#=6`8%uA`_v+)`cb?JMfx&KROQ3)Z%krk+a{`=c;`XYSKHtx= z&XM`~_MFeUkS_%XkE)s%*d*<$*!bdE&iWS*_B^%HI3YTBO=Q*NA0O_nn|$n?yk6CP z$(eghjV{Xe-me#a|NHg)bqhbPo1V1=be_4lsqS+{X%+Tp%X>GErNSy4OpB_6$A8ozdR{MO3r c|Ct%47bl0c+g|f$U|?YIboFyt=akR{08V7Tc>n+a delta 926 zcmey~%-GP#IKhI+R&}FQ4KufaVThrzm7#%^vC-s%%+@G;c9tiT7qUiA-o$oSCE3!# z%)rbnS=S;p$wJpS$ppl*Ow+YYHcqiLH%YTJu{7Sinf(n5Q7R{Ma+?bp8tEe0u5DmA zIgtCr=F7Z)3|KxtE6|vH*-pRys;7%%NX0FmgX#Xli3|)6ewWt;Wy=_9Ni0%JnA*^+ zmDLz@Fkr1v!9q?p_eE~O?lBf#$3@>Sxp1%M{kz)y_mKyVWXQzV%H@RrKl0(~Z};Qt zzdy~BIeq_y^lV#;m^bG{s@l5S+tWOg{zYL+%B4SWfh#so-<=#{2?~|bBtF7d8A*2aliESRAhB2 znD9V#l6$FJMuC!|N9wHF{kN=w=N$j_xp>jT6YEx1O?zcAMemYT3h$Ab9mWF7oxKvtTgoTfMQSHFdR2_vZ!YKAX-v%J@H2V0z_;nM(Lt=q&_ooG7n_!e7i))jWWyT{Iny${Ve$dPNjZO#!cA^VQM z3g7Nt_$X9=y^B{jY)ffr=+n3`>AN#E*OZq$%bZ#hwQgELjqha7Kn0hFvo!<-1O#-v z?-)Jd;M}7!E&l4hclNfeOE2wI4-I-hzA?D||L5oL-@msvKYYLLleS;o(Ra%p=R_D>u&8%_FQt{RvZU^z@=g~| zQK@SZA*oAM*`{dLOJ}b0u*N1)I3O4@RJO7~K`URKrv_;m&GriKwzxBV9Jn`1TZr9Tb iJ432cvh%;)XRul0lc>2cwTgj(fx*+&&t;ucLK6V}f~7A2 diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png b/src/main/resources/assets/taiga/textures/blocks/ore/aurorium.png index 317e11b328b3b31011dd83e12714d0e38c285c16..c2dfcfa666d5cb7e595f63ac943bc580496a4e1c 100644 GIT binary patch delta 929 zcmdm6f3|+ZHfC-kvk*gLD`NvI1LMgDnXQreo7q{?7*))SEKE~PEfaOkEDX$a%?wPE zb(0beEOd>GElpF?5>1Q~%`7)hWWC2il*-9BIm`tOjdYQ$)iyAktjKv{^J4Bl1}w)V zj%}U1*hatpnWu|mNX0FiNwying)(jR|9^Yv?TpdesWSaWoYdu6x3YpWUyE-!dh*c& zC8Z99EzOhl^!)T>U6<<}bv@!KbH%Z{xv5KYQNZHN+*N-~uE!O5zAL&OqZdEDSfixo z;nRmtAG&7G_GgOS!y92Xm65?tOi8k;yi%IsM}@|PqsAxr>luPf=XdI0q;JL@VLEW2Vv~;6+^}v7j`{KRoZkwToc8tH6r$6yC}#DwJ96KjW?yF5Fe^$@ z!e8y&{0~ZEx^*=vkzw`MFV;CeV0`fX)O}e)_k9(1PZzu7{W$JWu5m`D=V8lCZ?AU?t0QYC%hx!P{NknZGUnE z81BSv@4ap8u5{y$@zZ~M1QI@rZe2O^L}LEhu8aHZ=5a0BT7O=KMbR@=M!3FUH6z1E zbNQgt*;RW@zoz_qzW%$iF!QcOx0h+_RIHwBb@1as=H)>je_wc+Y`byev5m%8XPZyH z_~83ac5l8zhud!dnrH8DJy*zGLhG8ih~fRbEgb4MulSt0{a1PJyoj4?jPuG$Tx!3* zyIgR8>gsTv>179w?&)~jckGQHH$$KLao+mql{0re{}b@$oNhY*^%dsp(nUkB^Vc^p zHUwQ3{;SOLDSNK%>X^K%vvy9GH-C37NP1~ktM0R-T`?biWOfxXF=$;ApJu0HXrd~v zee$9qx3<=zYxWfnpTDh^IsQX0mM4DJpSdSb$4CCP)ONv}Km)=?A zc7E>N_w^^z=h=mMv)(%WZrZiXb$8#FB&cvQXyotHU7Ncy_3-_t*Ry*Wyq~A0=H#eM zpS(D*&V2h}PQk+l{S`_K8}e8GIMd7B`FOcN?(AKT4DnXQreo7q{?7*&!I%?->fEKPLHEs_&;Q<6*) zbuBEDOmxkXk}Zr(%}mTv3==m`WWC2il*-9BIm`tOjdYQ$)iyAktjKv{^J4Bl1}uSY z+tyEBY@=U)&C|s(q~ey%MBn^dYz%Gj(z8D#Ci84ucqPxvNNUowt)5HFg0w@gTD`qu ze<9j`x9_dm>2t4N*4v#My!ErzTkqXIS=Jq^zFb(rXlcT7>BbR0&0}T~&Ic;km&nGy zytvrCs!n#_dg^w3NSkx9y_g?!ST!ksNJLw@AH>`Z_}}pD{qol%e(Q*QZaV zkDTjXzVH3>b#aqb1RZ|X-#3qYu=f9_$!9i2y}G>p=xL|6xyP3*$+=(ZdH?&-Jq2l* zyPtl_+gWod$52Mu(D486<;TBHQz&>esUWeM!OC6Bx79P#cV3n7yl55y?;|rxYW{BU zt^0rG&og$-vyx%&4}I$>xDaGgnd;i3BlLB0dSch5uX!C)oc>8T{OhmRy1J|0c-Dsa zI>Bxu>F-^AFInPDlvUX_3(gc0H+B8Gc41ikVYT+7lRiZ2nMwG2e@c3}w{YFd^>Jpm zx?X*~z4!pPAd9Jew$;2d(TBq?#kAeO_bcVdu^nf7Z=e6auJ)XflVb3bsi*81v>Xcp zDxExn#xbV|DIT|{OnZ~hT<0@>v98F^3VJE z-@CSE^SocLyBDwD-z!tQrKafk1)JFP9~CN_7#fP0qHnIu{J8ks&d@_*v!7mDW--ULs&C|!>PeWfV*d(uXU{m1U?3<0kpOj~p=gqGB9T1gkHf6~i zf7O@X{P_ibcN9G@GjJUK{W*E>)z`af`pVlLn~0lRJ-c?TZBGUAFEl>(6wJLUXb`Q!E{PkOj7`T6>sTgsbvu6{A=*r_=y=l(Tk ZXx|q;)nKmj5e5bZ22WQ%mvv4FO#rD#sc--Q diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/dilithium.png b/src/main/resources/assets/taiga/textures/blocks/ore/dilithium.png new file mode 100644 index 0000000000000000000000000000000000000000..9aad72bdd2fb7fb861cff2578b103161d4c8d3ff GIT binary patch literal 16436 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 N@9FC2vd$@?2>{JhRVx4h literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/jauxum.png b/src/main/resources/assets/taiga/textures/blocks/ore/jauxum.png index 7792421273e409941b5f29b6143a4578f922e8f6..eb1f1157dae73468470e7ef610f09f03a3574310 100644 GIT binary patch delta 1001 zcmca!b)as71(WrRjaD_x+(u?0hQ?OL23DqqlMgamqwv{T=Bij2B&H^%nj7mH8ycAC zrWu=9>L!|+ndzD(C7YXDni?7=nHX+9!4knT`7W#L-U* zHb3OBHe?Z8^0{ZSf|Xu9vy!KaV@Sme-j^>o#xTRks~Vtvk@@baJCWgWEQZXuh?28B~g zPNKE4TRN-X4e8|;3mw7HDo`HSEmyZIi!ubcVgMc$dy zD?h8aif5j@-H{-zRkrg$`A(C$?`=;Wozt*w!}OrFz1+X#QtI`OUSa7p|MQ}-wX$^1 z+gn`U?dLiDu%FQDzueO7C(F_(Y5TvqL94b-?0c_#5_G_E?w%pi>Lx@cW(LPZgF%NpGI5ckXBZr*kVAw@v%J zTk7kMCOz*zUss$f%VjkdOpFuk?3BASX?peivm5tS&E@y5uijy5>gV(2!kw56r&(W# zG8+pjzOg$rd;RxEeGfB7r) zmFVJw3TjnRAJ(%uz+RcEPPoRb^3 zrEJ6nfBsXqUO?vU!pNhOb&3!|(w|?2Qr-{DDw|iCWIut$g^uu-e zQw3^Px8zUN@aD`3JrjJuI|q< z-tH^Cl>Yj!`@D8>P<(IU`fZ)jK0+33^VS9UoPQLp>SO8pK%%DP^Vg58hx<;ixW07V zx(SgzAMf=Y@QY8W|J|**==EipEFtOeXDimtPpT{U%)4q*hvxEQ9F55!2a8RPsrk;i zt&DZe@AQnXX%(02daAejG98yt4m08F^>y2;r(T}T@n3w?`ei%+e0#j5%Gl=D@x@nX zA6zqM>7IglNmbJlj~~4(YQ`nxt84AXA=7-o@WWc6Pls6fwsGm?)cXnUt?Rq}e$LaW z*XKQPdz|_2&v(U(Uo-o9WsbY?MNi#1txxHOXs@Tx&x)2+DxY3YXSc~(5#xFG^WWc= z`~JOjjoK?&_DkvORf&1)4BqTmZg@+SH+t&N-`^P*$BFxgTU=2&6~q+mS6Hff>dq|_ z`R&K-P6aiceCkxN<@kcP4_@GTd@V`C+ieRA?dRD3LtemeU3 z&!3y8zwDoNG`2f=wb606zWjdyncwvdfM`csGCH$A_E${J6`lxJh&QF<%~;=C3^>-)f7VHQ&v(iB**EFVOrXV_)-6r1ZCp z@W;h*-@nZK^Vd2=)o{*(jQ&+Bo4#bVBp!dd-CtTp+OlT#k*jBvnztF31xyoKxF`B& y>Z~ZUHE%aOZmaaa_b;q&<|>u8yFc?8zTR=&EyzE$Z88G`1B0ilpUXO@geCwv3ZHxc diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png index 811c9f0cc149651e53c7ee03f4be860834f68ad2..3e9c071400a79f6d0a413a61235bcd01f70528c9 100644 GIT binary patch delta 983 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 aGyGj~uUd=cZ6E^!1B0ilpUXO@geCyFH=>^a delta 914 zcmcaxf3JSSHfC-^^AJNLD`NvIBeTf|nXQreo7q`P7*#Bj6O)rtjZ$<|Op+6I(+o@! zbrUU(EOe7B6V1~sEG-R^jZ8MrXMMv$l*-BLxvcn*?9?_eoNUW^V)K6PKL#v0U;39$ z-fyE{f7{c=F{I*_P0)L9;X;{x{|{{t3Gq7krME4uOX-w?sCMT@W6#({Q_p?AlXEZT z<*bz&=i<%TAMcA^{&K^k?89fz-jnH=_vZGF+eK&oTunIi=8Qq)`|3i4ntQf3Hs_yL z%Jn49xqaLE_;JG)mKK(!L8@I3ySw)@Z0PPjot!Kzuq(BmLy?g|Y_W#&@mwX93tM`Z z<^KNN&ah#TL|pv$_iz73#D8CXHFxvou4lj@&*{_as#!~qiXOK8(X?pG z#jLHY&59g%1$J#b=U30$XYc57wfuD{B6=KTKeKg&LIcV?S=RagIh^l`F_Q@xYN0UJ4c z#|bjqUzTjrXJ7V-+gf^7XX5Yax&Ktu{pS|#U9#p;<4v1Go8&!$%&oJJt}~i9Yu3)0 zt55B_d&T~7)!(+$C&QPg-__R(EGeJtwe;1ePeEmUCs(dtyY^v4uwPtu;7(1`wK}$| z&2*h7&YT(@9K3tiuBy6!?TK@WVrLwGT+iMxb&2ux*N+ds>f7a2S{B!RaMP4YRpm)Z zmmU_dH7`ssP!X0m)+xxs$&hWfUs|dvI{M~fL++U{eVPXsn3=E#GelF{r5}E-2W~=G| diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png b/src/main/resources/assets/taiga/textures/blocks/ore/palladium.png index b3898328e95633f4ef7f32127481e85bf7240e6e..fd7d3f99067883613cb7b0fb285c6f3ae7ea1506 100644 GIT binary patch delta 826 zcmeCF|5P`@lCgH9RSh$@ky(hLv6Zo@m5K4>eazO#{LPFkC5$R*#>puL=BbvtiK&LE zx@ndsX1YlxiK)8D7G_CC#%abWNomHLXR^LwAxh=s_Z;SehDN$b)@mCVPTs&?KY1Mo z*W?47_LJpV**5Rt{${{p`(JzZX|REcFQ*~^iR;4@AayG(r(Q9zHWZ$q~g1?Kdpaq z{KB=Mr`9v39jN2Dx@^VkKMiu;hVcp;971;Nt-0sbV7*Un$McCVc6)tX{gXK_>L;VE z+m!=r^228*J=59n@#WO?vsKq}>l_IWsW(TO{eGt}{#NhX_48VD_m*EzpoFJJe_U1{~kH>cZS7`E8U8*&p$6e_}?=GLCcYe~ne^-ZHS+>cur6_Z1 zBlFw9Juwk;3vP+{dhghKI?%kl{gv%1od;3+hb&$MahA+=zYiw6CT&_% zCM{hVpv)1NDW17|>8DTI?kc^#boXu9?X;)vnbWo;L~nmPyXfNwseI$fmB#nY@AD_m zi0Nfn-Qv#F&2mkn@Y&DjaXCe%LM#Uue!NI(7LyDu{Qv%1y-EL7&WjA3Ia2ug}lR0GWZ%M9yrCGXZwC@Y5THDhJs!e*QwgO*S*};zEWu3zKNylXMAN! zxEpb)sJr#A_}MGM44e$d7oAH=Ix_7YV}e`Hd8J0y16hf0gG%4HJm1%H|JF{=6MGpa zlpLKe6uaqJuFJ1mk77U9C(T`0b%n{j=i}F{p0<`(HTPsKE}X4$=~9hX$;-BI%ZmGc z{8PQO!_<%bS;t~>R(Yvd)J)IX@(C(#(%ygPF8*qDbFEO^B=J|fg;zZ~r+wO2i1k2E z;iL0Xr_+8k&X|+W>3{p8VbGV=U9;ys-LT=-AH$q5CWaeq2Vb?!(0Z60s4i50WB%7|90W7&jDxGW$awP%_cRB$s^(L zMM-PJjC8hLv6k^)zV=b^ji=F0T7ZvwV!&ySj2f5BI4 z661kaCzoga`FHgnN7!`zroX*c41RrGSZYvTwv;bsQb(cGg$o(CYvxXTR^|7)%YOaZ zw3Pevc4T-nM_-f_nYWI6`+qsV7e}YoT)cj!cj{^BUGEqV@Pw)zOShF*zx6Tt?Ad*r zickweDQ(`a<&_q4XItjVav<(kzRQ z#7;U9x%aqEPA`jOm-yEHa|;dxiS3S^xy&QsrR{%S1}Ot?*~s&Jh71f044$rjF6*2U FngCrHhJOG6 diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png b/src/main/resources/assets/taiga/textures/blocks/ore/prometheum.png index 7e18f41aa99897b1526ab22b99bde33c8beeb9b1..f4ed596d0fdf21cc22d8e0f973074a73ba86b522 100644 GIT binary patch delta 946 zcmaD}|F?d_HfC-kvk*gLD`PV&BcsU&nXQreo7q`P7*&!CQ%np~Eev!mj7&{*O$|+q zbS;g|40Y2|Of8d*&6ARh4bnExXMMv$l*-BLxvcn*?9?_eoNUW^V)K6PKL#waFSF)M z-fyE{|I5?GF{I*_$|YZa;Y@}DA9q^#ESFv8pMGoR^O@#R%Zz2a`Fc`yN<9RfqBp#p zAQl;Qz|C>(YMoQgOuN@?IHl&KwC{+7@YjSMAx{&PqKC^eH_cu%-S*AN(`vtcza0qw z@&BKT^y9r%e=~Od*cA3VIa8=Q&UEUk8PDd%<#s3jnFa1HD(`!0I?=KT5UX)@1CuNCx6 zp0#9&N$$+ld$D*~GR@Fqsh`Oo)%ani}hO^*4#OuSleV_CWQdx&A~ z&$9EAmYZF=7^IbTWXkf*N9RW@d%4S{bJ;cT*4sPpOjvjSRN7>o6H(uM7Zxv6|N1Pc z@YbtcQ>B08)+CrnhTllA5>k{>+4=VOjnA{z-EP=(;uBZM?uj`kvgWs#u}`TF=6sx` zw)ySv(n&Vnfh^zl~edO4O4~4&%vh-KT zeOjfVATd>BiG~MrB43MTwD+Il?|IEC()B8yAwI>nBEJeYe|vPtGk8)Wi&Eeu7S{)f z8Yc`6o?E$Q`=wdGQ&UoAF1!Az@=?T-%UiSgizHdA+B)`k~)GH#f0!|N<47>Tl)TWkDp%LoUit2cif+c8NZU=XFj@p z>sHv#dYkta^=sFuF@HHeUwn-oZ;R9Ab-(wOes#1A?4EG`_&HOLPuD*`|E-`B_4ltB zgPXz!)^PJl>fgd=-8Z`)ceShj-@aYdd%xr?yRm4+S*OI^A)6}iHBPv(`ug`*U)L5{ zu3uH0#lyxV#?XKK7@xQp-?Z1syZ$Y)n&Nt5^3yeowiy1a7iD-7wY#I7&8m}ufq}u( L)z4*}Q$iB}mt?*B delta 923 zcmexc|Ga*~HfC-E!w^GrD-&}oW6Q}0nXQreo7q`P7*!GtEi5fl(oA&?&CJYolPpaP zbS*3_Ep-hn&CQHWOpVQqj8itxXMMv$l*-BLxvcn*?9?_eoNUW^V)K6PKL#veiuZp^ z-fyE{|HRY9F{I*_%BA!Emjf6Me2iNWo7z(rd;R;bxck>it6wh@d$nTmG#^Y8W)=lKOQ-o(#gKJ;=_}pNB$pS{(tEE=Ts}l z4bOl7-u(1>aPa->%b3q+r))O$TK{!onZ=*%yho>Je)_twexcOT`OltPJ02)$N~qsf z!O^G>##^TJ#5w6p1) zH#=JH$7jq%FFoTT#rR~#&$SmXZJBz1?wYeH zB|ITrB^u5W!JBT}h>xwm+v{>pl-u0q6?U}xv9ugTMhm@t>g+KhJV7Dq=Pn^s8YyGbCo764( zIBoKm$C)nXUu@;k(LdS|io>bGu5|&OSW$Vl<8h0Q3 zJR8($De!a8jvps^^oR*1am=2%cQFsUoFnDHCR@h6lrNwI=a}X zC#k7Z@klkRr})!0QMt26@A*xeS8?)q^3Tn+$7jr+J^O7|>A`LFcXmwV`^X=2+DAa4 zOGBzo_Q0*htL#)a>HE*m+4SaZ@bX`b3Delvd>l`-INfhL7Pjkkkl&t}?`A2+&R%?p z=Vg^)c-*5MZ$EyV>veRJiZnyo`S0Ir_Q$TBX7YB9T64e&5tjbP_s*ZIyZOOi`q<`U m1%gie3zd$|Rrq1gaC7PU(`y6mlNcBn7(8A5T-G@yGywo)K&bNo diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png b/src/main/resources/assets/taiga/textures/blocks/ore/tiberium.png index 54fde77b667566fac46f7e3a736e9c22b84903eb..547617ec9c815dec718291e31e2b9a888c4503b2 100644 GIT binary patch delta 414 zcmey}!1%j?alf0Lt`srGb>~B$p@LOk@=h1SKYnaChDdd znHcF>rly$crkN#LTBMq!8JHUzZT`jjhJ`4VlLI)-`3#M8k*wY9&wbpG<*Xvds>xEe ze*D_P!ZN(P`r_h&?CkX}E|be`znU}l)7{Or~Bg*Fcv7#J8l MUHx3vIVCg!0QLNLApigX delta 414 zcmey}!1%j?al}0$p@LOk@=h1S9~=~^Zw8S5Gt znON#3ny04frlh5$nHZ%Qr6#2qZ~n#lhJ`4VlLI)-`3#M8k*wY9&wbpG#jK{HXR?&7 zAHRdFteu>!o03u`H}~Gu)XC+x@}e5zB4XKs5=BBhnOt#fY;&TbJXu*MueQ}@^#ZD$*=r+1>ds)m=h)!%rsoV~R0#6qWX4i1J;O^q^c?iCpU9sd54 zee9)~d#9&N&a&5IPSDq%JlkG_d8L5BBzy6WoqKi$vIicK~H;AQKW~GQj?3Rm6VjHqN1y^(t)fDW`_GSUTi*=d8~f0Lt`r=ODhAD$p@LOk@=h1SspX1B&V9DSR@;!=vtZ@S?C(2 znI!2Znpv9Zrly)1Bqy7g7^E2*Zsy~7!$OqG$#T3_$aYL#$$fgW9^W4WmajtF&rjB~ z*RQwrba4!+xW#hNGb1LI;lRi8Rab;2r>W&X+xzq0zrCsV=9wGM)G?0qQS;oK(ZOoF zqe1S=f{uH!d`s0=vNv}{bcEy{+;vyP(Ip_mGb*~(vb#qpqkJcQ8 zk48!3}vyKH)V}UJ0uVF1-7g)>r+6;;iGGt0mbNf5HD(6qW{r}@p_41z| z9#pTID*I-GO04w6Gr9}5<%rnNt6#QxL({A!Kki0))lXi(f6u}9$N6{EedW8(*I)Vm z()N_UsZBL)E87(6N<`Il3nz0O{TMWD+qa8{=IoMAN>@!SZ(kjrSMabmdr$F4tGa+o zlDUNiA4KoV{&T4|Pn+OFu%kGhr^Wc)JM&h5?nq^i>uk@EYalwu?5 zA8qchf7ZNR&v^5Hk+eAh*L6h_*^e~49*gD^KD6}VmX(o=Hy>&3{hGULvF@(Lx@x-Z zHE(5p{t~6aCaNOX+YZG3>M_|{*=u&@QHoJDoh7TjJg z)n~Ao&nvk6B5&u@r4@di>%0$b=}&C42yE08_EBGEr#d6Zx8$z#HfxD8>8&q6{AbYk Xv(8!0^PVdM0|SGntDnm{r-UW|e?8b3 delta 998 zcmZ4A%DAwValnm8XFrV=~|juSm+vB zm>BCOr5Ri3S{R#|8(X9#8=IIJZ|388!$OqG$#T3_$aYL#$$fgW9^W4WmcM?pize&Y z>(}dhx;TbZ++sO+vRfvU;lRUR>?KB*ZLh}OUj6p!>e`vFUap)OmnJmX&uP*{0p_?E z2mY!6m-l+@6DA*NZtjwh=$zG1xLdQSW5I+8M_m+!KD^Rh-XK14{{7{;-+fZHCavajzjhZ3~`z z^{i0ph%V7~slPmzL4SRwxcZG-wx=sTvV>h+P;FRRCluTx8KK!fqiNm*p2b3ed6#_w4`9yFJh5!MFVHKR>qr-t*^C{ce_bGOE!wp%eSn zT8>)H%BxqK<{=ZZ4_5Tj9ea*k4{I~tSA5Zk;-_`a9B=6a= z&|;Iq{aK5m<)WsnHJl~qbe@~7e&M3dzRzE$U;pvBPmu`G2`^~b%pPGwf7YN)0&uNk#OV9+uEb$ zzwIZUd$!`E+BEsaM{mxkvRVG#?aL`a?Y0H-M^Y~8DcN{Ll=19oOFjH(bASD_=Iwey z^|JLc6Q6$Z6+in;0@a_*#; zEE7XB`sP1a(X@2l(Z#isRTW>JY;wGmprRUfPhgAeW@CRr`8$d??y0?Aw&i$V;<~LF z^K>@+Wx4ysAh-35^`0fidb2NGf0Lt`srGbri+brVf2jC9j1 zO;U6%&6CV@Q_Rv*QY}o3lTyr$Hcw=I!$OqG$qTux_>k<>HZYv5&v|0=M(#fbEOShF ze@xzJvytiSy~!!I^O=7=dNi5M&WrimojaR@?GzcAj+~oZX5S%lK}#j#@;9*`3=9km Mp00i_>zopr0Bz+&MF0Q* delta 210 zcmbQ#z&NRaalk<>HZYv5&v|0=M(#fbERPOs z=$^dMW+T(ur;}4`=QDqP^JX%eofq?)yLUGS+bJ?Kt=vDk%)UdU<&TO~>8TYN3=9km Mp00i_>zopr092wxX8-^I diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png b/src/main/resources/assets/taiga/textures/blocks/ore/vibranium.png index 7f57ab84a208474b2054f0dcdfd7a327e1bedc37..7c118ce8ea27504a24d5ab9dec7b2315c6293fb8 100644 GIT binary patch delta 824 zcmZ2nf3SXnCF7}$RyEArMrI*~##Y7_RtA=n_c2=|^EWfH9As26Pqj!gGf7R-O-)Ko z)wN7ANz%12G&IpQGBvO?OfxV@H8(Na{EYPt3sEX3+i;o-8XD;$S*vYeIQcJo{p5H~ zuF1Sy_M4e`{ur>>-_*&P%xtS)U+C%L7*cV|XOefeaG*rnbA7F?H&rvxeYB`daEi+UZB{q}d=?%ZkOpRJ{O*%X)5nANLI zKKU%|cxmkIV`-~HS6^LqHEaL%v!8Pr6k00emQT@IDv{hGpnUn)lOH!q?;bqxvgDTT zvB{H_&vodxTz#*U!q|{|J32bL?{R<^ujPDsd3npe;P`rzUsc~;KU*fp6BaI~r*FR^ zbhYb5ZPm>_*=xNGmHV6-RtH7i{ZaAj@%i^(>zhBm3i}_o_~iHgeX;TFg*Gx43=9lQ zJ2&p$JbBrwxcK^CMbkw;P5gE~e$J=8o8NEWE-tS(U%|(1-4r9=%k`Xz5^A12EB3Em zF8(~db=KEivXlMG@7HhZzHXb|p|kqxEeDRNu9ArYPb%lB1g4f+_8ofWrrg(bB)!k> zPW@-i$(t|MpHNla{w7>A)!>-Hu~gA*xy%es*X}7rNA0?wH#>Xk)U2(yUd~`pSlYAb zL_$xX+teTlW+x9#)46@W_xk<)I7?IP*VWteWZUzPhPgg&ebxsLQ08Pqfg#Z8m delta 775 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/taiga/textures/items/dust/dilithium.png b/src/main/resources/assets/taiga/textures/items/dust/dilithium.png new file mode 100644 index 0000000000000000000000000000000000000000..a691ad2fbdb1dff3203232d8350dceaab5cd5427 GIT binary patch literal 16075 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_qn_%#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(6f1*b8e5p8>LyxRrs*ac zn3x(HnP(&$j$4AT5mGg2d!hJ2O*LP)fC^(;B^kI7*L1N%6N#mqn1Fz zfk<*RxQGlWh_cb(f`kK+qqrn9U2O`PQ;36`hAj(FA3la`QlB2;zWI#cb zjRqGa9Ec=GgNw+3f+!meE=V{KNsa~=kpTr!HX2-za3GQ#4K5-B3ZiT@xFF#`Bsm&f zLqG_5gAYrWuw6b2?rv{(cmI7pdiXdg9{Q4 zM3SSyMPxuhl#K=#Bpiq&M}v#VfPyF+4K7GH5J`>(7m)!4Q8pS}kZ>T991Sia0}7&S zG`Jw)KqNUDTto&GMA>L?LBfGZax}Pz3@C`Q(cprF1Ciuta1j|$5M`sm1qlZt$k04(LhALGChK6PahM)f# z7#dzOFq9fFFuY1&V6d9Oz#yJKDgLM%0|VnVPZ!6Kid#n}`+H0-lsIm`zq~%hXxgbO zva=o><(qrTS;A4)sOz7^Too^k70&H^iX|lzt~zS1(DCVeN#Ao-PLOY|_UBo%qfRl_XUBhMwJcoTA3y8d-E>aQj#77v;-&F@-{PHSoUTZj z$DA9z!}dqWI_?hzPp0mWD>=8cyU#eYYev+C9j0rHtR^qLxxH)QQw@>uk2_*bOn+6*smZlp ze4nw|Kj}$$iPt5i7wcIUB(NDy)l##obr8R*BWl{z`}G?~s1rwQ;DludC%#>~XSQE) z(sQ+W`~3y`)OU(k9}dat%kPf#lf9#REoPDbw3b=F{7j}LoWFKf=5_a{kJ+<6&NL~$ zDdXH}xXaqwCH=*!+NKx1-3(9Cf**ZZSoTrlAJg{C3Fpoz`!=^ZIG9|?)5vBM`2SbB ao}a;4h-jZBR#l66xo5|eZ-%uSMX zlMK^RbPWv5EiBS3&C`q%(VOi4A-H8e~$)3q=+H`h%uOEk4G zG*2`zHZ5@iY|D9K^M39>1}weWWrCCU+vwNt_jGX#skn9K zvcJdVLYdBf`F#EqWaC|AkzpXOhbZbXi z>B?r7(~In9_098|!XqlQ(b=~7MPkm1$mXewZh!uEMRD7K7YXg}A6Ea^^Wb#*dWIwW zdw%S1^qTK-H!>0kAMi+h^SXV+`F1wEZu)?l%&mpSW$M%&GfiCM=zVjs;7JoNKi zjv0%|x2K;J7cN*I_t^W=`S2_b{cuA$Yv1Dhyjzz0bwlksXH?E)T_^C6sk>svan}};<40is zx3!ZVMrfX2ochK0X>qpE{CDB)FC=aKUQcdb@i(mNjwFMwV)wKMg7e(Y8&3c9Awd7x zv(ty~$k{q7ggD$@&^vKylnie)XV25l9)}})^qz#9b++Bx%X0WCi_`HJmB9|b7x1c1 z=q*xazd2uZPM2yix8G5vIbE(t3Oiq|zOC^w@8ObiYtyy6C;W|k6#k?Cz%rZ5zZmAo XpWxbh_vdd01_lOCS3j3^P6~nC4UKgz5=|_0 zlMIqAbxkb{j7*G-Oi~OCk|)n+byZ1DPD@HNG)vYsG)T16H8e~$(@jcFw$!yWFi$f! zF-}f3Ni^Ne!Pd+|oRRCfta%Ym(>5@iY|D9K^M39>1}s5rR#PYMx6!X(i9Gkybo)NZogFb=2`i4wS+lU?widhK>~G0w5ke>4 zJUA-Swt%DCck=s#&eN0RtTOChsLiwbvfRd2^Tabpt1Ay#-+%x8;lWwydrT+pyZp;P zAR4&CS*o$+?Ux4iHHJSQnrYwmtctJaTF%t-yQ@d^(dmCo#y=JQzLdHX7+N-Y(!r;O zit#mvuirmibF13@%U;i8Mh5Ym*X5@w9iP>AJiSv_;?1APqrWC9ez!eyCyaUh_Ph(T zS1vWqJ8oMcW2vRrs}VF?t$Y6Z4ga!R-jo@8AMN&e5>>JBVUo$~NB44gYbQ@-nU^tz zVPAc_RIvQ*i2pa8^S<+aKFSxA?dy|oW)xU($vnK(KGHFK58rtQ$pwmQKG=%>$#30q z_0*Qo^A+!GHma&0zFGWZerTeb_Q&NS>pG?|HMaQL6dt|0L@9EGa_o)+&0DLSK41ND zj5Ybhv9lYEP1;TNIJQq=W#XJIvAFA4UhlV-gkx{+xXfMk>{{{MZHlt#(+^3Pc-&N$ zQ)+m!-}L0x9e$@9Wb<8?+b(;|YxTrHo$3FRnS5*vd#*QZx-R`BfPsO5!PC{xWt~$( F698D%8sh)} diff --git a/src/main/resources/assets/taiga/textures/items/dust/triberium.png b/src/main/resources/assets/taiga/textures/items/dust/triberium.png index 70b0d8ca2573b94eb7dac11fe8a3229d0f29071d..e5ba3d8b44b9ec04b6adde46f3eba1d62505c2c6 100644 GIT binary patch delta 647 zcmX?9yS{eAc4jWa5CcOiQzI)wlgS5}ZIHN|*;z^$RSZ%rEKE}pO>~nC4UKgz5=|_0 zlMIqAbxkb{j7*G-Oi~OCk|)n+byZ1DPD@HNG)vYsG)T16H8e~$(@jcFw$!yWFi$f! zF-}f3Ni^Ne!Pd+|oRRCfta%Ym(>5@iY|D9K^M39>1}s5rR#PYMx6!X(i9Gkybo)NZogFb=2`i4wS+lU?widhK>~G0w5ke>4 zJUA-Swt%DCck=s#&eN0RtTOChsLiwbvfRd2^Tabpt1Ay#-+%x8;lWwydrT+pyZp;P zAR4&CS*o$+?Ux4iHHJSQnrYwmtctJaTF%t-yQ@d^(dmCo#y=JQzLdHX7+N-Y(!r;O zit#mvuirmibF13@%U;i8Mh5Ym*X5@w9iP>AJiSv_;?1APqrWC9ez!eyCyaUh_Ph(T zS1vWqJ8oMcW2vRrs}VF?t$Y6Z4ga!R-jo@8AMN&e5>>JBVUo$~NB44gYbQ@-nU^tz zVPAc_RIvQ*i2pa8^S<+aKFSxA?dy|oW)xU($vnK(KGHFK58rtQ$pwmQKG=%>$#30q z_0*Qo^A+!GHma&0zFGWZerTeb_Q&NS>pG?|HMaQL6dt|0L@9EGa_o)+&0DLSK41ND zj5Ybhv9lYEP1;TNIJQq=W#XJIvAFA4UhlV-gkx{+xXfMk>{{{MZHlt#(+^3Pc-&N$ zQ)+m!-}L0x9e$@9Wb<8?+b(;|YxTrHo$3FRnS5*vd#*QZx-R`BfPsO5!PC{xWt~$( F698D%8sh)} delta 666 zcmZ2qd#HB9c4jV<5JM9yBLgb~h-jZBR#l66xo5|eZ-%uSMX zlMK^RbPWv5EiBS3&C`q%(VOi4A-H8e~$)3q=+H`h%uOEk4G zG*2`zHZ5@iY|D9K^M39>1}weWWrCCU+vwNt_jGX#skn9K zvcJdVLYdBf`F#EqWaC|AkzpXOhbZbXi z>B?r7(~In9_098|!XqlQ(b=~7MPkm1$mXewZh!uEMRD7K7YXg}A6Ea^^Wb#*dWIwW zdw%S1^qTK-H!>0kAMi+h^SXV+`F1wEZu)?l%&mpSW$M%&GfiCM=zVjs;7JoNKi zjv0%|x2K;J7cN*I_t^W=`S2_b{cuA$Yv1Dhyjzz0bwlksXH?E)T_^C6sk>svan}};<40is zx3!ZVMrfX2ochK0X>qpE{CDB)FC=aKUQcdb@i(mNjwFMwV)wKMg7e(Y8&3c9Awd7x zv(ty~$k{q7ggD$@&^vKylnie)XV25l9)}})^qz#9b++Bx%X0WCi_`HJmB9|b7x1c1 z=q*xazd2uZPM2yix8G5vIbE(t3Oiq|zOC^w@8ObiYtyy6C;W|k6#k?Cz%rZ5zZmAo XpWxbh_vdd01_lOCS3j3^P6UzPhLaC6n_>}VVVR|pXqcL8nV6EQ zYiev_sB30qVxgOqVrZain38B|WMpP;WSDHc`4G!J7NS&6=Hf8NV$o@~`pJHrT$68e z*l)hb^~Zo^b@9sh$rr8l>yP`DWS4om?!R+q!;F+W)-%*L|P4 zOB)zEg#708Ke}dKWLy^M;-b0q8Xw2nAFtJXC3Y0>-eP1v!5r6djNQY>erl-p@<;nr zyj(iw?$Ud=YHrtBm-{=t3pfgxRTuF1Fh%id1^8Y&;kTr6&TjYQql>RB{-FC(v)t(N zYQYy-X~EvYA`MeGc^lTfa{MfH$8+*I{rU+U`xp|=ZS9aV_$#6QePMsCV|H1iFbCI< z(u(9mA8g*gkuM0H)6yrC@>xuN;!J^~OC#Hg&)5G`;O4#iR$xBE`eS!~`|l~*K?X9R6vF5r~i#&?5FgweVAZd_Jpe$TQX5uUjx4``IV zR$aDfN5%iHAf-chABR89$rjP+ZlCYY;r{Eyk>!=U=NwXB%OlDEA!P0n+0!MdQ6dg0 zrZMV)edibqUdT+DcP#Iim^vrh?TRp&W7$?GZ+UNd`p5cJzsC3P-ne<9L{bYy0`nKY#e};b)GeBDXt_nJF*2_`=>)?lep2wVCP@j9t#m{t;V0y}tQYcOC13 zmPdc4YJ4qXXKubeHOPxYahsgLtq-|Qvljh-<;%guHi7w$K<`)K`Sq*3!orU1;XHET zruD%!adTF$e-)DB`b#gqS=hlgfaTNyo&{GIFkN-&JyX(k{3d&amY!njT)Xmh6*F4p zc0`Ep^9xWBs&fMY)Pbc5&}>p{jqE@jrG_FZ#qCwOLrk!J*Or zkhHMd^vd=1MKkrOv{*QAaZ9;8Q#9{0pB1wfTt8Uv z)p=yHCeykyt)k{Fw#_k{mnVcd2tNqfa`RRKe*gmyFW;_}NB0{}^qFL?V*HP@BwHpp z!bG&kZQ;FD=YDU`+p}wnKG(FPi_a&2Y5VPQ{8{Dpc}G@%Gfd)nxXQ}o=Jl5z+c_Ev zR+e9ODXn5`NIbs5>fOtvqS7{p1yj>o1Me(r?s14)V)|ORKEzU}lfgh>=iR>_-aYuS yZd3pIPuBM~WqW6wnek|P>ul*i@ALl{GL-MXXxV;v?s^6W1_n=8KbLh*2~7at#zQy& diff --git a/src/main/resources/assets/taiga/textures/items/ingot/astrium.png b/src/main/resources/assets/taiga/textures/items/ingot/astrium.png index 0117982283956e88f5b0a1e9bf46b3288b7c2d45..8d39829889c8790045d3f8840930a1a6d1de749f 100644 GIT binary patch delta 624 zcmaD~{ib@uHfC-kvk)U=D-#1N6T`^|nXOUy>@0ItQcMkvO;U~1bWP2ZjdTqYO)PX1 zlMKyu4b9V%3{%p~%uJF~HlJX5!$OqG$#NX#e1=B4NVaa4-!3# zexJHfbNu37y}c>@*I(MrJ;FHGr9WN-mdqD%d(!HuyUE-9R+9BL_vD2~ z^R^syE}h#`KS|Ym`e8v)E$(QM{M|N@ndcdLf^U7FpL~9|NXY5wk2v_PA0@Wi$`me~ zw(q>(nmW#k-x)_vvoo)maCX(Kq~MUk7I)7bI~Hm^?eLB}8{C_JIWBMW^cxH1vg4R~ z7I>=09T$|-&fbCb^hkN?(BU!iIBvEkTUhn}8EdoOi* f|Nm?LPmX~naE)j_huBjF1_lOCS3j3^P6@0It%ncF~QJZrWsD{yIT^Q~aXydTwhIn?Xm2xlDezb zRH_;@sZFhrb+6D_t(o)iA=~OHt=@sU3Fj?k(&i<%>WDFYSBsvg;yJ759LFpP$H`aL zik{jm=08mgjuSb+0e-A jTa>om-|zQ-WHbD%U&H&c#QHx20|SGntDnm{r-UW|Nof~! diff --git a/src/main/resources/assets/taiga/textures/items/ingot/aurorium.png b/src/main/resources/assets/taiga/textures/items/ingot/aurorium.png index b9711f5369f0bf47dacba92a043b0d3991564179..5ca4a483a83ece4a93a06b36970fa4becdea6c26 100644 GIT binary patch delta 746 zcmcazbFF5>W@bS{BV8l25F=wN69X#~3vC0#$w!z?v50c9%u+EnG%-uFG)>brG)pwo zwKO$J*0nS@OVl+mOf@$)F-$Trwlv&)g5?bhQ7R|PahPLTv{`}ch#||fWgl}Vzp&P? z*Yb3645_$vWb%FQ;6jOG`|Hmx*qz67$bsW%NYvS6i)C`tZ{J*&dF#j)6({ev?2}R@ zngR~Kagttm*JIL(fRNiI3!nC%l{G(ax$aqi(5CJa{^CK73t8g694P*L=y~PCrOSoP ztg_yGzs)_GDnK$&VBO0BKlpHS^MFf-hIyRr5rx9V#gBR9 zZPFG^e{X#MnR4OE$tUL4U1=-M*m_pyR#9b|w&RjjXL9bmeZJcMK>eX!yKA3}I;y2+ zd@M`e@?FUOb?U-vXREx$X9XQj3Y7ggsr!uV$+Q@|UXQu@$`8vnU%BM9WM6ye?w*Tx z`U=msFT3G+L)#$7FT`7I(iFf3givaRy)w(SfI3=E#GelF{r5}E)uX-(|_ delta 750 zcmcasbGv54W@bSHb6q3T5JMv?BLgc_OKk(A$w!z?v50c9%u=y5FtjkWv^3F8O}0$Y zO*1qx*0nGxdys!`ywJCcm)O zuh;ijgfwv3c*!d@rjlQx%NLvY()H zSfGV#nfNV^w{DYMS{L0~#;rSd_Uzg3WpArw-FSZ;sI+UE8rr+=^dJ=2a?Qi_*e zrX3D!O*0eHTc=X;%L^ui?3r=*T#&c+!C!LM&KN}% zTi@apUzMbmw$8ygvQxr{Q{MluvL}!B)t=i~Wz$c1-JfWA(s9qCX%jYf^ais%TVfT` z-FP9h(<97k-zJ%3o47xm65DdcV~X>m{8`!s0w>NUe?5}8?2^%kXfDZX-aow7R=58P xF*toW44$rjF6*2Ung9cpOq>7! diff --git a/src/main/resources/assets/taiga/textures/items/ingot/basalt.png b/src/main/resources/assets/taiga/textures/items/ingot/basalt.png index 29f66483f0f6cba42236c06a4fc0fd2bc11ce7bc..4e8eb4af9989b06e86a56576a5524258aac82d93 100644 GIT binary patch delta 696 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 wLUwno^<%rdVwPxX zVQ8LcU~Fi#*^srFg*YSSIL!GBQ5?8gmg~47i@}AX;gerj>({G$x;TbZ+&VHj)?;#^ z#L@rRv-OKLJRKVyMc!@opTLzRV!828gG=)?uDU74!IyUOTwF6}l7?4^n&?$m!HlNL zWJi~dRL=}I$0ilCK=I6yg>IUA-v8UL$Ff+7bI*$dJO9X5$ej~xi0C>xi8&sN4?g`#G1or1 zzDrS?aAZZC-|Z5Wt>43RS~x;OTc0}_+5H+U^vW7(s*cT)bQzLO2znn^Pz+^$$^`Eo|*)06c%Oxvr! zPpFQ2ctljYGL&n&{8}~3;|&GX%`fL?FS#y$GC-k!yU{H6`0t+zjvag)sXn#*a6$a0 zNsoCKeSE6N#>6f;rEJ$0-6cDCIu zs>ZCJUPg|6yTe27Nsyvr2xT;a#UN?R7krVGy9Fx{D&W+e8vE#y#|ND-~Gc(M* Xr>WR_Xg&)A0|SGntDnm{r-UW|#V$o_ delta 776 zcmcaybFF5>7G_>UU1Ng~BV#KQ6DwoW$p@J&(L~r;=BlKcnCL5Wg z=_VPQ80wlN8Kzm97?`CcCmKyY!Q!ftoSc@FW@whIYiN*YscUGMYNnf%oNTFUX<(ja zY+{_8YLaNW*^srFg*YSSIL!GBQ5?8gmg~47i*(^)p~)|-_3O1fT^vIyZXKC?+j}yj z#IgNC#lOvRPdj&|h1bd**b|`P|6`}6+1YC+Kg_mDxxZ=Y!^CZw%a({{R!p46Qf%&) zQaNk(Ylm6ec4@v?w!nMk?hogGlqyPydOmRFx0$~G`P16UI7Wf8!gfl>)$RSa;&|s3*v&UfpIJ5e zpu7FVNpAuhmwD<>4lX`nKr-Nb6eu^=V!`?-rt`2Q^D|;*6fL2-TnmDb2IB_ zzu=i=P+c1Fizi~2%M=GD)h@AxZf6tT{!X@H(qyr#dKss6SbF7=?J-B+ZtuOp9=!1< z&kXC*Eo@plcLw#Rzta#GE7B~@5cD~l>9Wt)=+~NAtG2~l(KLQnseJWt)tcIqSNvrT z%5Pn8?n$BgwL>4WY;(O?cg%Y+QU9gDnZA0HbuOu5`|mt>wW;&dvygNCX-WHMJNmmU ztKB%`pt$_x>n^Z6 zdr0<|s8*3mz_Uxim4=nCI~o+Mg9_SsEyOQPoZ4*S+g;*fRB&EZG5&J!Rbh9>X14D5 z{jp1&?L%&BKjM*I5x`fF|4uJ%dS_RgriwcmOF>NTM%_osLi9=^6@?t!;z|Gww{ cF=SY)^tI^lieJwd7#J8lUHx3vIVCg!0C~Yq$^ZZW diff --git a/src/main/resources/assets/taiga/textures/items/ingot/triberium.png b/src/main/resources/assets/taiga/textures/items/ingot/triberium.png index 1577e4a22c6f55606ae8351451a823b925f29b6f..fb6395dad732164bf85d405444cd0f7fe119c613 100644 GIT binary patch delta 776 zcmcaybFF5>7G_>UU1Ng~BV#KQ6DwoW$p@J&(L~r;=BlKcnCL5Wg z=_VPQ80wlN8Kzm97?`CcCmKyY!Q!ftoSc@FW@whIYiN*YscUGMYNnf%oNTFUX<(ja zY+{_8YLaNW*^srFg*YSSIL!GBQ5?8gmg~47i*(^)p~)|-_3O1fT^vIyZXKC?+j}yj z#IgNC#lOvRPdj&|h1bd**b|`P|6`}6+1YC+Kg_mDxxZ=Y!^CZw%a({{R!p46Qf%&) zQaNk(Ylm6ec4@v?w!nMk?hogGlqyPydOmRFx0$~G`P16UI7Wf8!gfl>)$RSa;&|s3*v&UfpIJ5e zpu7FVNpAuhmwD<>4lX`nKr-Nb6eu^=V!`?-rt`2Q^D|;*6fL2-TnmDb2IB_ zzu=i=P+c1Fizi~2%M=GD)h@AxZf6tT{!X@H(qyr#dKss6SbF7=?J-B+ZtuOp9=!1< z&kXC*Eo@plcLw#Rzta#GE7B~@5cD~l>9Wt)=+~NAtG2~l(KLQnseJWt)tcIqSNvrT z%5Pn8?n$BgwL>4WY;(O?cg%Y+QU9gDnZA0HbuOu5`|mt>wW;&dvygNCX-WHMJNmmU ztKB%`pt$_x>n^Z6 zdr0<|s8*3mz_Uxim4=nCI~o+Mg9_SsEyOQPoZ4*S+g;*fRB&EZG5&J!Rbh9>X14D5 z{jp1&?L%&BKjM*I5x`fF|4uJ%dS_RgriwcmOF>NTM%_osLi9=^6@?t!;z|Gww{ cF=SY)^tI^lieJwd7#J8lUHx3vIVCg!0C~Yq$^ZZW delta 773 zcmcasbGc^27G_=}T?3O4LlY|_11m$z$p@J&(L~r;=Bk({CmLI%rJ3p)B$=4#8X1~c z=q4Jb8R(`NnVTD@7+YGTnpjRg!Q!f7nv`almS~owo0yVnqHAcFYNl&pZf>rdVwPxX zVQ8LcU~Fi#*^srFg*YSSIL!GBQ5?8gmg~47i@}AX;gerj>({G$x;TbZ+&VHj)?;#^ z#L@rRv-OKLJRKVyMc!@opTLzRV!828gG=)?uDU74!IyUOTwF6}l7?4^n&?$m!HlNL zWJi~dRL=}I$0ilCK=I6yg>IUA-v8UL$Ff+7bI*$dJO9X5$ej~xi0C>xi8&sN4?g`#G1or1 zzDrS?aAZZC-|Z5Wt>43RS~x;OTc0}_+5H+U^vW7(s*cT)bQzLO2znn^Pz+^$$^`Eo|*)06c%Oxvr! zPpFQ2ctljYGL&n&{8}~3;|&GX%`fL?FS#y$GC-k!yU{H6`0t+zjvag)sXn#*a6$a0 zNsoCKeSE6N#>6f;rEJ$0-6cDCIu zs>ZCJUPg|6yTe27Nsyvr2xT;a#UN?R7krVGy9Fx{D&W+e8vE#y#|ND-~Gc(M* Xr>WR_Xg&)A0|SGntDnm{r-UW|#V$o_ diff --git a/src/main/resources/assets/taiga/textures/items/ingot/valyrium.png b/src/main/resources/assets/taiga/textures/items/ingot/valyrium.png index ad2bc73b050434757dcdb03be5da95d2850094bf..0adcd37284ebe90fbc7a784020359d82e8bac97e 100644 GIT binary patch delta 748 zcmaD{bF*f{HfC-kvk)U=D`QJ56Vu5DnXOUy>@0It3`{M|(vp+Rbq$S;l68|3O)PXR z%+kztlMF4AEt4!$jgpfRH=kg+$3m3K$pReae1=B4NVaa~=Q?i4vRm9!Y4R;={d#Lp z7srr_TSq3J_6{kOIcmSZ`n}CME4!fM=}Q*5WCjR%xrnifiFGAR*tW9XAu41GSJc)O zzTFFacblzqnxLVoG+E5c3v(wx=p@m zl&;?KdVY^7tEOP!j}re{-?o3bjx%RYH8QT(ewr4x>wVe9zaO|HZ%;UP(R#PsJNW z45@X=&DoFjd={JVPQ9&YVb525nWuKek@eMHwrlMbbsw^bo=sfSSI4wAx8kMBx#QnG z3MEfHKVI*>{Ntj)M~9WysW z!wZZmZ@8Ii5))S>$2AD=VG#C~v}aLMBv0|Nttr>mdKI;Vst E09+D8rT_o{ delta 758 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 VR!&-Wnt_3V!PC{xWt~$(695Oax^Msh delta 409 zcmexb`MPq$7G_>UT|slBko9L#bBqo~~CMO!DSz1g!!Q!ftoSc@FW@whIYiN*YscUGMYNnf%oNTFUX<(ja zY+{_8YLaNW*^srFMVSaAC(CkJ@EM}GZ?i1daYL5WRFAnwpN``W$N{?Giq4%obz9~zWBfR&|N3L)*t`(_3!*GljfH& zzbgOnw?9_zvwf1-@&5}v*Ze=}#lBNo<-c{v$3OC&o-;*wBp5y~c{F1|<`;ej1_lOC LS3j3^P6{;6 diff --git a/src/main/resources/assets/taiga/textures/items/nugget/triberium.png b/src/main/resources/assets/taiga/textures/items/nugget/triberium.png index 7b524ba123a31f444a8aa2b8a1f3a110f04fdc02..8f648229b3004af6dfb06bb8a4620cf3a0163e18 100644 GIT binary patch delta 409 zcmexb`MPq$7G_>UT|slBko9L#bBqo~~CMO!DSz1g!!Q!ftoSc@FW@whIYiN*YscUGMYNnf%oNTFUX<(ja zY+{_8YLaNW*^srFMVSaAC(CkJ@EM}GZ?i1daYL5WRFAnwpN``W$N{?Giq4%obz9~zWBfR&|N3L)*t`(_3!*GljfH& zzbgOnw?9_zvwf1-@&5}v*Ze=}#lBNo<-c{v$3OC&o-;*wBp5y~c{F1|<`;ej1_lOC LS3j3^P6{;6 delta 420 zcmaD|`L%Mx7G_=}T?3O4LlY|_11n>b$p@J&(L~r;=Bk(&npq^Lni%P(B^ssZCK{O- z=vo*Un&>85TAHLrdVwPxX zVQ8LcU~Fi#*^srFg*YSSIL!GBQ5?8gmg~47%l!W#0h3=?>(`(3ba4!+xRvzd|9^XC z)ftI1q!uh&c5K46Bmeg2Ehw`A_|1 z!}I%Mf9wCMzxn^Q-t_-<`@Wy@_s{&ZUpVir{Y5sJis0Y%FYh+|kB(3M@BjM2&-;5X z|Ng({^|$|?Tt`yBhx}XqjpI*ze4+lI|I^Zc{`c%_eI|SA|Ma_@fA)W?`}2S4_D~P= zgvXCt{u}4L`lmnp)bIUCa{vF&G2^>*`QS5gtN)jGS^R&#rO;qP>H&_E+zpHjhRH9r VR!&-Wnt_3V!PC{xWt~$(695Oax^Msh diff --git a/src/main/resources/assets/taiga/textures/logo.png b/src/main/resources/assets/taiga/textures/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..ef1862b2952d976f8ae935a7cb50a5eb34a63cf5 GIT binary patch literal 44669 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +