From 0193f9f45f79268edda7a0525600649fb7bf82c5 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Tue, 17 May 2016 23:40:24 +0200 Subject: [PATCH] Fixed some blocks and colors! Put back in integration of materials - something's wrong here --- .../java/com/sosnitzka/ztic_addon/Fluids.java | 30 +++++++++--------- .../java/com/sosnitzka/ztic_addon/Items.java | 4 +-- .../java/com/sosnitzka/ztic_addon/ZTiC.java | 4 ++- .../ztic_addon/blocks/BlockTiberium.java | 11 ++++--- .../ztic_addon/recipes/Crafting.java | 7 ++-- .../ztic_addon/recipes/Smelting.java | 4 +-- ...oxtunyx_block.json => noctunyx_block.json} | 0 .../models/item/tiberium_nugget.json | 6 ++++ .../models/item/tiberium_shard_stable.json | 6 ---- .../textures/blocks/adamantite_block.png | Bin 15849 -> 15797 bytes .../textures/blocks/aegisalt_block.png | Bin 15903 -> 15915 bytes .../textures/blocks/astrium_block.png | Bin 16000 -> 15985 bytes .../textures/blocks/dyonite_block.png | Bin 16038 -> 16253 bytes .../textures/blocks/ignitite_block.png | Bin 16488 -> 16451 bytes .../textures/blocks/imperomite_block.png | Bin 15688 -> 15872 bytes .../textures/blocks/lumixyl_block.png | Bin 16181 -> 16289 bytes .../textures/blocks/nitronite_block.png | Bin 16053 -> 16298 bytes .../textures/blocks/nucleum_block.png | Bin 15956 -> 15995 bytes .../textures/blocks/rubium_block.png | Bin 15975 -> 15981 bytes ...m_shard_stable.png => tiberium_nugget.png} | Bin 15741 -> 15826 bytes .../textures/items/tic/cryptogen_ingot.png | Bin 15830 -> 15861 bytes .../textures/items/tic/ignitite_ingot.png | Bin 16267 -> 16288 bytes .../textures/items/tic/imperomite_ingot.png | Bin 15797 -> 15813 bytes .../textures/items/tic/lumixyl_ingot.png | Bin 16295 -> 16286 bytes .../textures/items/tic/meteorite_ingot.png | Bin 15799 -> 15815 bytes .../textures/items/tic/mythril_ingot.png | Bin 15794 -> 15807 bytes .../textures/items/tic/nitronite_ingot.png | Bin 16247 -> 16254 bytes ...{noxtunyx_ingot.png => noctunyx_ingot.png} | Bin 16264 -> 16261 bytes .../textures/items/tic/nucleum_ingot.png | Bin 15909 -> 15944 bytes .../textures/items/tic/rubium_ingot.png | Bin 15943 -> 15962 bytes .../textures/items/tic/tiberium_ingot.png | Bin 15960 -> 15960 bytes .../textures/items/tic/titanite_ingot.png | Bin 16121 -> 16110 bytes .../textures/items/tic/vibranium_ingot.png | Bin 15871 -> 15891 bytes .../textures/items/tic/violium_ingot.png | Bin 15828 -> 15861 bytes 34 files changed, 39 insertions(+), 33 deletions(-) rename src/main/resources/assets/ztic_addon/models/block/{noxtunyx_block.json => noctunyx_block.json} (100%) create mode 100644 src/main/resources/assets/ztic_addon/models/item/tiberium_nugget.json delete mode 100644 src/main/resources/assets/ztic_addon/models/item/tiberium_shard_stable.json rename src/main/resources/assets/ztic_addon/textures/items/{tiberium_shard_stable.png => tiberium_nugget.png} (93%) rename src/main/resources/assets/ztic_addon/textures/items/tic/{noxtunyx_ingot.png => noctunyx_ingot.png} (93%) diff --git a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java index 01242d5..26d45b4 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java @@ -10,37 +10,37 @@ import java.lang.reflect.Field; public class Fluids { public static BasicTinkerFluid arcaniteFluid = new BasicTinkerFluid("arcanite", 0xFF272354, true, 200, 10, 4000); - public static BasicTinkerFluid titaniteFluid = new BasicTinkerFluid("titanite", 0xFFC3F93D, true, 200, 10, 4000); + public static BasicTinkerFluid titaniteFluid = new BasicTinkerFluid("titanite", 0xFFe0ede7, true, 200, 10, 4000); public static BasicTinkerFluid adamantiteFluid = new BasicTinkerFluid("adamantite", 0xFFc45c82, true, 200, 10, 4000); - public static BasicTinkerFluid violiumFluid = new BasicTinkerFluid("violium", 0xFF77a19a, true, 200, 10, 4000); + public static BasicTinkerFluid violiumFluid = new BasicTinkerFluid("violium", 0xFF264c4f, true, 200, 10, 4000); public static BasicTinkerFluid bismuthFluid = new BasicTinkerFluid("bismuth", 0xFF555555, true, 200, 10, 4000); public static BasicTinkerFluid eterniteFluid = new BasicTinkerFluid("eternite", 0xFFfafa98, true, 200, 10, 4000); - public static BasicTinkerFluid ignititeFluid = new BasicTinkerFluid("ignitite", 0xFFd29453, true, 200, 10, 4000); + public static BasicTinkerFluid ignititeFluid = new BasicTinkerFluid("ignitite", 0xFFff6642, true, 200, 10, 4000); public static BasicTinkerFluid karmesineFluid = new BasicTinkerFluid("karmesine", 0xFFc16d6d, true, 200, 10, 4000); public static BasicTinkerFluid meteoriteFluid = new BasicTinkerFluid("meteorite", 0xFF6e6a62, true, 200, 10, 4000); public static BasicTinkerFluid mindoriteFluid = new BasicTinkerFluid("mindorite", 0xFF6bbbbf, true, 200, 10, 4000); public static BasicTinkerFluid mythrilFluid = new BasicTinkerFluid("mythril", 0xFFa8c0ba, true, 200, 10, 4000); public static BasicTinkerFluid palladiumFluid = new BasicTinkerFluid("palladium", 0xFFfe5c05, true, 200, 10, 4000); public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum", 0xFF2b282f, true, 200, 10, 4000); - public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium", 0xFF86bd5a, true, 200, 10, 4000); - public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium", 0xFFb6bba8, true, 200, 10, 4000); - public static BasicTinkerFluid rubiumFluid = new BasicTinkerFluid("rubium", 0xFF3e3c6f, true, 200, 10, 4000); + public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium", 0xFF5f9e2d, true, 200, 10, 4000); + public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium", 0xFFc4ddc8, true, 200, 10, 4000); + public static BasicTinkerFluid rubiumFluid = new BasicTinkerFluid("rubium", 0xFFe371b0, true, 200, 10, 4000); public static BasicTinkerFluid astriumFluid = new BasicTinkerFluid("astrium", 0xFF7a3b74, true, 200, 10, 4000); - public static BasicTinkerFluid nitroniteFluid = new BasicTinkerFluid("nitronite", 0xFF659933, true, 200, 10, 4000); - public static BasicTinkerFluid proxideumFluid = new BasicTinkerFluid("proxideum", 0xFF416565, true, 200, 10, 4000); - public static BasicTinkerFluid noctunyxFluid = new BasicTinkerFluid("noctunyx", 0xFF6c6aa3, true, 200, 10, 4000); - public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomite", 0xFF339966, true, 200, 10, 4000); + public static BasicTinkerFluid nitroniteFluid = new BasicTinkerFluid("nitronite", 0xFFdfe553, true, 200, 10, 4000); + public static BasicTinkerFluid proxideumFluid = new BasicTinkerFluid("proxideum", 0xFF2f7177, true, 200, 10, 4000); + public static BasicTinkerFluid noctunyxFluid = new BasicTinkerFluid("noctunyx", 0xFF5f5081, true, 200, 10, 4000); + public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomite", 0xFFff6642, true, 200, 10, 4000); public static BasicTinkerFluid cryptogenFluid = new BasicTinkerFluid("cryptogen", 0xFF9f8a4a, true, 200, 10, 4000); - public static BasicTinkerFluid fractoryteFluid = new BasicTinkerFluid("fractoryte", 0xFFb44a14, true, 200, 10, 4000); + public static BasicTinkerFluid fractoryteFluid = new BasicTinkerFluid("fractoryte", 0xFF983f11, true, 200, 10, 4000); public static BasicTinkerFluid seismodiumFluid = new BasicTinkerFluid("seismodium", 0xFF46131D, true, 200, 10, 4000); public static BasicTinkerFluid terramiteFluid = new BasicTinkerFluid("terramite", 0xFFa6b27a, true, 200, 10, 4000); - public static BasicTinkerFluid lumixylFluid = new BasicTinkerFluid("lumixyl", 0xFFbde398, true, 200, 10, 4000); + public static BasicTinkerFluid lumixylFluid = new BasicTinkerFluid("lumixyl", 0xFFfbe8cb, true, 200, 10, 4000); public static BasicTinkerFluid solariumFluid = new BasicTinkerFluid("solarium", 0xFFffc81d, true, 200, 10, 4000); public static BasicTinkerFluid dyoniteFluid = new BasicTinkerFluid("dyonite", 0xFFff6743, true, 200, 10, 4000); - public static BasicTinkerFluid ultraniteFluid = new BasicTinkerFluid("ultranite", 0xFFfff69b, true, 200, 10, 4000); - public static BasicTinkerFluid nucleumFluid = new BasicTinkerFluid("nucleum", 0xFFc1ff68, true, 200, 10, 4000); - public static BasicTinkerFluid aegisaltFluid = new BasicTinkerFluid("aegisalt", 0xFFb7a2bd, true, 200, 10, 4000); + public static BasicTinkerFluid ultraniteFluid = new BasicTinkerFluid("ultranite", 0xFFf5f294, true, 200, 10, 4000); + public static BasicTinkerFluid nucleumFluid = new BasicTinkerFluid("nucleum", 0xFFa8ea3b, true, 200, 10, 4000); + public static BasicTinkerFluid aegisaltFluid = new BasicTinkerFluid("aegisalt", 0xFFb6af74, true, 200, 10, 4000); public static BasicTinkerFluid bysmuidFluid = new BasicTinkerFluid("bysmuid", 0xFF7b97b0, true, 200, 10, 4000); diff --git a/src/main/java/com/sosnitzka/ztic_addon/Items.java b/src/main/java/com/sosnitzka/ztic_addon/Items.java index 787cbe3..eb368c0 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Items.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Items.java @@ -59,8 +59,8 @@ public class Items { public static Item aegisaltIngot = new BasicItem("aegisalt_ingot", PREFIX_INGOT); public static Item bysmuidIngot = new BasicItem("bysmuid_ingot", PREFIX_INGOT); - public static Item tiberiumShardInstable = new BasicItem("tiberium_shard_instable", PREFIX_NUGGET); - public static Item tiberiumShardStable = new BasicItem("tiberium_shard_stable", PREFIX_NUGGET); + public static Item tiberiumShardInstable = new BasicItem("tiberium_shard_instable"); + public static Item tiberiumShardStable = new BasicItem("tiberium_nugget", PREFIX_NUGGET); public static void register() { Field[] declaredFields = Items.class.getDeclaredFields(); diff --git a/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java b/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java index 324eaff..a9e6277 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java +++ b/src/main/java/com/sosnitzka/ztic_addon/ZTiC.java @@ -109,7 +109,9 @@ public class ZTiC { registerTinkerMaterial("InstableDyonite", dyonite, dyoniteFluid, 1, 5, 6, 3, 0.8f, 0, 100, false, true); - + for (MaterialIntegration m : integrateList) { + m.integrateRecipes(); + } } @EventHandler diff --git a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java index 1ac64e7..85255e5 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java +++ b/src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java @@ -14,6 +14,7 @@ import net.minecraft.world.World; import java.util.Random; import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_ORE; +import static slimeknights.tconstruct.TConstruct.random; public class BlockTiberium extends BasicBlock { @@ -32,7 +33,7 @@ public class BlockTiberium extends BasicBlock { @Override public int quantityDropped(IBlockState state, int fortune, Random random) { - return MathHelper.getRandomIntegerInRange(random, 1, MathHelper.getRandomIntegerInRange(random, 1, 31 + fortune)); + return MathHelper.getRandomIntegerInRange(random, 1, MathHelper.getRandomIntegerInRange(random, 1, 5 + fortune)); } @Override @@ -42,15 +43,15 @@ public class BlockTiberium extends BasicBlock { @Override public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn) { - if (new Random().nextBoolean() || new Random().nextBoolean()) { - worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 1f, true, true); + if (MathHelper.getRandomIntegerInRange(random, 1, 15) > 10) { + worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 1.3f, true, true); } } @Override public void onBlockDestroyedByPlayer(World worldIn, BlockPos pos, IBlockState state) { - if (new Random().nextBoolean() && new Random().nextBoolean() && new Random().nextBoolean()) { - worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 1f, true, true); + if (MathHelper.getRandomIntegerInRange(random, 1, 30) < 3) { + worldIn.newExplosion(null, pos.getX(), pos.getY(), pos.getZ(), 1.0f, true, true); } } diff --git a/src/main/java/com/sosnitzka/ztic_addon/recipes/Crafting.java b/src/main/java/com/sosnitzka/ztic_addon/recipes/Crafting.java index a02af7a..1a7161b 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/recipes/Crafting.java +++ b/src/main/java/com/sosnitzka/ztic_addon/recipes/Crafting.java @@ -1,15 +1,18 @@ package com.sosnitzka.ztic_addon.recipes; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.registry.GameRegistry; -import static com.sosnitzka.ztic_addon.Items.fuel_brick; -import static com.sosnitzka.ztic_addon.Items.lignite; +import static com.sosnitzka.ztic_addon.Items.*; public class Crafting { public static void register() { GameRegistry.addShapelessRecipe(new ItemStack(fuel_brick), Items.COAL, Items.COAL, Items.COAL, lignite, lignite, lignite); + GameRegistry.addShapedRecipe(new ItemStack((tiberiumShardStable), 3), "STS", "TST", "STS", 'T', new ItemStack(tiberiumShardInstable), 'S', new ItemStack(Item.getItemFromBlock(Blocks.SAND))); + GameRegistry.addShapedRecipe(new ItemStack((tiberiumShardStable), 2), "GTG", "TGT", "GTG", 'T', new ItemStack(tiberiumShardInstable), 'G', new ItemStack(Item.getItemFromBlock(Blocks.GRAVEL))); } } diff --git a/src/main/java/com/sosnitzka/ztic_addon/recipes/Smelting.java b/src/main/java/com/sosnitzka/ztic_addon/recipes/Smelting.java index 305187e..91b07b2 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/recipes/Smelting.java +++ b/src/main/java/com/sosnitzka/ztic_addon/recipes/Smelting.java @@ -12,8 +12,8 @@ import static com.sosnitzka.ztic_addon.Items.*; public class Smelting { public static void register() { GameRegistry.addSmelting(slagironOre, new ItemStack(slagironIngot), 1.0F); - GameRegistry.addSmelting(new ItemStack(slagironIngot, 3), new ItemStack(iron_nugget), 0); - GameRegistry.addSmelting(new ItemStack(slaggoldIngot, 3), new ItemStack(Items.GOLD_NUGGET), 0); + GameRegistry.addSmelting(new ItemStack(slagironIngot), new ItemStack(iron_nugget), 0); + GameRegistry.addSmelting(new ItemStack(slaggoldIngot), new ItemStack(Items.GOLD_NUGGET), 0); GameRegistry.addSmelting(new ItemStack(tiberiumShardInstable), new ItemStack(tiberiumShardStable), 0.2F); GameRegistry.addSmelting(titaniteOre, new ItemStack(titaniteIngot), RandomUtils.nextFloat(0F, 2F)); diff --git a/src/main/resources/assets/ztic_addon/models/block/noxtunyx_block.json b/src/main/resources/assets/ztic_addon/models/block/noctunyx_block.json similarity index 100% rename from src/main/resources/assets/ztic_addon/models/block/noxtunyx_block.json rename to src/main/resources/assets/ztic_addon/models/block/noctunyx_block.json diff --git a/src/main/resources/assets/ztic_addon/models/item/tiberium_nugget.json b/src/main/resources/assets/ztic_addon/models/item/tiberium_nugget.json new file mode 100644 index 0000000..bb9a137 --- /dev/null +++ b/src/main/resources/assets/ztic_addon/models/item/tiberium_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tiberium_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/tiberium_shard_stable.json b/src/main/resources/assets/ztic_addon/models/item/tiberium_shard_stable.json deleted file mode 100644 index bed14a1..0000000 --- a/src/main/resources/assets/ztic_addon/models/item/tiberium_shard_stable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tiberium_shard_stable" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/adamantite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/adamantite_block.png index 16b9e0738c25e4d45e63a1c655ae53044144623c..fc588a60672d3974e7c83ef2d3d75a990d2b5bf3 100644 GIT binary patch delta 578 zcmaD^y|sG7c4jW~5F;Zi6EiDQ^T`L9ZIHR_EOS*%4Gm39QcVqXP0fvsb(73Z5_JHDoVzbH`IfbQ{d7+k$B>F! zJ`*kTL<2=!{O{KNJ*&XN)+oTqXlNOon4QydS73rgf)Uf{x9`eVbL?Z*S|2&zuCDIi zk4;M^9}Ac}El}hFW2Wx3MXOeMT{`>L?q2+!>faAddwUMe|2e(Epn;3S&%n?;{@X{} z{r9dIcNxDb4-oQFNHp}keR<}|FBSFQzHt6m?r>u8G@9&oG3aPleih5J`Evf#Dr#nM-`uO7NuloA-b+bZ+WiJ<>%m2MTuzQO~ z{h}cC^~+CB-SBnU@1ssn9<)D=laIBLn6ky|(XUTdYND#AH72qAs$sXhb8?#8i#qlu zu1FV_+bu12o8H&@eE%ZH-*Al2CG@#US<<63b9e9Fcf0SVnh}rHO&RL|*CTs3yggTT z`!mDph;!w9bMED+Ux-k;b6Mu>$-`Z~UK)VS1;-)taC6+6)W~44$rjF6*2UngB7r^3nhR delta 630 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 OVDNPHb6Mw<&;$T)s#xp* delta 768 zcmexZ(@?u%J2RJYh@r8SsfCrH#pHv`HppCdmbog1X2vEKrb))SsY!-Ox~b+SNxBx6 z$ws=CM#f2o7N%xKW=4jaPq4gUAxhp89!awr|0<*Gyjc&3s3g*^+~-JK18e?Ln|u;+cV zeE+lk#Sf=DmhvW*Z8s-f|8i(kP(+x+?ALcA`}=B>ZT_72o44_~SaNhv zY`58zj+HKFPVG`$o5i=D+5DKZ|DG%rf8AqYn%+y-e7d#K=Y{juj_Z7aoLhFr{eSVS zzwEkj{d%8etMj*BSz$Wm-lX`TBxCjmI<=XGWy+ORo9yF6AE2xtMfW5RNF%@d%P5AJowS~ zj4xxyb%i)>*4LL-sR`~O69nwu4tP853I&R!qSee!3?iOCE?3wbrytzgnh zXMQSEH|6Ll8>Y(t+`soR*`97!pQO;QZMjBEFYL(Cu7*>4&)67Dw{%7KjOpfQGH_ty>r|*CMFVdQ&MBb@0Ax#1761SM diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/dyonite_block.png index 8100e9e1e2d9bc9ce3a7fd8001e5ef7de67937e1..0dbce2440b3d33dab23dedca95245f36ae3782ee 100644 GIT binary patch delta 811 zcmZ2h`?qexc4jW~5F;ZiQ)4Rw)5!;!ZIHN|*;z^$Rm=>NQ%uZFlXWc%r%u@^u(>Bj%eZxYO%E{}wtU2K}PPXJcvw1)F9|M-RKkuEJyx&Hz zo~g>y#WAGfR?H-Sk6=cb@iB&PtAg+}%e!&gw1xki_8{FyoP@z@8_0 z6BD9hl@@cRmKk1-32~AYQA+Xd>2h$HGDRo-vbx(F{^Cz{_w(6#6@SRs&p$nV{iGbv z^zB`q%e}q1&JQc2kP~5v%V}^cOn1rTa%ho4L2E!1)h1% zu$y5Sadl(L;c(u|Qp-$xR(x2xQ9XR3IoqL17ga%(LoUJ}8+W+PSsHq3EtA`wo*kKK zk5=~CZC8r_lrT@B=?K%urWfjRfl->%XRbQ&j38z}s*+piaYP#uV^ZR(| zqTUY|vr<+~tG~vow(93^j!vFuOIpJ~P~Q};Aww@ZBcBmaZf)h#z-UBa5Kjaqqg(=VNN(NxY`_oU$F z(fr8WIu-(3PU^-^OqA_bji}d2Tr{im)m+w{lQxT=v9x^usE7ISsyja61`CSLbxMk# zt(o<6xBHEa(~B(MKYC+#?p^YUHpNgYURGVL*_SM4wRx8If7dz|$`Zm7(zAkN#if;b z@u9(IX9?|2Ne>sBZ*4e7m!DVihJJ0^kGDns(|_->*|0c#y0z7=($#l2)~Wt}FUl}s Y_U~tFKOZe&U|?YIboFyt=akR{096cW3jhEB delta 595 zcmexcx2$%|gOigu7(@c_e z6U`EnbdwCt%#4zZ($b8~EH}?*eZxYO%E{}wtdXpkY{hwc^M39>1}rt9`a}?VbL=0uJ)scJ1%N%+rkqloWst~&CRXEspQ}O|I7T3%=aF@udF}++v{&3 z`}x^FCN8u&^WFN#;+*9-JOlUnz7#vEGW+_?7xf2yKdt$A{%_dBSoO`kAvt_SZ_-z$ zuUNWr=}M~**>AsA-U!LzGMvX1{Pxf_4$;|BRzBf#g&Xo8MvFYwG5!2&)dTxS9~kT3 z7f#^zHi;~4V!MCH_-BEuMn7wV)KLwe=^BRjlX4wy{G5MbXNI%M+nG9QEtg`mUVaF( zy>;C9qmS3zdXdLZ*jwiF-#kChpi^$a{v}e+cD3q9zM5%JyRLIyYxbdU85`cb(cbE5 z*q8l4YR`M2eNWGAyuRC?k$c;Q*K_<Vei-rkS1nKfat`r1!6)pwHAJnJTWb^Nq< z4gW{YgU?00%_H8WKUMo|R=ju5E4z6aKTXsANi&@J{A)+u0|IF7ps0BP&x=D?`)C2bpbKde) z80uPBnj7jGS(+Lqrdb-9r&<_n{>A!+g(#Ji130a?4G~su_UArs$dY_zTH$0VTfKUw zr=Bj3Ar-e+4*t)-6v4po;h*JniN%IHS8VUKp6O$z{W|;Q>%}>%c^=Q5b}0LIf-~dE zr)BQnPP?Vu(fw6F;|;sN@j=6FKU1G8=2TyBPkhPtL;ue6!=dY9?(O?__*}2I>HVv( z=5CBl+@t6Frt`6U+Hoz#cvsGMs}BA;wYNN-}qDe zqr7lS4R5$!)QnzhUF!Po-Kd0^8p!{oRn;O4)(c+R<%{D-`Ru=H&AC6#fo+uqZ|%=Ly@>r;e7jVO~31kJcsLGi2P{F!|A36@Oj_ z-hv!$Q;UOFFZOJoCYxjT`P9rh&+=la)5kT%tShb^{66F4c3%g>f}lT~fp!Px@0caC zLnD3f*3|sJng8|Y+D0yjSSC^8(>SXkX<;ub`~BA{Kc_8ybK>zGxq6-o)z5q8e7$Du zXLien<19O#;?$^xKnwR5F+QeUt^h;(5lnt2sKW&w| zRsEa?nN9Y-AJjSbeSGom;NuU{iE~zK2dA^XT_cgav*NbX8Lo2QjoFOHC*2lXB$jo1 zVjt^D(Y!RV`v-2v#Lj#r{#cK*em9HJqB71DmzP2}6tmh_$TrC|Nlet7CiTb#}@nj}yneyXW(4seSJLPMK%Rba?|EOSXbZ4G$+w7RvBi!j_|UA+YDa2(O$i zNA0$xsT23(pWLti`&;V$buU(*+P}xW#?&ab_e{u?mtAk_ j)qme>n*E=jp;l?ZXW>~&=NT9n7(8A5T-G@yFg5`Ir@g74 delta 956 zcmX@y!1$tpal>|IF5?hG6DtD?D-+|%2bpbA!+g(#Ji130a?4G~su_UArs$nxVzL+xZKTfKT_ zE>9Q7kcwL@2Y=@amohMX`0f7ZqKmK3pQA@4d_}^RUkq@$Db_VXLqYn@$!pht?budc zoBOtG`=Mh=XWDMv`>^ZY;=QlGualLQb~bTpIC!h*_4j$X`Jekge0J1&zi;!uf6;f` z^RLUwcQnsGef@XYF&X~6Ic(ScLf3uaHrA`WwzXb%=N|*RKL(b1eHIgIrwgxZ{c74j zuY7yA=G@MRr4x2aUU~6BaBjx*pj&EeFIN=F*B9HLyH}$0Kh8SeyL{KDx5@ze|-|;AN9)9d#_aDRApPiw;YC( z-A%=^jV*K@)oaPxE)wRNTVYVdbyHgQg0{A-X8K3Y$=q2^Zo-qoELVIs+$?k1JFfQf z^+k(Mxw+i^a4p|*!rqVEyEbHf=sqRCFYVykjVlhFbridPW5L05v*yGE{Px$quve|$2(jS7(PGZ?&&iOM$QUZIqo%x!5JW`#ltXGTH*K$35sP=2Z+Gyr! z4p}j7sTaXj)l3r(^y@WSuLT7}~ z%`=PF?%6((UrwxMy=ML7B6E%Nicjn7@~i4oyLR1c&pFR?iz&;SvvqDb>m`v%v2yRZ zRwynDnb@GTGHkkuA@}K%YW2qZ4gcD1dMx+Ki+kIgEl(|jcU@+Ti#9zpDS!5-F0N^brIKOOMWaN-T8w)OGUdJ|3zTWZ1 zR=Y2TpHBRaUB4^gQ)Kt?w^_&5rTH_Yb#QaJ%ZPRE4|ncAxpD574`F|@WOr||`=IzK zC2PT9VKM3JFINQiMEV@iXienIzxbJ5WaIu9x4U}7?lwQ|EI#xje80tgXTD{6cHib! zKlxc!{_ISAa(cP??{f9u+2;F1)c0vt*9q-ao9^;H^zopr0Ccgpi~s-t diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/imperomite_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/imperomite_block.png index d6b5edf88958a713d3c793bf45a756b8ad8ee56f..57eee7173ae16370ecc1f4041e83a0865bce10ef 100644 GIT binary patch delta 639 zcmX?6)ljoxJ2RJgh>?+%skxPb;pBtNHppCdmbog4W+sM4iH1hH$%bjkx(3E3X1W%s zhDo{>Mv0aNCaH!7$w|qZPq4gUAxh)5`jd8J#H)Ww!g zJNzidZr9eX;+Zc#3i>nOk$(H@{OZf|<$hJD=}7I2_KYx@^tZ@^iQCiLXX}xYXs_+6 z?+!67>D8*4Al3uIRihrLju$UgdFZ=CW z`TxJ`-vu)Ka{E5}_&x7Kiw?$Joj?03i>ZF1fbmg+$V|)60*mW~Mp$voBejb4{VDMor)ee{N=)(|v|Y_ttrQwto}b wYkm3+o@TLzFOKOgGBrDp({Nb(hc&|-*O))K_jo=rFfcH9y85}Sb4q9e0PVLIRsaA1 delta 454 zcmZpuIZ?G?J2RJYh@pvEwgVHppCdmbogXmMJNzhL#q(=E=$Cx+!TU#=1!s zCaJn+iRR`esfk8OCdtN|Pq4gUAxhEakt zacj<`yME0E5)Qvh4y38^tveIJw)Aj{5odYYl&t~(-kph9(4ha?RgiO0p_=;M%vtZB zd|^&=4Vb=2uhHgKXiD`_x6bX?Bu8)ge(gvbrn1w^_KV4feRSNBxl{cD_x|-;cFtMC&^2Ew@}|+eNc9to zZ)+JJRAbxSYu*&*krBK@DHF)%PNc)I$z JtaD0e0svp=w`%|Z diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/lumixyl_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/lumixyl_block.png index 96401b3c1b30e2c3d5258c1e3f15ade50e047d4b..affd6dc093315e5aee1e692017afbf93a2ca9df2 100644 GIT binary patch delta 749 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 delta 738 zcmexebERg(c4jW)5JM9y6Jsk=v&jdUZIHR_EOS*-O^i*FEi4mtlP%1Wbdya?Qgstk zjgxfKlG4mf&5SH8jZ;iEpJ2JiLX^tM0vuM{h6o!s^K%_HWT`QWsG5AsTEE`R)5S5Q z;#NxES-;>wk=E;$>GOYIHoMTxs&kb|x$~IB+zA#RENfWU_f7DBsJ)_-dAXktul>SB z92`r({F_&O?jE0m+Pa6+r+(G_`t0rMx$5t3zFwF3!^HTjD8shXA?FkxSu=;nD7{>< z>&G8GnRy1bwSl^NkNj?K?JSsB{$^XpfqLhh{TY23hTV}*(~s}pzj)>J?d?&uR(11S z^|Rl6f8;ADHu2QlELJgw4-5HplcI97uk4&u>aTWN@O!&O)1`CsmzQ1fKE~j(Bx701 zqlk0{r#b2@=_ana%pPx<7bkU@iRZ~HF}Umy&Sg6BTC<_U=vs!4tJV&N4nFSf<(HWY zvJ2|lWfn{kWYaESXi~rCR=wQe3}b@_!-QKCIT%HO99%C^&So-+wBHIuy zhM?acjuqeaVc=+Ho_5K7stWpQBJK&;=f6@NNe zD%vOW3x5*T`*uNk&e!)(EtehYSaF_F#z0?f>+VyJVmS+@>OC*}W^CHezBs$O{-7m4Rjb^ZDAZ;hS#m$x0;!_FowZhqPuw&Q8`WiiE9 wGnaK;yMCi=?rOc$>+`m-JUBk}zcoYFrr@`Ur?>ksFfcH9y85}Sb4q9e09K1akN^Mx diff --git a/src/main/resources/assets/ztic_addon/textures/blocks/rubium_block.png b/src/main/resources/assets/ztic_addon/textures/blocks/rubium_block.png index 45e8e96db94a45dc8da7bb9186b450fcd4ffcdc9..3a745c823835881880268cd50e6c1168303b40e5 100644 GIT binary patch delta 749 zcmaD}^R{Ngc4jW~5F=wN0|P4q^T`L9ZIHR_EOS+iEKCE6G$8VmcHiQkcuoix)#%fQRUs8D+f z6VoOBsD;zSG;~?-eadW!-`FgbV7QZS-kqKAtodimS{&xtH0f5pgqZSP>&C-X^WJOz zO8Rl-Ww8b0t?ymOy83mCx!T42=hl6%U$`)3XXV0sMl6vkpJeUa`qXXKwL$ z`pm3;*I(J5FM0kKt4(FSvUbN@jtKNK)_)tdZb{0G54X=JaJ2`0^4q&R|I*ay^X8q&effXZf0w0O6pixGy{Cr zPHFnm?WDP__IH_}@xlKany)YDK3V$V$+^<|l?~5rzr0$eYPsQcV$5f;g&WV5=LS<@hAUW%_(ey42=)9-7ILaJ_odLk`||3*Oz-+7g<bJGU{F-n&rgoM!!YlUblN>&hRK**Cma{H@=loWhsOI!o94d2ibcbO zZ~rR(QCV>@>F0)f8Xo6ubrN?xPE%DCssGr${&CBEmZU(jZlk*7P3mG#rF1vVWSgBC z62#cOioP0Q~b z*>KZ+(A8oDo%6@QV-uL3o7c)N&d&yb14n5q@$l&K^u>V4OBr^j81B0ilpUXO@geCy= C(@QS^ diff --git a/src/main/resources/assets/ztic_addon/textures/items/tiberium_shard_stable.png b/src/main/resources/assets/ztic_addon/textures/items/tiberium_nugget.png similarity index 93% rename from src/main/resources/assets/ztic_addon/textures/items/tiberium_shard_stable.png rename to src/main/resources/assets/ztic_addon/textures/items/tiberium_nugget.png index 40c74e738e2d61315d04fe24a6e86da037b0e485..2aeff632ea90e91667c95f0da101d86901a895c3 100644 GIT binary patch delta 553 zcmexcb*XxS1(QwHMypz8F7psWODhv2D?_8n2bpbDSrtCalY%oHnx5lIHgiK$8E ziMob{hDN%EhN)({7AYnMx=H5dMy6?r$wsD0=9ABJ$!I$zrX!hdqmM8G!xfY3S=5x% z(hL%f3{rIsl2Z(IO^i)UbQ4Vy4Rs9+l2cQR%nXxE3{5wmV0pztjKaxs9M;I8kic=k*zVpFq-&csFzg{jmQZ^Xh-)?!Eu? zEoc7QUmbX*{uC&a*^%hTm*8gr@_MeYYMdHAL%mW7=2rT|# zzsLV?{mq!=|CiYrEvam5Y-~Je8TE62^~^*6Pc41-Uzgc~huO@`jLp0L=l{B&v;Heb zUHNyLb@ik?24-gF=HixP^~U;@9g{r_6I!0K9$?U)ye;T&Lgq;Z1_lOCS3j3^P6H>zbJY67R zr|G5{nONvrS|l0j8kidxn;0ae8YP(-Y@W~hiiH@3lk?cExD63@ZvM!1+>oWY-fjBi zJvMsvj3J&bjv*Dd)=VBExS2aI`NcY zT(L{Fu#xZ!|H!9VQyVh!llDB5SZi@;%HdAlFUxt(yLawmjbK!ce#H^o*Z!UD&=l?B zi5jQ diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/cryptogen_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/cryptogen_ingot.png index 24999a90f676680599dbe968ee1d17f64e32e42a..69177bab992db36bc449a9d49b5d63150877d41f 100644 GIT binary patch delta 626 zcmcas{k3|-c4jW~5F;Zi69X#~)5!;!ZIHR_EOS*7%}foA%#u=cEz^<{b(1ViQgkhi z(~NY@j8ZLA%*-s4lZ=cupI~{zqC{BbWEl<{ZbO89n`OC<8?t;bIn*)vg|&YDNlzEY zkcwMJCVS@#C5p7ATiP$NF7N9#%wXc?EtB$o8}8CQg>flgE_?UkfV^u>9^9!3J4BcK3k| zsR{4hEnZ3RL|H99S8TQI!4g%yTN6zd2K?V}=w@M)e|zMvUMBgu@(G6*#Kb+{A((!l zZ}R=PB^f_8qw>0@N%v>7X=^}RN4IOBKd_@r_%Phqab+fLrQ$M*Enk|5pnlQxR2*!R(>gh}S6|I6uzQhF51 zta^fZ9?WQ}UMDT=s44kqgIM|w^4G~WS(_TrQJmLIh!SwS#HClh%nSWuu|Fl%kNoto1?wy-_J8nS^N67iJ^-lG% nONvjXF3>!_yo0M>qBzZd1$1V&6aE)2 zPJ74V{NGr7-KizB7e(DVYJOiRqHs>xth89w4VzlZq!w@LiR)W9Jy}LP?mlNua_@nT z$6L!avo+h^+5L)~b}O>&*vW6UFU*XiGfag{W^wj;$!9o)iod-6C}Qf=>I-ofD}GE6 zQG6_!9isjE%IbW%RymP3qP(7hpUzZ#cKP*w|HtnPbtRvdmL6~Tz`(%3;OXk;vd$@? F2>@DH2|NG* diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/ignitite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/ignitite_ingot.png index 7d55ac67cfb02ecab10b3a7c1fbe7068d171594f..7fbbcade9ea4a7db5d927d4d9905a479178781c4 100644 GIT binary patch delta 750 zcmeCKUr@hcJ2RJgh>?+%sfm@5>EwgVHb~sf>@4RQmCa4eO$?1pjCIY7%?)(Z%uFnF zEe*`mbd6FCj8jY!4a}1bH~(aP%c4SrLgUE+oL1b12pc#1b00Tkkz%b}I$6qAzuw8y z#WAGf){)7#y(bsSwAa_Wii<`}={2Y}zyJ2`oJd}i*?OmJ9xUuME|E-Q=bWXuMC?ZA z5oS+arJ$2XID}aDzEFC*XtvQ^>-5>XDkDY1ND|2r~s<+I{& z>CK_XIqEGh%`Bg4d^6_c?HFOjXr`qWlo@pa?}HU4yK*@4RQm5t4fQwl5`C%(kyk2%uLL5 zEmI6FbyLy|EG?6h%uExFHveRO%c4SrLgUE+oL1b12pc#1b00Tk*&nu{ce0eNe!Z@z zi(^Q|tv#1-drxMRIrj1U`WK6uj0{#@xjy$w?y{RlB6avPcJY+X+A6Y@Y4fEQNn%dZ zSUp=c!G)cX151Qo=#aReqYaN(Fy@3`HH-{4>j-Vm=yl_ zx0W(5xgnzx%GIQ>Ms~ucennZ^;~_gbR$n|&e|)#tyq8b^2v4|@Y2lk{QQTc%F2!N{ zN-1TxbHR?uN4;HloXvVuo&1A!Mu$h5lHK%^M||$xH~M_Gu79eyf5bL3!B@LIAGA!g zJnhMJwSDHgOP_A7Np%rnWJ$Ep={x`QcjSghPQJ)Ux$1LX&t3QNd^L&=Z@OR8PFWBA=_h7RSzXYXxaHI&!Cy))({|<5SjGCi@Y0NDzs31&yTA%_!Hjc!^XDw9e0}K`yw{a%?uxi>SU!_~?$$lt;R>0HX7+?CWIigK`o!?^ zjL!dVn)lk0?mX{*uuA(-^wfsKb6mQM_zykS71X(#pZd~~z5dgTe~DWM4ffB!@g diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/imperomite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/imperomite_ingot.png index 1dc600f13676735671b591018ad50345bcb6d1dd..83ddca35d71533f1bfffe1d150943b767fa82a46 100644 GIT binary patch delta 577 zcmdm5eYASRc4kiV5F;ZiQ*$eW$p@Hik$7w@^HfZYQY|bk3=(xM&5{juO;SvZbS=#i zQ*_OeEQ}446OGNyQ;jyCV0ptrl*-9+99CS0aQimPaGfw@(cpHKn*73Azka5ti(^Q| zts|2S{ck%+wEdmGslsVuXwXejGeyO`**t0|?2fDS`8qGzq8U=iD%83#+GtLQ=&=sH zGqDGa|1&Jh3%vdJ<%DYo6|Q*k$jZGe+4a40|KxWf4wXEo7PGEe^-nk|V{xllYv=Ua z|FbhP1JW}Cj!&|?y7o{cRiBE}tU(D?9Ei z`o7lxd6h$rWUwt)fnL>>bIMKcYZpa|d;hwr(j|5)WSMT;m(IF37xvYi?Jj9|lM1lz zU$NZK@7AI+u}>)vo@nHS1#Y>Z_Tx+A)a2=IyN>>vo;zo?*|#gnf7eWwjk}kd)E9eZ zW4CI3tJ&8c z!i>3u{R6p#^(RYoE+`UO{GR*E-O3vtEKARwj(K5r^O0fykx6#TYD%}StT3O!84`Nd mQ!Zo)^-|zp(X3&dN{GcZ4xu1c7fx*+&&t;ucLK6VSH2yRI delta 561 zcmX?Fy|sG7c4kiF5Ca1%17j=W$p@Hik$7w@^Hfp{Et4!QjEr?H%nU4a4NXl9buE)p zOm&TnOj1k?%?vC}%?&r7V0ptrl*-9+99CS0aQimPaGfw@F;(||Ir)XPetoB>i(^Q| zts|2Yy>C0nw11xaOKtsqF5zH~!l_QFwoGj?121 zzd9y=t*HFnc}>T0#fBZ7X-D+FuJNw6d~mktz`s8%*8d$I{}NDtees0woY@@dbw@V; zyDfC}9N#R#-7fa~lj46^m>ZsZYk2mLZLiOz8OM)4e7;=H>F0hUH0cP&kDUc zJ>%^8`b}4qLOg6=izzO2a?vt8{&wpEQ}3>u+uDVG8#%2IsFq6bXMT0L%Jav3uL}Fj<8DoCqUW4ZIHN|*;&prswA6Rny03u8tIxPryA%Qn41{u zCYq;N=q4GbnwVM`8K$M0TWtQt`i4cB2$hrlIjy-35jJl2=RR)8BE{IZY_gQCe!YXI zi(^Q|ts|4qdrvN8IJW=4XUQiK7q!I0P8(0yxJ@aWG3}hA+pdb-6~Sk+vUP9kY?aLZ zJHhDp!kOMdv;3w{l{$IFi!&soWPNe4SL(U)`FsmqCbGy{)#<%)k7Z!{HD2qxr1! zmbC3xdKkgu?sr^pifnY#rex*&Tc!k0@oBTGZ%oS8@>YK9@`p9!R7j4NMP83u9|Vd*?N{m%`aZ!NaaWm8=sd?;wP*JSsz+plUa;?hVA_*355W1ChfH)X=i z6E&s_E9-Zp1wUS;eJJm0(PFn|wcu8R8zDMve=C0T2~LsKV3f@^e$MItI)dlmfz?&> z?oBe7eK}I9$|dEI*5SFLEme7w*5B@);Pq{RhJp1o-`njr%iQOhm^}-sjz4_6Oxmu0 z>Uw7Wk6WXEd|BGEu%C@>w|0TOhI77`%M-~mW6PPxHvDO-H;*&+x7t!t_F~4TvQ0)= z&pyBAQgio;d{KJoYLG|qR=MfHi_R2@oLu5GN8`S0_GTCVc*DK#i$3n)UGqaq^6iQx z*Hcp#Jmor{%~fcrs#45#>yU-YWUje}^A@}jP|~n=aXeXfZ~vO~6)W4eRfq1#pKkm@ z_vr68O5!>%GnQHyZAy;3Iequk1#blGm76v>f0_R&_3p}3i&tN5JX<%Z>bc~mO=T1G zS6&Ez_h;>vKA{VLZyc;j*l=v|xjSucxBeZ!wEnR0|G&NW*%_wp-kFl?d6WSJJYD@< J);T3K0RR;KO8@`> delta 758 zcmbPNzr23Kc4jW)5JO`tBQq-llgS5}ZIHN|*;&prs+b#DrWlx|rs^gorY7m8nwyyG zS|q2K>zWy*Sr{cHrWl(hS#JKt`i6xlm6HQFt+)*lR&Ms^K5oduJZn?PWGP$ydQVRm z$B>F!M<(C(zFa7AbpQVjCyjOHM;CQ>u?X%eT64^3LxASCm|ahQH3q$sTByqRS=Vgl zLO0iysa=_qE|u&$v&CasnAd_uk8YQEt$gw4?d8@lY9fu|u{C*e7S9hHwqz2pc6@W= zfN1bN>*pkUUA$5l2)r-IG9l7Em`t>W@Dfzes%h$5> zub!d**R@RW!?swtVfZOeRPIJ$;qy#QJ%jG`D=f1Odven(%n_u=BJ}8}5I$XU7I$V9KDXFH-~ zn}UQ}{-sIm=h~(mW4KjGF+x|U>FS{wyZa+T1*GnVUHZ1={nMXoPyMg$z0byAxqFGT V?~E6_85kHCJYD@<);T3K0RZXeS-SuL diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/meteorite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/meteorite_ingot.png index 973cf013082728f267ae9c60762e54f59e8db680..7295e5db39100835a34db1a039d911b7d6674043 100644 GIT binary patch delta 580 zcmdm9eY|?Zc4jW~5F;ZiV+$)2Uk6ave8hNjS#cIQfOOe*J7u7srr_ zTSq3J&718Y;#SFQ?;NDhl@*wJpp4ww||Ufm-IdOZ6^&zduj!l7+8~=EO}e zJm#D1x@1|rwE8$h&-Nn~n-h#??$Mf-nLN|X|MmJNoy*Jg+-L2vpSXwPug#sHuW`D{BKmoi&j52^GQ%icDd`S)Aib;1vJD6SKJV8!@6J(%ZwoB&(XPbJ6Gvb)cQ zA1iA2kt%y^9;1KctJ9yPM&F| zl;^RSZR>;+i`02V5?636?&_Dfo9oo}(coCM=d_R&#;uDqk3Ww$^85bm;ivFTHTH++ n%<5n8{DAWJ`}L3KGctUbw8qm;Yo#Cq0|SGntDnm{r-UW|jkEUE delta 563 zcmX?Jy}f$Fc4jWq5CcOiBNHnF)5!;!ZIHR_Ec28TEfXygO-*!@&5ew8jT21_buCjZ z40R0*EsfHQObnCE5=}RsV0p`;L|EZuSq^J%LxgpkWx0+UvbeGxj-UL(TED*A)5S5Q z;?|MLr}Hj5NVq-c{lvq2^9ED1*Tkajk5wMe+&K4$-0__vPQjd=W-%_I5g$IayS6xY zxM-Iie000#*_@wC|4TD=EO)Vq3|M_tPW1Z60@?ok=jB;<_O%C2OR=z?Xv0za``6^B ze`b~LSty_WCD$j zMc?{d_b5q6KKr(6*PT4Jl!dPDmYsSXhhI8=c=^nld$U`a@-f@9Ka|!uEY|6qFYs&D ziu?<@uJw1O@I)!^Nq-j?AQru;;%JJ2>I<)=*n}yrCnYz@PGr$^%NqTR$U(SF^<`_y8Xf2O zw+|gYKl-_vYuD##kIqHU`}Saa$|W@bA0V$vkmrYLOvmyLF{eY=X|-h{BrGbhEvG_ach0%y1VjJDnI>U-g-d(Vej35oMr`hQrgQYPw~yvaw?f}vFZy1@FXwsGbK2F@SY-Br%D{(W z<}#M`;t_QLvoB4abb8N`p7oN?B+mvU__3`0m?JEaVs7EuIyrqyo80n~b2jT7ooM;j zAa%minxf-djv1fnTu>{T;QPn-LBx_BMvrIvWLoLT3a+($v$IC5>AJeyH2DqN>o+X> z#+7To;4QmMywAoz4ds8|%Y2KuRd?WWx_;KBYf39u?dsFsV_*8S=xcKJCFdO7i+Vx2 hAMV#be$U7t@O9}Co>Tv(FfcGMc)I$ztaD0e0sz=x`lA2< delta 560 zcmdmAy{US`c4jWq5CcOiBTFk2i^&I>ZIHR_EOS*-l1)=gQjLst4N_Arbj=b?l5`Ud zP0e&uOpPqejFJouQjJVEpI~{zqD+L!$+8^Q+=d7XH_LJzH)Ii=CGIf!g|&Wto2QFo zNX4xqllNxb4v=Uo_1ra`PtvCJJZs9ODJuhBgm`#N@6ubeRHZp6`i1(&;7i9Q@~)FT z>V91PTEFbct?ZFqqe_dc~^rileM z0Y5HJQ8-y~HRt-K&AZ#vBGlGb8{gS@NG|=$Gu5>wN5d~meNmKoz}c!U(ie0iXbtP! zpG|ceAJqR?)h~T?t5`JGpOYfdU0Q1=F0hnY&l;b`eXFulm-TEOf3#PQW>&BKVa2l# zXI%4maOcR5#TmL5f|7|=zwZ`^hAmJRVSlc;+^L}A+Tq@$va;{1u55eYV(2GQd};sD z-lThF>ntt!3m46J{#!r$!ZF2{yW%|W#kSP!nweu_JFQn)?iSlB&VRr2|ClnA-dL=p U=Q)250|Nttr>mdKI;Vst0IKHlVgLXD diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/nitronite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/nitronite_ingot.png index 13b013260e50a9ecab11268db191e721a20b825f..dd3561a58cb52665204b66e6e1658932744840aa 100644 GIT binary patch delta 713 zcmexf_pfflc4kiV5F;ZiQwuBO$p@Hi5xmW8EEgD+Q;p2h%q$E{bW@X(l68~KP11BN z(^3s|4U>&clg-Tx4a|)<|73m3qC$kiTOPMI#=>cKl;-Awi5CuqE;y65hM9 zH@$K*4}O-o?OLf&nB>W=kB=Coo|)y&dF}5cjf<)0TQ{43-g)PZnuM6ojP{88I~w<1 zJv1w}GxN9S?Ws%FatVc5eoWDPFI36$CAYI^ZEWgCZ^`?)bHAQdtIN5gl-h1!TxayH z@=~_CXMLnySh)9!_aQqkuMWJwH0ZLHhW&FF%TRTX=&MVDuBN>4PI)76vPb^(r%$?( zrye_s>)w?Lf4^!^pT|8P?>2j{v_E9P9-v7&_$8G9m-=ylM2E7;aC-~^RO;>!lEI&qQ=J`~WX@_sG zcye<__q;@Lx5ZwrYbPhoZ%&%uoSZ)Aws*?MT|yUF&)@fEJEoHRSL%CwhL7%>#}9*h zyK`UhJ^5&*5Vzvbytzu25@IF2J62?gZYjx@v3z*s@n7pHss=pC%Q;^pg$G>I{Qv#_ ck79-$>oPBHmrV6#U|?YIboFyt=akR{0K?&5}L77 zj_jLYqOov`$>NwLO?*FNXZ4-yd3t8A@#0035--Gm*fL?wLXLy3-STrjANpKiF(;gH z%3YV6TMw9=l|9PA<@DWTL)WHz|2d~#=VDTM2e< zp*~S#!Ls_$r)A6Cd}n)wE?)3ukMPrytqQr4K4--y#ptSTE}B!}c6?i@-O_KLcU*UM z-hFK9Zmsq1s`>Z4f7yF1TVyFR-7+9=>ywQ;!%p7VGP~f2uSsdcG``+bX;anr>itrh z^iR_B{gfrecMhNKpVTPn>D}MmgvN~JIT z<=fCT<^JYa7N@3djN+obMon#Hy_16dO8(zpsMDA^>vpf8h;`E@zn}a6ACqThXk?~zJIw$9 diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/noxtunyx_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/noctunyx_ingot.png similarity index 93% rename from src/main/resources/assets/ztic_addon/textures/items/tic/noxtunyx_ingot.png rename to src/main/resources/assets/ztic_addon/textures/items/tic/noctunyx_ingot.png index 139630f7630283385517eb9fdc8c31824b12ac2c..10eadb3daf0cb9d3c6fa407ae860593a24fc8c01 100644 GIT binary patch delta 726 zcmeCEZ>`_3oteu##K_3X*v!h*c=ADJ8zk;#c9!#uD&}b>X-S4@X}V^Xrm4C{h9)Vx ziDo9ox@P8UZP3tm%QLxiQ9{ke}DvUtn9UN>3FR=-}| z)5S5Q;?|MLcfBVUiZs-J&#pGDIDBfVp3m9bbG+BhoONe-PVzf_V#L&*IsP#oWmhU{pdDU zz1t_I1?k=nJY80|{=aaSua@KDQl+EM4GUE3&ussd*tb(k(CJU?2IXTdZm(T*Z)a+A z3rB{{*t7GH$Ikg5kE!l?citmP-7WU8|3RxI7p-0vw0G!e+emkR+I#DK)^DYM7d05K zGuu_PafI+)ddQdCqg*Cuvpeg3MNtN6GdCseU5XRz0c_Gu7;bhlrLWJ$~&iRBWk>-a>tRi zUHuh)UoT!ZaQt_%S|a!Ekz8J4KmlGzH%@=dx5LAu~ k$Y;Ez^5gyeAIS`QrJ_HZSDvkBU|?YIboFyt=akR{05bqUj{pDw delta 729 zcmZpz@2KCfoteux#L(Ev$iT|bbn-!F8zk;#c9!#uDoG}WMyUpgX1b=yX=%EtDJIFf zNfs8Cx@IY92F4aChUSK*iJO11zF{Fs<>UZP3tm%QLxiQ9{ke}DvP|7}^~_``Tm5=1 zPZ!6Kid#n}-}Me=lsI-i{y}28NbHikB4^Z+Cb?e^(>dMU5}8zz?A1DxgD+L$r|iNO zzJ;q@1P{5y@`d-5Ed6}q;u-#y1GDY)L{3i3jC%I$TI7eL>B8{-?Bh>-n4C%o486Uw$rNpZS9p zjpT_rC#7RY+%7_7x%wkvX5e__;o;pR6+kt))RyAPe$jriXD?UUKWzVJWHZ3~l2 zt;jGb3#hC=(-}FxeZo5H?r)-Y*Q+nIt?D=@wvabmC`?AjzghpZ|8Gz6zQx~vK6|75 zC{HQC@Kn@Ug_Dao4=UaKv5|Gw{ey0o8D{g#JvORd;ay@h(e`B0%2RHqg{OIi9$J^? zB%7;q^LWAhkBL3rjuT45lr|sLIdd?nvrFIm;p3~C_eA{!-_&QOF0JYam_PaI?zp(; zK9{FHTWY*@deh@mHRlP;5HcubmcqU`B`d8xuz&eSbbPz=}bI3a4Z qq-4^O$A*{R-xB_CfB(np3?6UFudUuLoz1|&z~JfX=d#Wzp$Pzd6iP<` diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/nucleum_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/nucleum_ingot.png index f72befd9e01cd79c0209033edae91c3114cf8b04..9c1da98e0bbf29813502bab60cb235fca2d1abcd 100644 GIT binary patch delta 717 zcmZ2lbE0O$c4l_-5JO8V6Vu82nC;pM#jdv zN#=pcQ(__Bh8}?#*4T zd_Ni+vKKvD&2qUgaa7esP?T_5bYK<`PC7udN#4_#*Ffa+h-=) zBpxhd+FZw88qOG9qul0uE&pMs=_2hwC7p${PT#l}Y9uL}de>R=^#$2%xAP_sh4o~^ z=W{TA$jflZyEE_jnw-Qv`OB6aKYl4(+B{rA;8fwJD$e&^es(jJubL@-oAG0{kG=eq zm;VC4Y<%2O<^0#;vDCo?mb2LtWqr1M>3;ZSpVsYdya(=h%CMmiWNv4Ln z#^y$8mgYtVhL%Pan@_OZV@?=kM*0Qsw)8pNqoUBPV+jrMvyV|5ncOHu?6<%Eu`gzgJvb5z2b$SkFPm^-2pouM{h&yiOFU-TFl7#KWV{an^LB{Ts5av&!( diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/rubium_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/rubium_ingot.png index de33aeec0134331e5ad9b27852d161365de7d76e..c7baace32540b0e5948505500bc0aea5312a4a84 100644 GIT binary patch delta 730 zcmX?JbE{^o;F@xFCMg4L-m8Jc}#xZyVvE1kJfTK%yE5mhGDALSN~5_ z%^t6mcIbG#)c*JKSxmRYS+sZ0xO_XZy#9H``&)^JMVvSajS~FKTXt7990}Hce`TB(`M)vy@R=9+2tMH}io3Rim=#y&ay%5L{+ zRUEK3Hm!{j^V*~ZjFb{-D^(Qr0aj4%Kv%(3HEI#ErOO* z*`(CB8|%cqR=g{x5M%7P<67t2AZ?|((}$wtr+rnEuhcy6m($*3d-T@o&}nPAUM`b- zVkO=E)o;o{7S7@x)n=C^re`XCCLalU%P@PP%+6NbpkIcQ(pY!i_1<*RH{^2n9ZkjW zo*HwzkLU(IVNX_(tK_`*;^0Cgn3g9{x%?ua8H*f%cv@d>( zzWV)nmA6Oyc0uTuhZnvXFEo~K?>Jp|Z@Hvu-Fe>yX){u;O4#*wd!*X`o9(PKMRG=n zxpC0Fqa|}C>phRVTYlXBDYWm=-aIEQ(+7JJ5|*u!UcHOA|60+em;4>K`eIU#)Gh73 n{Opga?0)@^`|BU~GcrV^=QQo^osr7Gz`)??>gTe~DWM4fec422 delta 711 zcmcarbG&B5c4jWq5CcOiBMU1N%gG0sZIHR_EOS*7Q_a)NQc^8+jZ@N0bWIFRjCB)@ zQc`tIQ%n<$Op?-!OwBAepI~{zLX^tMavWCNh6o!s%W@qzWa%%-*){ovwSK*{r;B4q z#jPWg&-w`$in#yxKg_-3qoGH{PKB;aVeyWjeV0Tc1*Y_hWF72ac@d$Z8lu6oG(bb7 zy)5n4IfoT%15|l;ESM-U(e0sbv_@K7`>{;9N!s7J|M?#g>>8x0>;>U8G z2vxP5<~hyJ|9UUnx!dkpv|Fb|O-?&ky-1U*nQft-sLLCDj+<1rF+7c{n>S9`W?geokF`evl?Ae z>&$C)c`jA-HMm8VWJ_=q?7h;(z$ofl3^qE*WlRc^ChByv@WeI@gzeLVTgigPM_d)PN;tToEkbv%>E ze0Z``@oJS_k1AHrbnpRZ%-f1 z-g}D`uj?CxJ$K6}{rlwj=QsMIp8QKZBmb_kt!cefzjDHx>mJ`;N;qdu%Iob=_FCYk z7NGoi{j8Kt3*|T7Gi$mzT}}P{0z1D2w~yVNaP8t9t=0WWE^kincUUZDo_zNF%uUsG zdV)90ZKKQ^Um8W^#yf89F)CI+Q?%P@MWSH+Rh6Jz{eRJW&zM$rgzj3`X&?IK9*f~| zu2;VLm#+zY{{GwKL)4s>*-Q63@AuTPO9~U;ciT^Ic6aD5J-v_n>mT?ZF08g_j Ak^lez diff --git a/src/main/resources/assets/ztic_addon/textures/items/tic/titanite_ingot.png b/src/main/resources/assets/ztic_addon/textures/items/tic/titanite_ingot.png index 283430ed742f16e8cd7b45f2ac35790151b65c0d..d85c02c9becce33821fe7425af97cf25850ed4c3 100644 GIT binary patch delta 667 zcmexa`>uAwc4jW~5F;Zi6B8?A)5!;!ZIHN|*;z^$RZ=Ze4K33W&2>|glhSlklTA!@ zlZ?|Wb&X9dQ!J8<%#6$uEjG_*eZxYO%E{}wtdXpkY{hwc^M39>1}yeZga1t4Z=+xT z+SA1`q~g|*$==z*i6U+L<&Emq>pfWnW4Z$}N)#6@DxIwNDEHzKGt-0DZryQKyFBBx zPutGA$*0dOQOgW^SQr=`bU~@);iJ~Wjn5-x&S^6g&hCij7V11=|Mcy3rkjrhr$2c5 z&+SF>&yJe4rxG_iN}OG>gST(1Sl6OIu@_!^J5hgqmB=eop5h~qay(D2G>)Dl=w@tH z+qsH=or=;#j}GUpp4-0kUiqh9Rdt|dV~Ux*vfW(cS$>?4CD(~3-c0^-aKb#f2|oFY zHM#`cXL((ppfg?j-1+)VF>57S%$hg0^Cab@H}NFZNKU?-71E<;eOAf(tWx>p*&TnY zrfSSvysOr&{;_7C^rIb$>%TIpWjU;KyBq7~bJ zuKQi`Tj)6N#y6b%dN#}zIJ@b@id3VlnIS6=l$kYKNDysPu_j@-_okB>UK7Imy`j`fq7E__$@_L>h%7bl%)Sanl9RO`d1!_{*8 zDqYu=Fs^-`wPQ-kRj%JrbF2O3itCMky1$r}@V9dtUs>gcH=6zP_U{mkNZIHN|*;z^$Rm_Zy%`MH7({#-ZlT&q*(@YF> zEmIB6bxjP6O^s3w%+kzKO*hYHeZxYO%E{}wtdXpkY{hwc^M39>1}t;+oBvMUZ=+xT z&C|s(q~g|*$==@5i6U+L<4yLj6!8+jTYk}Zq4rAGr3qqT8+3IS9lWH#+bIOwZ}7R{1*M~y}a3Q zp8b*~B`2<(xi6&XIq64`)`n?*8$Xz~)!a#~C_DEuqvyW-MLC`iO@h4IOY*)1gz*2| zar*I#=oSH|BTto5w;ulSr|INT{$rCluLih(mCf1SpZDv=JBHJeAL34K%3h^&`nS&M z-*;-wdLz!K*S}y@=8F#9SMF~xi_uMa!9|{pbM1akI~%t4%&IxZHaY94FUk8MlPy=i zY?;9N@<%0m73bNzm^14v_rIC<@tubEriF`M+UNU%w-t63?V^&IqA!_M6 zOrjO9M)fZVJe)g!!Ao1NsbZ|x|1wA2_;Y6UT3@@R-|J-qITW7-8GhR49hWOO)%eI3 zp{r%n_bzi&kxnnuJ#~1gc#X{troXn+CtW?IC_hE#ds_OA|0TbwUc7SmoTTzB$WZQ# o{qu`8Ewhat?ce_KIm0ordA-m0n_{II7#J8lUHx3vIVCg!05D`OZIHR_EOS-TOij#FOifdCjZ%$GbrX$D40J8i z4AXQC(^5^14J^$}lMT~0pI~{zLX^tMavWCNh6o!s%W@qzWLe_)$8hosYyJA?o-U3d z6}Q$*KAm?tLBQ?*^^d`u95yg;3Yt1?VSTma?AcCX^*&kajgMnwte<_?UAUC>O8W_6 z88KH^1<_C~<=WX3&t3E|R%ZA(r9+)t#I-Wy+!;CE;O7Mv9fuzl-2bn>B+4o_-6KD1 zlb*4g(E@W><(7&FgE_l1&Iz2Ad|caC&zb6^{!t@;-HCm%k5B7fJGFm0hihPqoosR9 z*Og@^<^Z>1Avl$E6t?rnsaYGxFvP>YT4;v%OEyiKFmcMn#eL$H#4V-XLy_K zZpy8nne48eWjr}}x$hSJ&Qo(z)g+f2u0OBc@%WwP&#&QcGMYBd6nf8fi+eKvI=|cR zH=I#P)Z@I=vf|7}<@Uskgw$=4BdS6cpme`?=f3iTX)Vgh}bQmJ^$@`!>{#EJL(n$7tdPZ*S+fIqDy~T zZe71HXLl)=V#^AiS0!S?RodOcyZfwU6Lol_KHG_IKB>L+)Wq1u$-Q;X_2H=j=|b&$ zw!fOQGxnZ@`X1TU8QXpud^zsQsW|K8oavjb<{o%z*t1CE|HGN{w0>AJJg+MKx5rs6 Rj)8%J!PC{xWt~$(69B(7A*uiX delta 638 zcmbPS^S^q-c4jWq5CcOiBNHoAv&jdUZIHR_EOS-Nk`vRCOw*EeEfWnBb<@mDl5~^O z43l(|lP!{xO^ggvQ!NcQpI~{zLX^tMavWCNh6o!s%W@qzWC`l}(=_>owSN6&PZ!6K zid#n}pUu1MAkgr=^v@I-0T~CUkdOsoOii=59PzxYvhB7?+;QJWRd3(?(%+)e@Jpbw zso!~_LO|eBIf+a?<=Xo_CdNzx{GJ~Z8dD>`pZcCReOmRIvfZM$-+tTn&ws^3`OA{L zFZ^P}LeB-bm#E7*b?jzsekqY|azL`O{=`zHYm#q$f^yfL*uRFew9B49U-i%?okE+B z8NY1HZu2@#7L1Qqvd`Q#UEIY@FnrdMQ!}5ooyc&S{PD*bHx5M?eF?=yilW^c(<$U$S{2b|Tg7U6?xjIGR{Ds%rkDQ7F zr!T1wJ(y{{cxKNMt$@;#I@ev?K4xsFSM~@KO)Ea?8hdHB_YyzOQm+_^XRSM5MoIWhw)A~@ zaf;mTcY^uWx-R~Gl1mLIMheYT{afkrE7@mfNWG(VcKiE`FEVp3p0#QfaC$T6#+;QB zJAE>|_|vT%^@Q6BPpqpxviVqcT<`8Je;?|*Fc-)_1wO^hdWV~a$j z=jE0o3qJaa6OBM_{NgNhU1Sdr>Dj$yl%Sq zbEnfLy&3g4pCzuZ<|;~C@w4o}=5pt<`d{%8b@$Y7#T<@_O}sPn5zB*$6{R00&ds0y z@(cfse_tBEhBMz0k6qMj^|6<2ViND-CrbU?DxQ;6BE?y_Q@_>yOUSMF`2IV5n$_+t z-|h#$eEZNQGjW=>%eE|yZLN!8)D5*A1tQx@wmq4=rVXvAI}+yRzrg9YKZgcZuPzSSG3d346EU<*~#IYxIOP*Ckl6 z@?1aavE#>CnN`NWr41B2T(W%Z-#*C6UzB?J$TYJVYr=OvT_-$GPk4sr1MVY%!NxJ4 zRWH6VSylNwgIRaBibPaG&|0N4G7o=fEnJz}GS{7V>4(JQMj3u>uaCvA+tmM(utvpNIQv`E70btBiY>rSHgjQK8@4;->nV$#m9%bTxxXOY6;LFLzp7@O_N4 k-2L*3=Kt^ce@q!3+Z^)v@ujAXfq{X+)78&qol`;+0ORBntpET3 delta 595 zcmexbeWiNCc4jWq5CcOiV^b>wi^&I>ZIHR_EOS+ojZBTwOwx>XjZzF#bW;pXEOjjn z4NY{DQ!UJl6H`;oO%u&FpI~{zLX^tMavWCNh6o!s%W@qzWO24>T{`)NwSN5yPZ!6K zid#n}$NS$3kZAwS`-3UYG}6d7CVboFBqNS4hbg{nZ!;EpOgLo}c*!TCRWT>&&a_Fs zdSwsS${#rY;m@hIwD|D`K&=vaiR_4Sk2gB|))4E<% zzgz27uM`vU*p@?i{hF_=_xJn#AIS{L(Z^TpI&Nvrz`(%Z>FVdQ&MBb@ E08GFPc>n+a