From 026b987dcd537e8d17eafbaebba6a694be4d4914 Mon Sep 17 00:00:00 2001 From: Dream-MasterXXL Date: Wed, 5 Dec 2018 14:18:56 +0100 Subject: remove double mixes in archivements --- src/main/resources/assets/gregtech/lang/en_US.lang | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index ff18a8a4ca..3fb9c3ce04 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -242,8 +242,6 @@ achievement.InfusedOrder=Find Order Infused Ore achievement.InfusedOrder.desc=Height: 5-35, Chance: 16, Twilight-Forest// achievement.Amber=Find Amber Ore achievement.Amber.desc=Height: 5-35, Chance: 16, Twilight-Forest// -achievement.Cinnabar=Find Cinnabar Ore -achievement.Cinnabar.desc=Height: 5-35, Chance: 16, Twilight-Forest// achievement.Uvarovite=Find Uvarovite Ore achievement.Uvarovite.desc=Height: 10-200, Chance: 16, Moon/Ganymed/Asteroids/Callisto/Mercury/Titan/Miranda/Proteus/Pluto/Tceti// achievement.Chromite=Find Chromite Ore -- cgit From 2be31045e46b39968cd1c46ba97acf798c7adf2d Mon Sep 17 00:00:00 2001 From: Dream-MasterXXL Date: Wed, 5 Dec 2018 14:20:09 +0100 Subject: update zh lang file for GT thanks to Kiwi --- src/main/resources/assets/gregtech/lang/zh_CN.lang | 853 ++++++++++++++++++--- 1 file changed, 737 insertions(+), 116 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang index aa7913fcad..93873856d0 100644 --- a/src/main/resources/assets/gregtech/lang/zh_CN.lang +++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang @@ -1,175 +1,427 @@ +GT5U.turbine.running.true=涡轮运行 +GT5U.turbine.running.false=涡轮停止 +GT5U.turbine.maintenance.false=没有维护问题 +GT5U.turbine.maintenance.true=需要维护 +GT5U.turbine.efficiency=当前速度 +GT5U.turbine.flow=最优流量 +GT5U.turbine.fuel=剩余燃料 +GT5U.turbine.dmg=涡轮损坏 +GT5U.turbine.loose=涡轮模式：松 +GT5U.turbine.tight=涡轮模式：紧 + +GT5U.engine.output=当前输出 +GT5U.engine.consumption=燃料消耗量 +GT5U.engine.value=燃料热值 +GT5U.engine.efficiency=当前效率 + +GT5U.PA.machinetier=已安装机器等级 +GT5U.PA.discount=能耗减免 +GT5U.PA.parallel=并行处理 + +GT5U.LHE.steam=(蒸汽)后面数字就是用涡轮发的电 +GT5U.LHE.superheated=过热模式 +GT5U.LHE.threshold=阈值 + +GT5U.fusion.req=需要EU +GT5U.fusion.plasma=等离子体输出 + +GT5U.EBF.heat=热容 + +GT5U.MS.multismelting=同时熔炼 + +GT5U.machines.tier=等级 + +GT5U.multiblock.pollution=污染减少到 +GT5U.multiblock.energy=存储能量 +GT5U.multiblock.Progress=工作时间 +GT5U.multiblock.efficiency=效率 +GT5U.multiblock.problems=问题 +GT5U.multiblock.mei=最大输入 +GT5U.multiblock.usage=大概功率 + +item.gregtech:modulararmor_helmet.name=基础模块化装甲头盔 +item.gregtech:modulararmor_chestplate.name=基础模块化装甲胸甲 +item.gregtech:modulararmor_leggings.name=基础模块化装甲护腿 +item.gregtech:modulararmor_boots.name=基础模块化装甲靴子 +item.gregtech:modularelectric1_helmet.name=模块化动力外骨骼头盔 +item.gregtech:modularelectric1_chestplate.name=模块化动力外骨骼胸甲 +item.gregtech:modularelectric1_leggings.name=模块化动力外骨骼护腿 +item.gregtech:modularelectric1_boots.name=模块化动力外骨骼靴子 +item.gregtech:modularelectric2_helmet.name=模块化纳米套装头盔 +item.gregtech:modularelectric2_chestplate.name=模块化纳米套装胸甲 +item.gregtech:modularelectric2_leggings.name=模块化纳米套装护腿 +item.gregtech:modularelectric2_boots.name=模块化纳米套装靴子 + achievement.Naquadah=找到硅岩矿石 -achievement.Naquadah.desc=高度: 10-60, 几率: 10, //末地 -achievement.NaquadahEnriched=找到浓缩硅岩矿石 -achievement.NaquadahEnriched.desc=高度: 10-60, 几率: 10, //末地 +achievement.Naquadah.desc=高度：10-90，几率：10，小行星/金星/土卫六/天卫四/冥王星/柯伊伯带/织女一B/巴德纳E/巴德纳F// +achievement.NaquadahEnriched=找到富集硅岩矿石 +achievement.NaquadahEnriched.desc=高度：10-90，几率：10，小行星/金星/土卫六/天卫四/冥王星/柯伊伯带/织女一B/巴德纳E/巴德纳F// achievement.Lignite=找到褐煤矿石 -achievement.Lignite.desc=高度: 50-130, 几率: 160, 主世界// +achievement.Lignite.desc=高度：30-210，几率：160，主世界// achievement.Coal=找到煤矿石 -achievement.Coal.desc=高度: 50-130, 几率: 160, 主世界// -achievement.Magnetite=找到磁铁矿石 -achievement.Magnetite.desc=高度: 50-120, 几率: 160, 主世界/下界/ +achievement.Coal.desc=高度：30-210，几率：160，主世界/暮色森林// +achievement.Magnetite=找到磁铁矿矿石 +achievement.Magnetite.desc=高度：30-180，几率：160，主世界/暮色森林/末地/末地小行星/火星/火卫一/火卫二/小行星/木卫一/海卫一/冥王星/Makamake/织女一B/巴德纳E/巴德纳F/鲸鱼座T星// achievement.Iron=找到铁矿石 -achievement.Iron.desc=高度: 50-120, 几率: 160, 主世界/下界/ -achievement.VanadiumMagnetite=找到钒磁铁矿石 -achievement.VanadiumMagnetite.desc=高度: 50-120, 几率: 160, 主世界/下界/ +achievement.Iron.desc=高度：5-180，几率：120，主世界/下界/暮色森林/末地/末地小行星/月球/火卫二/谷神星/木卫一/木卫四/土卫二/海卫八/鸟神星/巴德纳E/巴德纳F/鲸鱼座T星// +achievement.VanadiumMagnetite=找到钒磁铁矿矿石 +achievement.VanadiumMagnetite.desc=高度：60-180，几率：160，主世界/暮色森林/火卫二/木卫一/鸟神星/巴德纳E/鲸鱼座T星/ achievement.Gold=找到金矿石 -achievement.Gold.desc=高度: 60-80, 几率: 160, 主世界// -achievement.BrownLimonite=找到褐色褐铁矿矿石 -achievement.BrownLimonite.desc=高度: 10-40, 几率: 120, 主世界/下界/ +achievement.Gold.desc=高度：30-60，几率：160，主世界/暮色森林/末地/末地小行星/火星/火卫一/小行星/木卫四/海卫一/冥王星/织女一B/巴德纳F/鲸鱼座T星/ +achievement.BrownLimonite=找到棕褐铁矿矿石 +achievement.BrownLimonite.desc=高度：10-40，几率：120，主世界/下界/火星/木卫三/木卫四/水星/天卫四/冥王星// achievement.YellowLimonite=找到黄褐铁矿矿石 -achievement.YellowLimonite.desc=高度: 10-40, 几率: 120, 主世界/下界/ -achievement.BandedIron=找到带状铁矿石 -achievement.BandedIron.desc=高度: 10-40, 几率: 120, 主世界/下界/ +achievement.YellowLimonite.desc=高度：10-40，几率：120，主世界/下界/火星/木卫三/木卫四/水星/天卫四/冥王星// +achievement.BandedIron=找到带状铁矿矿石 +achievement.BandedIron.desc=高度：10-40，几率：120，主世界/下界/火星/木卫三/木卫四/水星/天卫四/冥王星// achievement.Malachite=找到孔雀石矿石 -achievement.Malachite.desc=高度: 10-40, 几率: 120, 主世界/下界/ +achievement.Malachite.desc=高度：10-40，几率：120，主世界/下界/火星/木卫三/木卫四/水星/天卫四/冥王星// achievement.Tin=找到锡矿石 -achievement.Tin.desc=高度: 40-120, 几率: 50, 主世界//末地 +achievement.Tin.desc=高度：60-220，几率：50，主世界/暮色森林/末地/末地小行星/月球/木卫一/金星/天卫五/鲸鱼座T星// achievement.Cassiterite=找到锡石矿石 -achievement.Cassiterite.desc=高度: 40-120, 几率: 50, 主世界//末地 +achievement.Cassiterite.desc=高度：60-220，几率：50，主世界/暮色森林/末地/末地小行星/月球/木卫一/金星/天卫五/鲸鱼座T星// achievement.Tetrahedrite=找到黝铜矿矿石 -achievement.Tetrahedrite.desc=高度: 80-120, 几率: 70, 主世界/下界/ +achievement.Tetrahedrite.desc=高度：80-120，几率：70，下界/末地/末地小行星/火星/火卫二/小行星/木卫三/金星/天卫五/柯伊伯带/织女一B// achievement.Copper=找到铜矿石 -achievement.Copper.desc=高度: 80-120, 几率: 70, 主世界/下界/ +achievement.Copper.desc=高度：5-120，几率：80，主世界/下界/末地/末地小行星/月球/火星/火卫二/小行星/谷神星/木卫三/木卫四/金星/土卫二/天卫五/海卫八/柯伊伯带/织女一B/巴德纳E/巴德纳F// achievement.Stibnite=找到辉锑矿矿石 -achievement.Stibnite.desc=高度: 80-120, 几率: 70, 主世界/下界/ -achievement.NetherQuartz=找到地狱石英矿石 -achievement.NetherQuartz.desc=高度: 40-80, 几率: 80, /下界/ +achievement.Stibnite.desc=高度：80-120，几率：70，下界/末地/末地小行星/火星/火卫二/小行星/木卫三/金星/天卫五/柯伊伯带/织女一B// +achievement.NetherQuartz=找到下界石英矿石 +achievement.NetherQuartz.desc=高度：40-80，几率：80，/下界// achievement.Sulfur=找到硫矿石 -achievement.Sulfur.desc=高度: 5-20, 几率: 100, /下界/ +achievement.Sulfur.desc=高度：5-20，几率：100，/下界/火星/火卫一/火卫二/木卫一/金星// achievement.Pyrite=找到黄铁矿矿石 -achievement.Pyrite.desc=高度: 5-20, 几率: 100, /下界/ +achievement.Pyrite.desc=高度：5-60，几率：100，主世界/下界/末地/末地小行星/月球/火星/火卫一/火卫二/谷神星/木卫一/木卫四/金星/土卫二/海卫八/巴德纳E/巴德纳F// achievement.Sphalerite=找到闪锌矿矿石 -achievement.Sphalerite.desc=高度: 5-20, 几率: 100, /下界/ +achievement.Sphalerite.desc=高度：5-20，几率：100，/下界/火星/火卫一/火卫二/木卫一/金星// achievement.Chalcopyrite=找到黄铜矿矿石 -achievement.Chalcopyrite.desc=高度: 10-30, 几率: 80, 主世界/下界/ +achievement.Chalcopyrite.desc=高度：5-60，几率：80，主世界/下界/末地/末地小行星/月球/谷神星/木卫四/土卫二/海卫八/巴德纳E/巴德纳F// achievement.Bauxite=找到铝土矿矿石 -achievement.Bauxite.desc=高度: 50-90, 几率: 80, 主世界// +achievement.Bauxite.desc=高度：10-80，几率：80，月球/火卫一/小行星/木卫三/水星/土卫六/海卫八/冥王星/柯伊伯带/鸟神星/妊神星/鲸鱼座T星// achievement.Aluminium=找到铝矿石 -achievement.Aluminium.desc=高度: 50-90, 几率: 80, 主世界// +achievement.Aluminium.desc=高度：10-80，几率：80，月球/火卫一/小行星/木卫三/水星/土卫六/海卫八/冥王星/柯伊伯带/鸟神星/妊神星/鲸鱼座T星// achievement.Ilmenite=找到钛铁矿矿石 -achievement.Ilmenite.desc=高度: 50-90, 几率: 80, 主世界// +achievement.Ilmenite.desc=高度：10-80，几率：80，月球/火卫一/小行星/木卫三/水星/土卫六/海卫八/冥王星/柯伊伯带/鸟神星/妊神星/鲸鱼座T星// achievement.RockSalt=找到岩盐矿石 -achievement.RockSalt.desc=高度: 50-60, 几率: 50, 主世界// +achievement.RockSalt.desc=高度：50-70，几率：50，主世界/暮色森林/火星/鲸鱼座T星// achievement.Salt=找到盐矿石 -achievement.Salt.desc=高度: 50-60, 几率: 50, 主世界// +achievement.Salt.desc=高度：50-70，几率：50，主世界/暮色森林/火星/鲸鱼座T星// achievement.Lepidolite=找到锂云母矿石 -achievement.Lepidolite.desc=高度: 50-60, 几率: 50, 主世界// -achievement.Spodumene=找到锂辉矿矿石 -achievement.Spodumene.desc=高度: 50-60, 几率: 50, 主世界// +achievement.Lepidolite.desc=高度：50-70，几率：50，主世界/暮色森林/火星/鲸鱼座T星// +achievement.Spodumene=找到锂辉石矿石 +achievement.Spodumene.desc=高度：50-70，几率：50，主世界/暮色森林/火星/鲸鱼座T星// achievement.Redstone=找到红石矿石 -achievement.Redstone.desc=高度: 10-40, 几率: 60, 主世界/下界/ +achievement.Redstone.desc=高度：5-40，几率：60，主世界/下界/火星/木卫三/金星/水星/天卫五/织女一B/巴德纳F// achievement.Ruby=找到红宝石矿石 -achievement.Ruby.desc=高度: 10-40, 几率: 60, 主世界/下界/ +achievement.Ruby.desc=高度：5-40，几率：60，主世界/下界/火星/木卫三/金星/水星/天卫五/织女一B/巴德纳F// achievement.Cinnabar=找到朱砂矿石 -achievement.Cinnabar.desc=高度: 10-40, 几率: 60, 主世界/下界/ +achievement.Cinnabar.desc=高度：5-40，几率：60，主世界/下界/火星/木卫三/金星/水星/天卫五/织女一B/巴德纳F// achievement.Soapstone=找到皂石矿石 -achievement.Soapstone.desc=高度: 10-40, 几率: 40, 主世界// -achievement.Talc=找到滑石 -achievement.Talc.desc=高度: 10-40, 几率: 40, 主世界// +achievement.Soapstone.desc=高度：20-50，几率：40，主世界/暮色森林// +achievement.Talc=找到滑石矿石 +achievement.Talc.desc=高度：20-50，几率：40，主世界/暮色森林// achievement.Glauconite=找到海绿石矿石 -achievement.Glauconite.desc=高度: 10-40, 几率: 40, 主世界// +achievement.Glauconite.desc=高度：20-50，几率：40，主世界/暮色森林// achievement.Pentlandite=找到镍黄铁矿矿石 -achievement.Pentlandite.desc=高度: 10-40, 几率: 40, 主世界// +achievement.Pentlandite.desc=高度：10-50，几率：40，主世界/暮色森林/末地/末地小行星/火星/火卫一/火卫二/金星/土卫六/海卫一/柯伊伯带// achievement.Garnierite=找到硅镁镍矿矿石 -achievement.Garnierite.desc=高度: 10-40, 几率: 40, 主世界/下界/末地 +achievement.Garnierite.desc=高度：10-40，几率：40，暮色森林/末地/末地小行星/火星/火卫一/火卫二/金星/土卫六/海卫一/柯伊伯带// achievement.Nickel=找到镍矿石 -achievement.Nickel.desc=高度: 10-40, 几率: 40, 主世界/下界/末地 -achievement.Cobaltite=找到辉砷钴矿矿石 -achievement.Cobaltite.desc=高度: 10-40, 几率: 40, 主世界/下界/末地 +achievement.Nickel.desc=高度：10-40，几率：40，暮色森林/末地/末地小行星/火星/火卫一/火卫二/金星/土卫六/海卫一/柯伊伯带// +achievement.Cobaltite=找到钴酸盐矿石 +achievement.Cobaltite.desc=高度：10-40，几率：40，暮色森林/末地/末地小行星/火星/火卫一/火卫二/金星/土卫六/海卫一/柯伊伯带// achievement.Cooperite=找到硫铂矿矿石 -achievement.Cooperite.desc=高度: 40-50, 几率: 5, 主世界//末地 +achievement.Cooperite.desc=没有这个东西，不存在的，tan 90° achievement.Palladium=找到钯矿石 -achievement.Palladium.desc=高度: 40-50, 几率: 5, 主世界//末地 +achievement.Palladium.desc=高度：5-30，几率：10，/谷神星/木卫一/木卫三/木卫四/水星/天卫四/冥王星/柯伊伯带/鲸鱼座T星// achievement.Platinum=找到铂矿石 -achievement.Platinum.desc=高度: 40-50, 几率: 5, 主世界//末地 +achievement.Platinum.desc=高度：5-30，几率：10，/谷神星/木卫一/木卫三/木卫四/水星/天卫四/冥王星/柯伊伯带/鲸鱼座T星// achievement.Iridium=找到铱矿石 -achievement.Iridium.desc=高度: 40-50, 几率: 5, 主世界//末地 -achievement.Pitchblende=找到沥青铀矿 -achievement.Pitchblende.desc=高度: 10-40, 几率: 40, 主世界// +achievement.Iridium.desc=高度：5-40，几率：10，木卫一/金星/水星/土卫二/土卫六/天卫四/天卫五/海卫八/海卫一/冥王星/柯伊伯带/鲸鱼座T星// +achievement.Pitchblende=找到沥青铀矿矿石 +achievement.Pitchblende.desc=高度：30-60，几率：40，火星/火卫一/木卫一/金星/天卫四/柯伊伯带/鸟神星/妊神星/织女一B/巴德纳F// achievement.Uranium=找到铀矿石 -achievement.Uranium.desc=高度: 10-40, 几率: 40, 主世界// +achievement.Uranium.desc=高度：30-60，几率：40，火星/火卫一/火卫二/谷神星/木卫一/木卫三/金星/土卫二/天卫四/海卫八// achievement.Uraninite=找到晶质铀矿矿石 -achievement.Uraninite.desc=高度: 10-40, 几率: 40, 主世界// +achievement.Uraninite.desc=高度：5-60，几率：40，火星/火卫一/火卫二/谷神星/木卫一/木卫三/金星/土卫二/天卫四/海卫八/柯伊伯带/鸟神星/妊神星/织女一B/巴德纳E/巴德纳F// achievement.Plutonium=找到钚矿石 -achievement.Plutonium.desc=高度: 20-30, 几率: 10, 主世界// +achievement.Plutonium.desc=高度：只能加工得到// achievement.Bastnasite=找到氟碳铈矿矿石 -achievement.Bastnasite.desc=高度: 20-40, 几率: 30, 主世界// +achievement.Bastnasite.desc=高度：20-40，几率：30，月球/火卫二/木卫一/木卫四/金星/土卫二/土卫六/海卫一/鸟神星/妊神星/巴德纳F// achievement.Monazite=找到独居石矿石 -achievement.Monazite.desc=高度: 20-40, 几率: 30, 主世界// +achievement.Monazite.desc=高度：20-40，几率：30，月球/火卫二/木卫一/木卫四/金星/土卫二/土卫六/海卫一/鸟神星/妊神星/巴德纳F// achievement.Neodymium=找到钕矿石 -achievement.Neodymium.desc=高度: 20-40, 几率: 30, 主世界// +achievement.Neodymium.desc=高度：20-40，几率：30，月球/火卫二/木卫一/木卫四/金星/土卫二/土卫六/海卫一/鸟神星/妊神星/巴德纳F// achievement.Wulfenite=找到钼铅矿矿石 -achievement.Wulfenite.desc=高度: 20-50, 几率: 5, 主世界//末地 +achievement.Wulfenite.desc=高度：20-50，几率：5，下界/暮色森林/月球/火卫一/谷神星/水星/土卫六/海卫八/冥王星/巴德纳E// achievement.Molybdenite=找到辉钼矿矿石 -achievement.Molybdenite.desc=高度: 20-50, 几率: 5, 主世界//末地 +achievement.Molybdenite.desc=高度：20-50，几率：5，下界/暮色森林/月球/火卫一/谷神星/水星/土卫六/海卫八/冥王星/巴德纳E// achievement.Molybdenum=找到钼矿石 -achievement.Molybdenum.desc=高度: 20-50, 几率: 5, 主世界//末地 +achievement.Molybdenum.desc=高度：20-50，几率：5，下界/暮色森林/月球/火卫一/谷神星/水星/土卫六/海卫八/冥王星/巴德纳E// achievement.Powellite=找到钼钙矿矿石 -achievement.Powellite.desc=高度: 20-50, 几率: 5, 主世界//末地 +achievement.Powellite.desc=高度：20-50，几率：5，下界/暮色森林/月球/火卫一/谷神星/水星/土卫六/海卫八/冥王星/巴德纳E// achievement.Scheelite=找到白钨矿矿石 -achievement.Scheelite.desc=高度: 20-50, 几率: 10, 主世界//末地 -achievement.Tungstate=找到钨酸盐矿矿石 -achievement.Tungstate.desc=高度: 20-50, 几率: 10, 主世界//末地 +achievement.Scheelite.desc=高度：20-60，几率：10，火星/火卫二/小行星/木卫三/木卫四/土卫二/天卫四/海卫一/冥王星/鸟神星/妊神星/织女一B// +achievement.Tungstate=找到钨酸盐矿石 +achievement.Tungstate.desc=高度：20-60，几率：10，火星/火卫二/小行星/木卫三/木卫四/土卫二/天卫四/海卫一/冥王星/鸟神星/妊神星/织女一B// achievement.Lithium=找到锂矿石 -achievement.Lithium.desc=高度: 20-50, 几率: 10, 主世界//末地 +achievement.Lithium.desc=高度：20-60，几率：10，火星/火卫二/小行星/木卫三/木卫四/土卫二/天卫四/海卫一/冥王星/鸟神星/妊神星/织女一B// achievement.Almandine=找到铁铝榴石矿石 -achievement.Almandine.desc=高度: 10-40, 几率: 60, 主世界// +achievement.Almandine.desc=高度：10-40，几率：60，暮色森林// achievement.Pyrope=找到镁铝榴石矿石 -achievement.Pyrope.desc=高度: 10-40, 几率: 60, 主世界// +achievement.Pyrope.desc=高度：10-40，几率：60，暮色森林// achievement.Sapphire=找到蓝宝石矿石 -achievement.Sapphire.desc=高度: 10-40, 几率: 60, 主世界// -achievement.GreenSapphire=找到绿蓝宝石矿石 -achievement.GreenSapphire.desc=高度: 10-40, 几率: 60, 主世界// +achievement.Sapphire.desc=高度：10-40，几率：60，暮色森林// +achievement.GreenSapphire=找到绿色蓝宝石矿石 +achievement.GreenSapphire.desc=高度：10-40，几率：60，暮色森林// achievement.Grossular=找到钙铝榴石矿石 -achievement.Grossular.desc=高度: 20-30, 几率: 20, 主世界//末地 +achievement.Grossular.desc=高度：20-30，几率：20，主世界/下界/谷神星/木卫一/土卫六/天卫四/海卫一/巴德纳E/巴德纳F// achievement.Spessartine=找到锰铝榴石矿石 -achievement.Spessartine.desc=高度: 20-30, 几率: 20, 主世界//末地 +achievement.Spessartine.desc=高度：20-30，几率：20，主世界/下界/谷神星/木卫一/土卫六/天卫四/海卫一/巴德纳E/巴德纳F// achievement.Pyrolusite=找到软锰矿矿石 -achievement.Pyrolusite.desc=高度: 20-30, 几率: 20, 主世界//末地 +achievement.Pyrolusite.desc=高度：20-30，几率：20，主世界/下界/谷神星/木卫一/土卫六/天卫四/海卫一/巴德纳E/巴德纳F// achievement.Tantalite=找到钽铁矿矿石 -achievement.Tantalite.desc=高度: 20-30, 几率: 20, 主世界//末地 +achievement.Tantalite.desc=高度：20-30，几率：20，主世界/下界/谷神星/木卫一/土卫六/天卫四/海卫一/巴德纳E/巴德纳F// achievement.Quartzite=找到石英岩矿石 -achievement.Quartzite.desc=高度: 40-80, 几率: 60, 主世界// -achievement.Barite=找到叠晶石矿石 -achievement.Barite.desc=高度: 40-80, 几率: 60, 主世界// +achievement.Quartzite.desc=高度：40-80，几率：60，下界/月球/火星/火卫一/木卫一/金星/海卫八/鲸鱼座T星// +achievement.Barite=找到重晶石矿石 +achievement.Barite.desc=高度：40-80，几率：60，下界/月球/火星/火卫一/木卫一/金星/海卫八/鲸鱼座T星// achievement.CertusQuartz=找到赛特斯石英矿石 -achievement.CertusQuartz.desc=高度: 40-80, 几率: 60, 主世界// +achievement.CertusQuartz.desc=高度：40-80，几率：60，下界/月球/火星/火卫一/木卫一/金星/海卫八/鲸鱼座T星// achievement.Graphite=找到石墨矿石 -achievement.Graphite.desc=高度: 5-20, 几率: 40, 主世界// -achievement.Diamond=找到Diamond -achievement.Diamond.desc=高度: 5-20, 几率: 40, 主世界// -achievement.Bentonite=找到膨润土 -achievement.Bentonite.desc=高度: 10-40, 几率: 60, 主世界//末地 +achievement.Graphite.desc=高度：5-20，几率：40，主世界/暮色森林/火卫一/木卫三/水星/土卫六/天卫五/海卫八/冥王星/柯伊伯带/巴德纳F// +achievement.Diamond=找到钻石矿石 +achievement.Diamond.desc=高度：5-20，几率：40，主世界/暮色森林/火卫一/木卫三/水星/土卫六/天卫五/海卫八/冥王星/柯伊伯带/巴德纳F// +achievement.Bentonite=找到膨润土矿石 +achievement.Bentonite.desc=高度：10-40，几率：60，暮色森林/鸟神星/妊神星/巴德纳E// achievement.Magnesite=找到菱镁矿矿石 -achievement.Magnesite.desc=高度: 10-40, 几率: 60, 主世界//末地 +achievement.Magnesite.desc=高度：10-40，几率：60， 暮色森林/鸟神星/妊神星/巴德纳E// achievement.Olivine=找到橄榄石矿石 -achievement.Olivine.desc=高度: 10-40, 几率: 60, 主世界//末地 +achievement.Olivine.desc=高度：10-40，几率：60， 暮色森林/鸟神星/妊神星/巴德纳E// achievement.Apatite=找到磷灰石矿石 -achievement.Apatite.desc=高度: 40-60, 几率: 60, 主世界// +achievement.Apatite.desc=高度：40-60，几率：60，主世界/暮色森林/鲸鱼座T星// 大概已经不存在了 achievement.Phosphorus=找到磷矿石 -achievement.Phosphorus.desc=高度: 40-60, 几率: 60, 主世界// +achievement.Phosphorus.desc=高度：40-60，几率：60，主世界/暮色森林/鲸鱼座T星// 大概已经不存在了 achievement.Phosphate=找到磷酸盐矿石 -achievement.Phosphate.desc=高度: 40-60, 几率: 60, 主世界// +achievement.Phosphate.desc=高度：40-60，几率：60，主世界/暮色森林/鲸鱼座T星// 大概已经不存在了 achievement.Galena=找到方铅矿矿石 -achievement.Galena.desc=高度: 30-60, 几率: 40, 主世界// +achievement.Galena.desc=高度：5-45，几率：40，暮色森林/月球/火星/木卫三/金星/天卫四/海卫一/织女一B// achievement.Silver=找到银矿石 -achievement.Silver.desc=高度: 30-60, 几率: 40, 主世界// +achievement.Silver.desc=高度：5-45，几率：40，暮色森林/月球/火星/木卫三/金星/天卫四/海卫一/织女一B// achievement.Lead=找到铅矿石 -achievement.Lead.desc=高度: 30-60, 几率: 40, 主世界// +achievement.Lead.desc=高度：5-45，几率：40，暮色森林/月球/火星/木卫三/金星/天卫四/海卫一/织女一B// achievement.Lazurite=找到天青石矿石 -achievement.Lazurite.desc=高度: 20-50, 几率: 40, 主世界//末地 +achievement.Lazurite.desc=高度：20-50，几率：40，主世界/暮色森林/火卫二/谷神星/土卫二/织女一B// achievement.Sodalite=找到方钠石矿石 -achievement.Sodalite.desc=高度: 20-50, 几率: 40, 主世界//末地 +achievement.Sodalite.desc=高度：20-50，几率：40，主世界/暮色森林/火卫二/谷神星/土卫二/织女一B// achievement.Lapis=找到青金石矿石 -achievement.Lapis.desc=高度: 20-50, 几率: 40, 主世界//末地 +achievement.Lapis.desc=高度：20-50，几率：40，主世界/暮色森林/火卫二/谷神星/土卫二/织女一B// achievement.Calcite=找到方解石矿石 -achievement.Calcite.desc=高度: 20-50, 几率: 40, 主世界//末地 +achievement.Calcite.desc=高度：20-50，几率：40，主世界/暮色森林/火卫二/谷神星/土卫二/织女一B// achievement.Beryllium=找到铍矿石 -achievement.Beryllium.desc=高度: 5-30, 几率: 30, 主世界//末地 +achievement.Beryllium.desc=高度：5-30，几率：30，下界/末地/末地小行星/火星/谷神星/金星/土卫六/冥王星/鸟神星/妊神星/巴德纳F// achievement.Emerald=找到绿宝石矿石 -achievement.Emerald.desc=高度: 5-30, 几率: 30, 主世界//末地 +achievement.Emerald.desc=高度：5-30，几率：30，下界/末地小行星/火星/谷神星/金星/土卫六/冥王星/鸟神星/妊神星/巴德纳F// achievement.Thorium=找到钍矿石 -achievement.Thorium.desc=高度: 5-30, 几率: 30, 主世界//末地 +achievement.Thorium.desc=高度：5-30，几率：30，下界/末地小行星/火星/谷神星/金星/土卫六/冥王星/鸟神星/妊神星/巴德纳F// +achievement.Oilsands=找到油砂矿石 +achievement.Oilsands.desc=高度：50-80，几率：80，主世界/鲸鱼座T星// +achievement.InfusedAir=找到风之蕴魔石矿石 +achievement.InfusedAir.desc=高度：5-35，几率：16，暮色森林// +achievement.InfusedFire=找到火之蕴魔石矿石 +achievement.InfusedFire.desc=高度：5-35，几率：16，暮色森林// +achievement.InfusedEarth=找到地之蕴魔石矿石 +achievement.InfusedEarth.desc=高度：5-35，几率：16，暮色森林// +achievement.InfusedWater=找到水之蕴魔石矿石 +achievement.InfusedWater.desc=高度：5-35，几率：16，暮色森林// +achievement.InfusedEntropy=找到混沌蕴魔石矿石 +achievement.InfusedEntropy.desc=高度：5-35，几率：16，暮色森林// +achievement.InfusedOrder=找到秩序蕴魔石矿石 +achievement.InfusedOrder.desc=高度：5-35，几率：16，暮色森林// +achievement.Amber=找到琥珀矿石 +achievement.Amber.desc=高度：5-35，几率：16，暮色森林// +achievement.Cinnabar=找到朱砂矿石 +achievement.Cinnabar.desc=高度：5-35，几率：16，暮色森林// +achievement.Uvarovite=找到钙铬榴石矿石 +achievement.Uvarovite.desc=高度：10-200，几率：16，月球/木卫三/小行星/木卫四/水星/土卫六/天卫五/海卫八/冥王星/鲸鱼座T星// +achievement.Chromite=找到铬铁矿矿石 +achievement.Chromite.desc=高度：10-200，几率：16，月球/木卫三/小行星/木卫四/水星/土卫六/天卫五/海卫八/冥王星/鲸鱼座T星// +achievement.Titanium=找到钛矿石 +achievement.Titanium.desc=高度：10-200，几率：16，月球/木卫三/小行星/木卫四/水星/土卫六/天卫五/海卫八/冥王星/鲸鱼座T星// +achievement.Perlite=找到珍珠岩矿石 +achievement.Perlite.desc=高度：10-200，几率：16，月球/木卫三/小行星/木卫四/水星/土卫六/天卫五/海卫八/冥王星/鲸鱼座T星// +achievement.Vermiculite=找到蛭石矿石 +achievement.Vermiculite.desc=高度：180-250，几率：80，主世界// +achievement.Alunite=找到明矾石矿石 +achievement.Alunite.desc=高度：5-250，几率：80，主世界// +achievement.GraniticMineralSand=找到花岗岩矿砂 +achievement.GraniticMineralSand.desc=高度：50-60，几率：80，主世界// +achievement.BasalticMineralSand=找到玄武岩矿砂 +achievement.BasalticMineralSand.desc=高度：50-60，几率：80，主世界// +achievement.FullersEarth=找到漂白土矿石 +achievement.FullersEarth.desc=高度：50-60，几率：80，主世界// +achievement.Gypsum=找到石膏矿石 +achievement.Gypsum.desc=高度：50-60，几率：80，主世界// +achievement.Kaolinite=找到高岭石矿石 +achievement.Kaolinite.desc=高度：50-70，几率：60，主世界// +achievement.Zeolite=找到沸石矿石 +achievement.Zeolite.desc=高度：50-70，几率：60，主世界// +achievement.GlauconiteSand=找到海绿石矿砂 +achievement.GlauconiteSand.desc=高度：50-70，几率：60，主世界// +achievement.Kyanite=找到蓝晶石矿石 +achievement.Kyanite.desc=高度：20-40，几率：20，主世界// +achievement.Mica=找到云母矿石 +achievement.Mica.desc=高度：20-40，几率：20，主世界// +achievement.CassiteriteSand=找到锡石矿砂 +achievement.CassiteriteSand.desc=高度：20-60，几率：20，主世界// +achievement.Pollucite=找到铯榴石矿石 +achievement.Pollucite.desc=高度：20-40，几率：20，主世界// +achievement.Dolomite=找到白云石矿石 +achievement.Dolomite.desc=高度：150-250，几率：40，主世界// +achievement.Wollastonite=找到硅灰石矿石 +achievement.Wollastonite.desc=高度：150-250，几率：40，主世界// +achievement.Trona=找到天然碱矿石 +achievement.Trona.desc=高度：150-250，几率：40，主世界// +achievement.Andradite=找到钙铁榴石矿石 +achievement.Andradite.desc=高度：150-250，几率：40，主世界// +achievement.GarnetSand=找到石榴石矿砂 +achievement.GarnetSand.desc=高度：20-60，几率：80，主世界/妊神星/织女一B/巴德纳E/鲸鱼座T星// +achievement.Asbestos=找到石棉矿石 +achievement.Asbestos.desc=高度：50-60，几率：80，主世界// +achievement.Diatomite=找到硅藻土矿石 +achievement.Diatomite.desc=高度：5-60，几率：80，主世界/下界// +achievement.Saltpeter=找到硝石矿石 +achievement.Saltpeter.desc=高度：5-45，几率：40，下界// +achievement.Nikolite=找到镍铌铁矿石 +achievement.Nikolite.desc=高度：5-45，几率：40，下界/火卫一/火卫二/木卫一/水星/天卫五// +achievement.Desh=找到戴斯矿石 +achievement.Desh.desc=高度：5-40，几率：30，火星/天卫五// +achievement.Draconium=找到龙锭矿石 +achievement.Draconium.desc=高度：20-40，几率：40，末地/火卫一/火卫二/木卫一/水星/天卫五// +achievement.Jade=找到玉矿石 +achievement.Jade.desc=高度：20-40，几率：40，火卫一/火卫二/木卫一/水星/天卫五// +achievement.Vinteum=找到温特姆矿石 +achievement.Vinteum.desc=高度：20-40，几率：40，火卫一/火卫二/木卫一/水星/天卫五// +achievement.Quantium=找到量子矿石 +achievement.Quantium.desc=高度：5-25，几率：30，金星// +achievement.Amethyst=找到紫水晶矿石 +achievement.Amethyst.desc=高度：5-25，几率：30，金星// +achievement.Ardite=找到阿迪特矿石 +achievement.Ardite.desc=高度：5-25，几率：30，金星// +achievement.Rutile=找到金红石矿石 +achievement.Rutile.desc=高度：5-25，几率：30，金星// +achievement.CallistoIce=找到木卫四冰矿石 +achievement.CallistoIce.desc=高度：40-60，几率：40，木卫四// +achievement.Topaz=找到黄玉矿石 +achievement.Topaz.desc=高度：40-60，几率：40，木卫四// +achievement.BlueTopaz=找到蓝黄玉矿石 +achievement.BlueTopaz.desc=高度：40-60，几率：40，木卫四// +achievement.Alduorite=找到神秘蓝金矿石 +achievement.Alduorite.desc=高度：40-60，几率：40，木卫四// +achievement.Mytryl=找到深空秘银矿石 +achievement.Mytryl.desc=高度：10-30，几率：40，木卫一// +achievement.Jasper=找到碧玉矿石 +achievement.Jasper.desc=高度：10-30，几率：40，木卫一// +achievement.Ceruclase=找到暗影秘银矿石 +achievement.Ceruclase.desc=高度：10-30，几率：40，木卫一// +achievement.Vulcanite=找到深铅矿石 +achievement.Vulcanite.desc=高度：10-30，几率：40，木卫一// +achievement.Ledox=找到深铅矿石 +achievement.Ledox.desc=高度：40-60，几率：40，土卫二// +achievement.Opal=找到猫眼石矿石 +achievement.Opal.desc=高度：40-60，几率：40，土卫二// +achievement.Orichalcum=找到奥利哈钢矿石 +achievement.Orichalcum.desc=高度：40-60，几率：40，土卫二// +achievement.Rubracium=找到褐铜矿石 +achievement.Rubracium.desc=高度：40-60，几率：40，土卫二// +achievement.Oriharukon=找到山铜矿石 +achievement.Oriharukon.desc=高度：30-60，几率：40，火卫一/火卫二// +achievement.Tanzanite=找到坦桑石矿石 +achievement.Tanzanite.desc=高度：30-60，几率：40，火卫一/火卫二// +achievement.Vyroxeres=找到幽冥剧毒结晶矿石 +achievement.Vyroxeres.desc=高度：30-60，几率：40，火卫一/火卫二// +achievement.Mirabilite=找到芒硝矿石 +achievement.Mirabilite.desc=高度：30-60，几率：40，火卫一/火卫二// +achievement.BlackPlutonium=找到黑钚矿石 +achievement.BlackPlutonium.desc=高度：5-25，几率：40，冥王星/鸟神星/鲸鱼座T星// +achievement.GarnetRed=找到红石榴石矿石 +achievement.GarnetRed.desc=高度：5-60，几率：40，冥王星/鸟神星/妊神星/织女一B/巴德纳F/鲸鱼座T星// +achievement.GarnetYellow=找到黄石榴石矿石 +achievement.GarnetYellow.desc=高度：5-60，几率：40，冥王星/鸟神星/妊神星/织女一B/巴德纳F/鲸鱼座T星// +achievement.Borax=找到硼砂矿石 +achievement.Borax.desc=高度：5-25，几率：40，冥王星/鸟神星/鲸鱼座T星// +achievement.InfusedGold=找到注魔金矿石 +achievement.InfusedGold.desc=高度：15-40，几率：30，木卫一/土卫六/海卫八/妊神星/织女一B/巴德纳E// +achievement.Niobium=找到铌矿石 +achievement.Niobium.desc=高度：5-30，几率：60，/海卫一/鸟神星/织女一B/巴德纳F// +achievement.Yttrium=找到钇矿石 +achievement.Yttrium.desc=高度：5-30，几率：60，/海卫一/鸟神星/织女一B/巴德纳F// +achievement.Gallium=找到镓矿石 +achievement.Gallium.desc=高度：5-30，几率：60，/海卫一/鸟神星/织女一B/巴德纳F// +achievement.ShadowIron=找到暗影铁矿石 +achievement.ShadowIron.desc=高度：5-25，几率：30，/天卫四/海卫八/冥王星/巴德纳E/巴德纳F// +achievement.DeepIron=找到深渊铁矿石 +achievement.DeepIron.desc=高度：5-25，几率：30，/天卫四/海卫八/冥王星/巴德纳E/巴德纳F// +achievement.Silicon=找到硅矿石 +achievement.Silicon.desc=高度：5-25，几率：30，/天卫四/海卫八/冥王星/巴德纳E/巴德纳F// +achievement.Tungsten=找到钨矿石 +achievement.Tungsten.desc=高度：5-25，几率：30，/天卫四/海卫八/冥王星/巴德纳E/巴德纳F// +achievement.Europium=找到铕矿石 +achievement.Europium.desc=高度：10-30，几率：60，/海卫一/冥王星/妊神星/织女一B/巴德纳E/巴德纳F// +achievement.Uranium235=找到铀-235矿石 +achievement.Uranium235.desc=高度：10-30，几率：60，/海卫一/冥王星/妊神星/织女一B/巴德纳E/巴德纳F// +achievement.Plutonium241=找到钚-241矿石 +achievement.Plutonium241.desc=高度：10-30，几率：60，/海卫一/冥王星/妊神星/织女一B/巴德纳E/巴德纳F// +achievement.NetherStar=找到下界之星矿石 +achievement.NetherStar.desc=高度：20-60，几率：60，/妊神星/织女一B/巴德纳E/鲸鱼座T星// +achievement.Realgar=找到雄黄矿石 +achievement.Realgar.desc=高度：10-30，几率：40，/鸟神星/织女一B/巴德纳F// +achievement.Chrysotile=找到白石棉矿石 +achievement.Chrysotile.desc=高度：10-30，几率：40，/鸟神星/织女一B/巴德纳F// +achievement.Cerium=找到铈矿石 +achievement.Cerium.desc=高度：30-60，几率：40，/织女一B/巴德纳E/巴德纳F// +achievement.Caesium=找到铯矿石 +achievement.Caesium.desc=高度：30-60，几率：40，/织女一B/巴德纳E/巴德纳F// +achievement.Cadmium=找到镉矿石 +achievement.Cadmium.desc=高度：30-60，几率：40，/织女一B/巴德纳E/巴德纳F// +achievement.Lanthanum=找到镧矿石 +achievement.Lanthanum.desc=高度：30-60，几率：40，/织女一B/巴德纳E/巴德纳F// +achievement.Vanadium=找到钒矿石 +achievement.Vanadium.desc=高度：10-50，几率：60，/土卫二/海卫八/鸟神星/织女一B/巴德纳F// +achievement.Osmium=找到锇矿石 +achievement.Osmium.desc=高度：5-30，几率：60，/土卫二/土卫六/天卫四/天卫五/海卫八/冥王星/柯伊伯带/鲸鱼座T星E// +achievement.Mithril=找到秘银矿石 +achievement.Mithril.desc=高度：15-40，几率：10，/木卫一/金星/水星/土卫二/土卫六/天卫五/海卫一/柯伊伯带/鲸鱼座T星// +achievement.Chrome=找到铬矿石 +achievement.Chrome.desc=高度：5-50，几率：60，谷神星/木卫三/木卫一/木卫四/水星/天卫四/土卫二/海卫八/冥王星/柯伊伯带/鸟神星/织女一B/巴德纳F/鲸鱼座T星// +achievement.Neutronium=找到中子锭矿石 +achievement.Neutronium.desc=高度：5-30，几率：10，/木卫一/金星/水星/土卫二/土卫六/天卫五/海卫一/柯伊伯带/鲸鱼座T星// +achievement.Adamantium=找到精金合金矿石 +achievement.Adamantium.desc=高度：5-30，几率：10，海卫八/海卫一/冥王星/柯伊伯带/鸟神星/妊神星/织女一B/巴德纳E/巴德纳F/鲸鱼座T星// +achievement.MeteoricIron=找到陨铁矿石 +achievement.MeteoricIron.desc=高度：220-230，几率：100，漆黑维度/ +achievement.InfinityCatalyst=找到无尽催化剂矿石 +achievement.InfinityCatalyst.desc=高度：5-15，几率：100，漆黑维度// +achievement.Naquadria=找到硅岩瑞亚矿石 +achievement.Naquadria.desc=高度：5-15，几率：100，漆黑维度// +achievement.DraconiumAwakened=找到觉醒龙锭矿 +achievement.DraconiumAwakened.desc=高度：175-185，几率：100，漆黑维度// +achievement.Bedrockium=找到基岩矿石 +achievement.Bedrockium.desc=高度：175-185，几率：100，漆黑维度// +achievement.Cobalt=找到钴矿石 +achievement.Cobalt.desc=高度：170-180，几率：100，漆黑维度// +achievement.Magnesium=找到镁矿石 +achievement.Magnesium.desc=高度：65-75，几率：100，漆黑维度// +achievement.Manganese=找到锰矿石 +achievement.Manganese.desc=高度：225-235，几率：100，漆黑维度// +achievement.Antimony=找到锑矿石 +achievement.Antimony.desc=高度：40-60, 180-290, 几率：60/100, 火星/火卫一/土卫六/水星/织女一B, 漆黑维度// +achievement.Arsenic=找到砷矿石 +achievement.Arsenic.desc=高度：40-60, 185-195, 几率：60/100, 火星/火卫一/土卫六/水星/织女一B, 漆黑维度// +achievement.Pyrochlore=找到烧绿石矿石 +achievement.Pyrochlore.desc=高度：40-60, 几率：16, 主世界/暮色森林/鲸鱼座T星E/漆黑维度// +achievement.Bismuth=找到铋矿石 +achievement.Bismuth.desc=高度：40-60, 几率：60, 火星/火卫一/水星/土卫六/织女一B// achievement.flintpick=第一把工具 achievement.flintpick.desc=制造一把燧石镐 @@ -195,7 +447,7 @@ achievement.tools=更多的工具 achievement.tools.desc=制造一把锤子 achievement.driltime=电钻时间! achievement.driltime.desc=制造一把电钻(LV) -achievement.brrrr=Brrrr... +achievement.brrrr=嗡嗡嗡... achievement.brrrr.desc=制造一把链锯(LV) achievement.highpowerdrill=大功率电钻 achievement.highpowerdrill.desc=制造一把电钻(HV) @@ -234,14 +486,32 @@ achievement.macerator.desc=制造一台蒸汽研磨机 achievement.extract=提取 achievement.extract.desc=制造一台蒸汽提取机 achievement.smallparts=小部件 -achievement.smallparts.desc=制造存储芯片 +achievement.smallparts.desc=制造真空管 +achievement.gtbasiccircuit=基础电路 +achievement.gtbasiccircuit.desc=制造一个电路板 achievement.bettercircuits=更好的电路 -achievement.bettercircuits.desc=得到进阶电子电路 +achievement.bettercircuits.desc=得到优质 achievement.stepforward=更进一步 -achievement.stepforward.desc=制造高级电路 +achievement.stepforward.desc=制造高级电路板 +achievement.gtmonosilicon=单晶硅 +achievement.gtmonosilicon.desc=制造单晶硅 +achievement.gtlogicwafer=逻辑电路晶元 +achievement.gtlogicwafer.desc=制造一个逻辑电路晶元 +achievement.gtlogiccircuit=逻辑集成电路 +achievement.gtlogiccircuit.desc=制造一个逻辑集成电路 +achievement.gtcleanroom=超净间 +achievement.gtcleanroom.desc=制造一个超净间控制器 +achievement.gtquantumprocessor=量子处理器 +achievement.gtquantumprocessor.desc=得到量子处理器 achievement.energyflow=能量流 -achievement.energyflow.desc=得到能量流电路 -achievement.orbs=球 +achievement.energyflow.desc=得到纳米处理器 +achievement.gtcrystalprocessor=晶体处理器 +achievement.gtcrystalprocessor.desc=得到晶体处理器 +achievement.gtwetware=湿件处理器 +achievement.gtwetware.desc=得到湿件处理器 +achievement.gtwetmain=湿件主机 +achievement.gtwetmain.desc=得到一台湿件主机 +achievement.orbs=宝珠 achievement.orbs.desc=得到一个兰波顿能量球 achievement.thatspower=这就是能量 achievement.thatspower.desc=得到一个兰波顿能量球簇 @@ -278,7 +548,7 @@ achievement.slurp.desc=制造一台进阶泵 II achievement.transport=运输 achievement.transport.desc=制造一个输送机模块(LV) achievement.manipulation=操纵 -achievement.manipulation.desc=得到一块机器控制板 +achievement.manipulation.desc=制造一个机器控制器 achievement.buffer=缓存 achievement.buffer.desc=制造一台LV级缓存器 achievement.complexmachines=复杂机械 @@ -311,6 +581,8 @@ achievement.upgradeebf=升级你的能量网 achievement.upgradeebf.desc=制造一个MV级能源输入舱 achievement.maintainance=维护 achievement.maintainance.desc=修理一台机器的所有维护问题 +achievement.upgrade=升级你的线圈 +achievement.upgrade.desc=制造一个铁铬铝合金线圈方块 achievement.titan=钛 achievement.titan.desc=制造一块钛锭 achievement.magic=魔法? @@ -323,10 +595,12 @@ achievement.muchsteam=如此多的蒸汽 achievement.muchsteam.desc=启动一台大型涡轮机 achievement.efficientsteam=高效蒸汽 achievement.efficientsteam.desc=在大型涡轮机里使用过热蒸汽 -achievement.upgrade=升级你的线圈 -achievement.upgrade.desc=制造一个铁铬铝合金线圈 +achievement.upgrade2=升级你的线圈(Lv.2) +achievement.upgrade2.desc=制造一个镍铬合金线圈方块 achievement.tungsten=钨 -achievement.tungsten.desc=冷却一块炙热的钨锭 +achievement.tungsten.desc=冷却一块热钨锭 +achievement.osmium=锇 +achievement.osmium.desc=冷却一块热锇锭 achievement.hightech=高科技 achievement.hightech.desc=制造一台力场产生器(LV) achievement.amplifier=增幅器 @@ -339,10 +613,16 @@ achievement.universal=通用的 achievement.universal.desc=制造一台质量加工器 achievement.replication=复制 achievement.replication.desc=制造一台复制器 -achievement.upgrade2=升级你的线圈 (再次) -achievement.upgrade2.desc=制造一个镍铬合金线圈 achievement.tungstensteel=钨钢 -achievement.tungstensteel.desc=冷却一块炙热的钨钢锭 +achievement.tungstensteel.desc=冷却一块热钨钢锭 +achievement.upgrade3=升级你的线圈(Lv.3) +achievement.upgrade3.desc=制造一个钨钢线圈方块 +achievement.hssg=HSS-G +achievement.hssg.desc=冷却一块热高速钢-G锭 +achievement.upgrade4=升级你的线圈(Lv.4) +achievement.upgrade4.desc=制造一个高速钢-G线圈方块 +achievement.stargatematerial=星际物质 +achievement.stargatematerial.desc=冷却一块热硅岩锭 achievement.conducting=超导 achievement.conducting.desc=制造一个超导线圈 achievement.fusion=聚合 @@ -351,11 +631,352 @@ achievement.higherefficency=更高的效率 achievement.higherefficency.desc=制作氮离子 achievement.advancing=超前 achievement.advancing.desc=制作铕 +achievement.stargateliquid=液态星际物质 +achievement.stargateliquid.desc=生产硅岩 achievement.tothelimit=寻求极限 achievement.tothelimit.desc=制作镅 -achievement.denseaspossible=尽可能致密 -achievement.denseaspossible.desc=制作0号元素 achievement.fullefficiency=满负荷效率 achievement.fullefficiency.desc=制造一台离子发电机Mk.III +achievement.upgrade5=升级你的线圈(Lv.5) +achievement.upgrade5.desc=制造一个硅岩线圈方块 +achievement.alienmetallurgy=异星冶金学 +achievement.alienmetallurgy.desc=冷却一块热硅岩合金锭 +achievement.over9000=超过9000！ +achievement.over9000.desc=制造一个硅岩合金线圈方块 +achievement.finalpreparations=最后的准备 +achievement.finalpreparations.desc=冷却一块热硅岩瑞亚锭 +achievement.denseaspossible=尽可能致密 +achievement.denseaspossible.desc=制作中子锭 +achievement.zpmage=能量模块 +achievement.zpmage.desc=制造一个能量模块 +achievement.uvage=能量簇 +achievement.uvage.desc=制造一个能量簇 achievement.whatnow=接下来呢? achievement.whatnow.desc=制作一个终极电池 + +achievement.gt.metaitem.01.32606=电动马达(LuV) +achievement.gt.metaitem.01.32606.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32607=电动马达(ZPM) +achievement.gt.metaitem.01.32607.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32608=电动马达(UV) +achievement.gt.metaitem.01.32608.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32596=电动马达(UHV) +achievement.gt.metaitem.01.32596.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32595=电动马达(UEV) +achievement.gt.metaitem.01.32595.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.metaitem.01.32615=电动泵(LuV) +achievement.gt.metaitem.01.32615.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32616=电动泵(ZPM) +achievement.gt.metaitem.01.32616.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32617=电动泵(UV) +achievement.gt.metaitem.01.32617.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32618=电动泵(UHV) +achievement.gt.metaitem.01.32618.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32619=电动泵(UEV) +achievement.gt.metaitem.01.32619.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.metaitem.01.32635=传送带(LuV) +achievement.gt.metaitem.01.32635.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32636=传送带(ZPM) +achievement.gt.metaitem.01.32636.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32637=传送带(UV) +achievement.gt.metaitem.01.32637.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32638=传送带(UHV) +achievement.gt.metaitem.01.32638.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32639=传送带(UEV) +achievement.gt.metaitem.01.32639.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.metaitem.01.32645=电动活塞(LuV) +achievement.gt.metaitem.01.32645.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32646=电动活塞(ZPM) +achievement.gt.metaitem.01.32646.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32647=电动活塞(UV) +achievement.gt.metaitem.01.32647.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32648=电动活塞(UHV) +achievement.gt.metaitem.01.32648.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32649=电动活塞(UEV) +achievement.gt.metaitem.01.32649.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.metaitem.01.32655=机械臂(LuV) +achievement.gt.metaitem.01.32655.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32656=机械臂(ZPM) +achievement.gt.metaitem.01.32656.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32657=机械臂(UV) +achievement.gt.metaitem.01.32657.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32658=机械臂(UHV) +achievement.gt.metaitem.01.32658.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32659=机械臂(UEV) +achievement.gt.metaitem.01.32659.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.metaitem.01.32675=力场发生器tier VI +achievement.gt.metaitem.01.32675.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32676=力场发生器tier VII +achievement.gt.metaitem.01.32676.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32677=力场发生器tier VIII +achievement.gt.metaitem.01.32677.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32678=力场发生器tier IX +achievement.gt.metaitem.01.32678.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32679=力场发生器tier X +achievement.gt.metaitem.01.32679.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.metaitem.01.32685=发射器(LuV) +achievement.gt.metaitem.01.32685.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32686=发射器(ZPM) +achievement.gt.metaitem.01.32686.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32687=发射器(UV) +achievement.gt.metaitem.01.32687.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32688=发射器(UHV) +achievement.gt.metaitem.01.32688.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32689=发射器(UEV) +achievement.gt.metaitem.01.32689.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.metaitem.01.32695=传感器(LuV) +achievement.gt.metaitem.01.32695.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32696=传感器(ZPM) +achievement.gt.metaitem.01.32696.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32697=传感器(UV) +achievement.gt.metaitem.01.32697.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32698=传感器(UHV) +achievement.gt.metaitem.01.32698.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32699=传感器(UEV) +achievement.gt.metaitem.01.32699.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.blockmachines.hatch.energy.tier.06=能源仓(LuV) +achievement.gt.blockmachines.hatch.energy.tier.06.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.energy.tier.07=能源仓(ZPM) +achievement.gt.blockmachines.hatch.energy.tier.07.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.energy.tier.08=能源仓(UV) +achievement.gt.blockmachines.hatch.energy.tier.08.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.energy.tier.09=能源仓(UHV) +achievement.gt.blockmachines.hatch.energy.tier.09.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.blockmachines.hatch.dynamo.tier.06=动力仓(LuV) +achievement.gt.blockmachines.hatch.dynamo.tier.06.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.dynamo.tier.07=动力仓(ZPM) +achievement.gt.blockmachines.hatch.dynamo.tier.07.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.dynamo.tier.08=动力仓(UV) +achievement.gt.blockmachines.hatch.dynamo.tier.08.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.dynamo.tier.09=动力仓(UHV) +achievement.gt.blockmachines.hatch.dynamo.tier.09.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.blockmachines.fusioncomputer.tier.06=核聚变反应堆控制电脑Mk I +achievement.gt.blockmachines.fusioncomputer.tier.06.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.fusioncomputer.tier.07=核聚变反应堆控制电脑Mk II +achievement.gt.blockmachines.fusioncomputer.tier.07.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.fusioncomputer.tier.08=核聚变反应堆控制电脑Mk III +achievement.gt.blockmachines.fusioncomputer.tier.08.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.metaitem.03.32072=神经元处理器 +achievement.gt.metaitem.03.32077.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.03.32077=生物处理器 +achievement.gt.metaitem.03.32072.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.03.32095=湿件主机 +achievement.gt.metaitem.03.32095.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.03.32099=生物处理器超级电脑 +achievement.gt.metaitem.03.32099.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.03.32120=生物主机 +achievement.gt.metaitem.03.32120.desc=捡起这个物品以在NEI内查看配方 + +achievement.item.NanoCircuit=纳米电路 +achievement.item.NanoCircuit.desc=捡起这个物品以在NEI内查看配方 +achievement.item.PikoCircuit=Piko电路 +achievement.item.PikoCircuit.desc=捡起这个物品以在NEI内查看配方 +achievement.item.QuantumCircuit=量子电路 +achievement.item.QuantumCircuit.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.blockmachines.multimachine.em.computer=量子计算机 +achievement.gt.blockmachines.multimachine.em.computer.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.multimachine.em.research=研究站 +achievement.gt.blockmachines.multimachine.em.research.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.multimachine.em.junction=粒子流枢纽 +achievement.gt.blockmachines.multimachine.em.junction.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.multimachine.em.mattertoem=物质量子化仪 +achievement.gt.blockmachines.multimachine.em.mattertoem.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.multimachine.em.emtomatter=物质反量子化仪 +achievement.gt.blockmachines.multimachine.em.emtomatter.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.multimachine.em.essentiatoem=源质量子化仪 +achievement.gt.blockmachines.multimachine.em.essentiatoem.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.multimachine.em.emtoessentia=源质反量子化仪 +achievement.gt.blockmachines.multimachine.em.emtoessentia.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.multimachine.em.scanner=元物质扫描仪 +achievement.gt.blockmachines.multimachine.em.scanner.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockcasingsTT.8=中空机械方块 +achievement.gt.blockcasingsTT.8.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockcasingsTT.7=分子线圈 +achievement.gt.blockcasingsTT.7.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.multimachine.em.infuser=能量注入仪 +achievement.gt.blockmachines.multimachine.em.infuser.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.blockmachines.hatch.holder.tier.09=物品固定容器 +achievement.gt.blockmachines.hatch.holder.tier.09.desc=捡起这个物品以在NEI内查看配方 + +achievement.item.StargateShieldingFoil=Stargate-Radiation-Containment-Plate +achievement.item.StargateShieldingFoil.desc=捡起这个物品以在NEI内查看配方 +achievement.item.StargateChevron=Stargate Chevron +achievement.item.StargateChevron.desc=捡起这个物品以在NEI内查看配方 +achievement.item.StargateFramePart=Stargate Frame Part +achievement.item.StargateFramePart.desc=捡起这个物品以在NEI内查看配方 + +achievement.gt.metaitem.01.32605=终极电池 +achievement.gt.metaitem.01.32605.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32609=真·终极电池 +achievement.gt.metaitem.01.32609.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32736=能量模块 +achievement.gt.metaitem.01.32736.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32737=能量簇 +achievement.gt.metaitem.01.32737.desc=捡起这个物品以在NEI内查看配方 +achievement.gt.metaitem.01.32599=兰波顿能量球簇 +achievement.gt.metaitem.01.32599.desc=捡起这个物品以在NEI内查看配方 + +achievement.ic2.itemArmorQuantumHelmet=量子头盔 +achievement.ic2.itemArmorQuantumHelmet.desc=捡起这个物品以在NEI内查看配方 +achievement.ic2.itemArmorQuantumChestplate=量子胸甲 +achievement.ic2.itemArmorQuantumChestplate.desc=捡起这个物品以在NEI内查看配方 +achievement.ic2.itemArmorQuantumLegs=量子护腿 +achievement.ic2.itemArmorQuantumLegs.desc=捡起这个物品以在NEI内查看配方 +achievement.ic2.itemArmorQuantumBoots=量子靴 +achievement.ic2.itemArmorQuantumBoots.desc=捡起这个物品以在NEI内查看配方 + +achievement.item.graviChestPlate=重力胸甲 +achievement.item.graviChestPlate.desc=捡起这个物品以在NEI内查看配方 + +for.bees.species.clay=黏土 +for.bees.species.slimeball=粘液球 +for.bees.species.peat=泥炭 +for.bees.species.stickyresin=粘性树脂 +for.bees.species.coal=煤 +for.bees.species.oil=原油 +for.bees.species.apatite=磷灰石 +for.bees.species.ash=灰烬 +for.bees.species.fertilizer=肥料 +for.bees.species.sandwich=三明治 +for.bees.species.coolant=冷却液 +for.bees.species.energy=能量 +for.bees.species.pyrotheum=烈焰之炽焱 +for.bees.species.cryotheum=极寒之凛冰 +for.bees.species.lapotron=兰波顿 +for.bees.species.redalloy=红色合金 +for.bees.species.redstonealloy=红石合金 +for.bees.species.conductiveiron=导电铁 +for.bees.species.vibrantalloy=脉冲合金 +for.bees.species.energeticalloy=充能合金 +for.bees.species.electricalsteel=磁钢 +for.bees.species.darksteel=玄钢 +for.bees.species.pulsatingiron=脉冲铁 +for.bees.species.stainlesssteel=不锈钢 +for.bees.species.enderium=末影(te) +for.bees.species.thaumiumdust=神秘尘 +for.bees.species.thaumiumshard=神秘碎片 +for.bees.species.amber=琥珀 +for.bees.species.quicksilver=水银 +for.bees.species.salismundus=世界盐 +for.bees.species.tainted=腐化 +for.bees.species.mithril=秘银 +for.bees.species.astralsilver=星辰银 +for.bees.species.thauminite=秘晶 +for.bees.species.shadowmetal=暗影金属 +for.bees.species.divided=不稳定金属 +for.bees.species.sparkeling=凋灵 +for.bees.species.redstone=红石 +for.bees.species.certus=塞特斯 +for.bees.species.fluix=氟 +for.bees.species.ruby=红宝石 +for.bees.species.lapis=青金石 +for.bees.species.sapphire=蓝宝石 +for.bees.species.diamond=钻石 +for.bees.species.olivine=橄榄石 +for.bees.species.emerald=绿宝石 +for.bees.species.redgarnet=红石榴石 +for.bees.species.yellowgarnet=黄石榴石 +for.bees.species.firestone=火石 +for.bees.species.copper=铜 +for.bees.species.tin=锡 +for.bees.species.lead=铅 +for.bees.species.iron=铁 +for.bees.species.steel=钢铁 +for.bees.species.nickel=镍 +for.bees.species.zinc=锌 +for.bees.species.silver=银 +for.bees.species.gold=金 +for.bees.species.sulfur=硫 +for.bees.species.gallium=镓 +for.bees.species.arsenic=砷 +for.bees.species.bauxite=铝土 +for.bees.species.aluminium=铝 +for.bees.species.titanium=钛 +for.bees.species.chrome=铬 +for.bees.species.manganese=锰 +for.bees.species.tungsten=钨 +for.bees.species.platinum=铂 +for.bees.species.iridium=铱 +for.bees.species.osmium=锇 +for.bees.species.lithium=锂 +for.bees.species.salty=盐 +for.bees.species.electrotine=蓝石 +for.bees.species.uranium=铀 +for.bees.species.plutonium=钚 +for.bees.species.naquadah=硅岩 +for.bees.species.naquadria=超能硅岩 +for.bees.species.dob=D-O-B +for.bees.species.thorium=钍 +for.bees.species.lutetium=镥 +for.bees.species.americium=镅 +for.bees.species.neutronium=中子素 +for.bees.species.naga=娜迦 +for.bees.species.lich=巫妖 +for.bees.species.hydra=九头蛇 +for.bees.species.urghast=暮色恶魂 +for.bees.species.snowqueen=冰雪女王 +for.bees.species.space=宇宙 +for.bees.species.meteoriciron=陨铁 +for.bees.species.desh=戴斯 +for.bees.species.ledox=深铅 +for.bees.species.callistoice=木卫四冰 +for.bees.species.mytryl=深空秘银 +for.bees.species.quantium=量子 +for.bees.species.oriharukon=山铜 +for.bees.species.mysteriouscrystal=神秘水晶 +for.bees.species.blackplutonium=黑钚 +for.bees.species.trinium=三元金属 +for.bees.species.mercury=水星 +for.bees.species.venus=金星 +for.bees.species.moon=月球 +for.bees.species.mars=火星 +for.bees.species.phobos=火卫一 +for.bees.species.deimos=火卫二 +for.bees.species.ceres=谷神星 +for.bees.species.jupiter=木星 +for.bees.species.io=木卫一 +for.bees.species.europa=木卫二 +for.bees.species.ganymede=木卫三 +for.bees.species.callisto=木卫四 +for.bees.species.saturn=土星 +for.bees.species.enceladus=土卫二 +for.bees.species.titan=土卫六 +for.bees.species.uranus=天王星 +for.bees.species.miranda=天卫五 +for.bees.species.oberon=天卫四 +for.bees.species.neptune=海王星 +for.bees.species.proteus=海卫八 +for.bees.species.triton=海卫一 +for.bees.species.pluto=冥王星 +for.bees.species.haumea=妊神星 +for.bees.species.makemake=鸟神星 +for.bees.species.centauri=人马座 +for.bees.species.acentauri=人马座a +for.bees.species.tceti=鲸鱼座T星 +for.bees.species.tcetie=鲸鱼座T星E +for.bees.species.barnarda=巴纳德 +for.bees.species.barnardac=巴纳德C +for.bees.species.barnardae=巴纳德E +for.bees.species.barnardaf=巴纳德F +for.bees.species.vega=织女座 +for.bees.species.vegab=织女B +for.bees.species.cosmicneutronium=宇宙中子素 +for.bees.species.infinitycatalyst=无尽催化剂 +for.bees.species.infinity=无尽 + +for.mutation.condition.biomeid=需要生物群系 +for.mutation.condition.dim=需要维度(世界) + +itemGroup.GTtools=Prebuild Tools -- cgit From 36f45528f2025e9e7f52fc806626034c45e3712d Mon Sep 17 00:00:00 2001 From: Dimach Date: Sun, 9 Dec 2018 18:39:06 +0300 Subject: cherry pick 0beea9037cd8ff7a899c14c53d6b9a381c22f42c Add volumetric flask. (#1500) --- src/main/java/gregtech/api/enums/ItemList.java | 3 +- src/main/java/gregtech/common/GT_Client.java | 1 + src/main/java/gregtech/common/GT_Network.java | 5 + src/main/java/gregtech/common/GT_Proxy.java | 9 +- .../common/gui/GT_ContainerVolumetricFlask.java | 20 ++ .../common/gui/GT_GUIContainerVolumetricFlask.java | 222 ++++++++++++++++ .../gregtech/common/items/GT_VolumetricFlask.java | 290 +++++++++++++++++++++ .../common/net/MessageSetFlaskCapacity.java | 42 +++ .../gregtech/common/render/GT_FlaskRenderer.java | 89 +++++++ .../loaders/postload/GT_CraftingRecipeLoader.java | 3 + .../preload/GT_Loader_Item_Block_And_Fluid.java | 2 + .../gregtech/textures/gui/VolumetricFlask.png | Bin 0 -> 663 bytes .../textures/items/gt.Volumetric_Flask.png | Bin 0 -> 1041 bytes .../textures/items/gt.Volumetric_Flask.window.png | Bin 0 -> 409 bytes 14 files changed, 683 insertions(+), 3 deletions(-) create mode 100644 src/main/java/gregtech/common/gui/GT_ContainerVolumetricFlask.java create mode 100644 src/main/java/gregtech/common/gui/GT_GUIContainerVolumetricFlask.java create mode 100644 src/main/java/gregtech/common/items/GT_VolumetricFlask.java create mode 100644 src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java create mode 100644 src/main/java/gregtech/common/render/GT_FlaskRenderer.java create mode 100644 src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 12db03e068..5b25e5a3d2 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -686,7 +686,8 @@ public enum ItemList implements IItemContainer { Machine_LV_CircuitAssembler, Machine_MV_CircuitAssembler, Machine_HV_CircuitAssembler, Machine_EV_CircuitAssembler, Machine_IV_CircuitAssembler, Machine_LuV_CircuitAssembler, Machine_ZPM_CircuitAssembler, Machine_UV_CircuitAssembler, Circuit_Integrated_Good, Machine_IV_LightningRod, Machine_HV_LightningRod, Machine_EV_LightningRod, ULV_Coil, LV_Coil, MV_Coil, HV_Coil, EV_Coil, IV_Coil, LuV_Coil, ZPM_Coil, UV_Coil, UHV_Coil, Depleted_MNq_1, Depleted_MNq_2, Depleted_MNq_4, - MNqCell_1, MNqCell_2, MNqCell_4,; + MNqCell_1, MNqCell_2, MNqCell_4, + VOLUMETRIC_FLASK; public static final ItemList[] DYE_ONLY_ITEMS = {Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15}, SPRAY_CAN_DYES = {Spray_Color_00, Spray_Color_01, Spray_Color_02, Spray_Color_03, Spray_Color_04, Spray_Color_05, Spray_Color_06, Spray_Color_07, Spray_Color_08, Spray_Color_09, Spray_Color_10, Spray_Color_11, Spray_Color_12, Spray_Color_13, Spray_Color_14, Spray_Color_15}, SPRAY_CAN_DYES_USED = {Spray_Color_Used_00, Spray_Color_Used_01, Spray_Color_Used_02, Spray_Color_Used_03, Spray_Color_Used_04, Spray_Color_Used_05, Spray_Color_Used_06, Spray_Color_Used_07, Spray_Color_Used_08, Spray_Color_Used_09, Spray_Color_Used_10, Spray_Color_Used_11, Spray_Color_Used_12, Spray_Color_Used_13, Spray_Color_Used_14, Spray_Color_Used_15}, TRANSFORMERS = {Transformer_LV_ULV, Transformer_MV_LV, Transformer_HV_MV, Transformer_EV_HV, Transformer_IV_EV, Transformer_LuV_IV, Transformer_ZPM_LuV, Transformer_UV_ZPM, Transformer_MAX_UV}, MACHINE_HULLS = {Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, Hull_MAX}, HATCHES_DYNAMO = {Hatch_Dynamo_ULV, Hatch_Dynamo_LV, Hatch_Dynamo_MV, Hatch_Dynamo_HV, Hatch_Dynamo_EV, Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_MAX}, HATCHES_ENERGY = {Hatch_Energy_ULV, Hatch_Energy_LV, Hatch_Energy_MV, Hatch_Energy_HV, Hatch_Energy_EV, Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_MAX}, HATCHES_INPUT = {Hatch_Input_ULV, Hatch_Input_LV, Hatch_Input_MV, Hatch_Input_HV, Hatch_Input_EV, Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_MAX}, HATCHES_INPUT_BUS = {Hatch_Input_Bus_ULV, Hatch_Input_Bus_LV, Hatch_Input_Bus_MV, Hatch_Input_Bus_HV, Hatch_Input_Bus_EV, Hatch_Input_Bus_IV, Hatch_Input_Bus_LuV, Hatch_Input_Bus_ZPM, Hatch_Input_Bus_UV, Hatch_Input_Bus_MAX}, HATCHES_OUTPUT = {Hatch_Output_ULV, Hatch_Output_LV, Hatch_Output_MV, Hatch_Output_HV, Hatch_Output_EV, Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_MAX}, HATCHES_OUTPUT_BUS = {Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, Hatch_Output_Bus_MV, Hatch_Output_Bus_HV, Hatch_Output_Bus_EV, Hatch_Output_Bus_IV, Hatch_Output_Bus_LuV, Hatch_Output_Bus_ZPM, Hatch_Output_Bus_UV, Hatch_Output_Bus_MAX}, HATCHES_MUFFLER = {Hatch_Muffler_LV, Hatch_Muffler_LV, Hatch_Muffler_MV, Hatch_Muffler_HV, Hatch_Muffler_EV, Hatch_Muffler_IV, Hatch_Muffler_LuV, Hatch_Muffler_ZPM, Hatch_Muffler_UV, Hatch_Muffler_MAX}; public static Fluid sOilExtraHeavy, sEpichlorhydrin, sDrillingFluid, sNitricAcid, sBlueVitriol, sNickelSulfate, sToluene, sNitrationMixture, sRocketFuel, sHydricSulfur, sIndiumConcentrate, sLeadZincSolution, sHydrochloricAcid; diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index 272a6bfa6e..1345042b45 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -308,6 +308,7 @@ public class GT_Client extends GT_Proxy new GT_MetaGenerated_Tool_Renderer(); new GT_Renderer_Entity_Arrow(GT_Entity_Arrow.class, "arrow"); new GT_Renderer_Entity_Arrow(GT_Entity_Arrow_Potion.class, "arrow_potions"); + new GT_FlaskRenderer(); } public void onPostLoad() { diff --git a/src/main/java/gregtech/common/GT_Network.java b/src/main/java/gregtech/common/GT_Network.java index 1371b6485c..79c13156d7 100644 --- a/src/main/java/gregtech/common/GT_Network.java +++ b/src/main/java/gregtech/common/GT_Network.java @@ -6,10 +6,12 @@ import cpw.mods.fml.common.network.FMLEmbeddedChannel; import cpw.mods.fml.common.network.FMLOutboundHandler; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; import gregtech.api.enums.GT_Values; import gregtech.api.net.*; import gregtech.common.blocks.GT_Packet_Ores; +import gregtech.common.net.MessageSetFlaskCapacity; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -31,8 +33,11 @@ public class GT_Network implements IGT_NetworkHandler { private final EnumMap mChannel; private final GT_Packet[] mSubChannels; + public final SimpleNetworkWrapper networkWrapper; public GT_Network() { + networkWrapper = NetworkRegistry.INSTANCE.newSimpleChannel("gregtech_network_wrapper"); + networkWrapper.registerMessage(MessageSetFlaskCapacity.Handler.class, MessageSetFlaskCapacity.class, 0, Side.SERVER); this.mChannel = NetworkRegistry.INSTANCE.newChannel("GregTech", new ChannelHandler[]{this, new HandlerShared()}); this.mSubChannels = new GT_Packet[]{new GT_Packet_TileEntity(), new GT_Packet_Sound(), new GT_Packet_Block_Event(), new GT_Packet_Ores(), new GT_Packet_Pollution()}; } diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index bf79b49133..2486d4d241 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -26,6 +26,7 @@ import gregtech.api.net.GT_Packet_Pollution; import gregtech.api.objects.*; import gregtech.api.util.*; import gregtech.common.entities.GT_Entity_Arrow; +import gregtech.common.gui.GT_ContainerVolumetricFlask; import gregtech.common.items.GT_MetaGenerated_Tool_01; import gregtech.common.items.armor.ModularArmor_Item; import gregtech.common.items.armor.gui.*; @@ -1461,7 +1462,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { return new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())); case 2: return new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())); - default: + case 10: + return new GT_ContainerVolumetricFlask(aPlayer.inventory); + default: return getRightItem(aPlayer, ID); } } @@ -1475,7 +1478,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { return new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getEquipmentInSlot(tSlot))); case 2: return new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getEquipmentInSlot(tSlot))); - default: + case 10: + return new GT_ContainerVolumetricFlask(aPlayer.inventory); + default: return getRightItem(aPlayer, ID); } } diff --git a/src/main/java/gregtech/common/gui/GT_ContainerVolumetricFlask.java b/src/main/java/gregtech/common/gui/GT_ContainerVolumetricFlask.java new file mode 100644 index 0000000000..2f8fd2a356 --- /dev/null +++ b/src/main/java/gregtech/common/gui/GT_ContainerVolumetricFlask.java @@ -0,0 +1,20 @@ +package gregtech.common.gui; + +import gregtech.common.items.GT_VolumetricFlask; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; + +public final class GT_ContainerVolumetricFlask extends Container { + ItemStack flask; + + public GT_ContainerVolumetricFlask(InventoryPlayer inventoryPlayer) { + flask = inventoryPlayer.getCurrentItem(); + } + + @Override + public boolean canInteractWith(EntityPlayer p) { + return (flask != null) && (flask.stackSize > 0) && ((flask.getItem() instanceof GT_VolumetricFlask)); + } +} diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainerVolumetricFlask.java b/src/main/java/gregtech/common/gui/GT_GUIContainerVolumetricFlask.java new file mode 100644 index 0000000000..65b0676534 --- /dev/null +++ b/src/main/java/gregtech/common/gui/GT_GUIContainerVolumetricFlask.java @@ -0,0 +1,222 @@ +package gregtech.common.gui; + + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.GT_Values; +import gregtech.common.GT_Network; +import gregtech.common.items.GT_VolumetricFlask; +import gregtech.common.net.MessageSetFlaskCapacity; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + +import java.text.DecimalFormat; +import java.text.ParseException; + +@SideOnly(Side.CLIENT) +public final class GT_GUIContainerVolumetricFlask extends GuiContainer { + private static final ResourceLocation BACKGROUND = new ResourceLocation("gregtech:textures/gui/VolumetricFlask.png"); + + private GuiIntegerBox amount; + private GuiButton apply; + private GuiButton plus1; + private GuiButton plus10; + private GuiButton plus100; + private GuiButton plus1000; + private GuiButton minus1; + private GuiButton minus10; + private GuiButton minus100; + private GuiButton minus1000; + private GT_ContainerVolumetricFlask container; + + public GT_GUIContainerVolumetricFlask(GT_ContainerVolumetricFlask container) { + super(container); + this.container = container; + } + + public void initGui() { + super.initGui(); + + buttonList.add(plus1 = new GuiButton(0, guiLeft + 20, guiTop + 26, 22, 20, "+1")); + buttonList.add(plus10 = new GuiButton(0, guiLeft + 48, guiTop + 26, 28, 20, "+10")); + buttonList.add(plus100 = new GuiButton(0, guiLeft + 82, guiTop + 26, 32, 20, "+100")); + buttonList.add(plus1000 = new GuiButton(0, guiLeft + 120, guiTop + 26, 38, 20, "+1000")); + + buttonList.add(minus1 = new GuiButton(0, guiLeft + 20, guiTop + 75, 22, 20, "-1")); + buttonList.add(minus10 = new GuiButton(0, guiLeft + 48, guiTop + 75, 28, 20, "-10")); + buttonList.add(minus100 = new GuiButton(0, guiLeft + 82, guiTop + 75, 32, 20, "-100")); + buttonList.add(minus1000 = new GuiButton(0, guiLeft + 120, guiTop + 75, 38, 20, "-1000")); + + buttonList.add(apply = new GuiButton(0, guiLeft + 128, guiTop + 51, 38, 20, "Accept")); + + amount = new GuiIntegerBox(fontRendererObj, guiLeft + 62, guiTop + 57, 59, fontRendererObj.FONT_HEIGHT, ((GT_VolumetricFlask) container.flask.getItem()).getMaxCapacity()); + amount.setEnableBackgroundDrawing(false); + amount.setMaxStringLength(16); + amount.setTextColor(16777215); + amount.setVisible(true); + amount.setFocused(true); + amount.setText("1"); + System.out.println(((GT_VolumetricFlask) container.flask.getItem()).getCapacity(container.flask)); + amount.setText(String.valueOf(((GT_VolumetricFlask) container.flask.getItem()).getCapacity(container.flask))); + } + + + protected final void drawGuiContainerBackgroundLayer(float f, int x, int y) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + mc.getTextureManager().bindTexture(BACKGROUND); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + + try { + Long.parseLong(amount.getText()); + apply.enabled = (amount.getText().length() > 0); + } catch (NumberFormatException e) { + apply.enabled = false; + } + + amount.drawTextBox(); + } + + + protected void keyTyped(char character, int key) { + if (!checkHotbarKeys(key)) { + if (key == 28) + actionPerformed(apply); + if (((key == 211) || (key == 205) || (key == 203) || (key == 14) || (character == '-') || (Character.isDigit(character))) && (amount.textboxKeyTyped(character, key))) { + try { + String out = amount.getText(); + boolean fixed = false; + while ((out.startsWith("0")) && (out.length() > 1)) { + out = out.substring(1); + fixed = true; + } + if (fixed) { + amount.setText(out); + } + if (out.isEmpty()) { + out = "0"; + } + long result = Long.parseLong(out); + if (result < 0L) { + amount.setText("1"); + } + + } catch (NumberFormatException localNumberFormatException) { + } + } else { + super.keyTyped(character, key); + } + } + } + + protected void actionPerformed(GuiButton btn) { + try { + if (btn == apply) { + ((GT_Network) GT_Values.NW).networkWrapper.sendToServer(new MessageSetFlaskCapacity(Integer.parseInt(amount.getText()))); + mc.thePlayer.closeScreen(); + } + + } catch (NumberFormatException e) { + amount.setText("1"); + } + + boolean isPlus = (btn == plus1) || (btn == plus10) || (btn == plus100) || (btn == plus1000); + boolean isMinus = (btn == minus1) || (btn == minus10) || (btn == minus100) || (btn == minus1000); + + if ((isPlus) || (isMinus)) { + addQty(getQty(btn)); + } + } + + private void addQty(int i) { + try { + String out = amount.getText(); + + boolean fixed = false; + while ((out.startsWith("0")) && (out.length() > 1)) { + out = out.substring(1); + fixed = true; + } + + if (fixed) { + amount.setText(out); + } + if (out.isEmpty()) { + out = "0"; + } + long result = Integer.parseInt(out); + + if ((result == 1L) && (i > 1)) { + result = 0L; + } + result += i; + if (result < 1L) { + result = 1L; + } + out = Long.toString(result); + Integer.parseInt(out); + amount.setText(out); + } catch (NumberFormatException localNumberFormatException) { + } + } + + + protected int getQty(GuiButton btn) { + try { + DecimalFormat df = new DecimalFormat("+#;-#"); + return df.parse(btn.displayString).intValue(); + } catch (ParseException e) { + } + + return 0; + } + + public class GuiIntegerBox extends GuiTextField { + private final int maxValue; + + public GuiIntegerBox(FontRenderer fontRenderer, int x, int y, int width, int height) { + this(fontRenderer, x, y, width, height, Integer.MAX_VALUE); + } + + public GuiIntegerBox(FontRenderer fontRenderer, int x, int y, int width, int height, int maxValue) { + super(fontRenderer, x, y, width, height); + this.maxValue = maxValue; + } + + + public void writeText(String selectedText) { + String original = getText(); + super.writeText(selectedText); + + try { + int i = Integer.parseInt(getText()); + if (i > maxValue) { + setText(String.valueOf(maxValue)); + } else if (i < 0) { + setText("0"); + } + } catch (NumberFormatException e) { + setText(original); + } + } + + + public void setText(String s) { + try { + int i = Integer.parseInt(s); + if (i > maxValue) { + s = String.valueOf(maxValue); + } else if (i < 0) { + s = "0"; + } + } catch (NumberFormatException e) { + s = String.valueOf(maxValue); + } + super.setText(s); + } + } + +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java new file mode 100644 index 0000000000..a247b09df9 --- /dev/null +++ b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java @@ -0,0 +1,290 @@ + +package gregtech.common.items; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.GT_Values; +import gregtech.api.items.GT_Generic_Item; +import ic2.core.util.LiquidUtil; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.MovingObjectPosition.MovingObjectType; +import net.minecraft.world.World; +import net.minecraftforge.common.util.FakePlayer; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.*; + +import java.util.List; + +import static gregtech.api.enums.GT_Values.RES_PATH_ITEM; +import static ic2.core.util.LiquidUtil.*; + + +public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContainerItem { + private final int maxCapacity; + @SideOnly(Side.CLIENT) + public IIcon iconWindow; + + public GT_VolumetricFlask(String unlocalized, String english, int maxCapacity) { + super(unlocalized, english, null); + this.maxCapacity = maxCapacity; + setMaxStackSize(16); + setNoRepair(); + if (Loader.isModLoaded("NotEnoughItems")) { + for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { + if (fluid != null) { + ItemStack stack = new ItemStack(this); + setCapacity(stack, getMaxCapacity()); + fill(stack, new FluidStack(fluid, Integer.MAX_VALUE), true); + codechicken.nei.api.API.hideItem(stack); + } + } + } + } + + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (!world.isRemote && isEmpty(stack) && getMovingObjectPositionFromPlayer(world, player, true) == null) + player.openGui(GT_Values.GT, 1010, world, 0, 0, 0); + return super.onItemRightClick(stack, world, player); + } + + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) { + if (player instanceof FakePlayer) { + return false; + } + if (world.isRemote) + return false; + if (interactWithTank(stack, player, world, x, y, z, side)) { + return true; + } + MovingObjectPosition mop = getMovingObjectPositionFromPlayer(world, player, true); + if (mop == null) { + return false; + } + if (mop.typeOfHit == MovingObjectType.BLOCK) { + x = mop.blockX; + y = mop.blockY; + z = mop.blockZ; + if (!world.canMineBlock(player, x, y, z) || !player.canPlayerEdit(x, y, z, mop.sideHit, stack)) { + return false; + } + if (collectFluidBlock(stack, player, world, x, y, z)) { + return true; + } + ForgeDirection dir = ForgeDirection.VALID_DIRECTIONS[mop.sideHit]; + FluidStack fluidStack = drainContainerStack(stack, player, 1000, true); + if (placeFluid(fluidStack, world, x, y, z) || (player.canPlayerEdit(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, mop.sideHit, stack) && placeFluid(fluidStack, world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ))) { + if (!player.capabilities.isCreativeMode) + drainContainerStack(stack, player, 1000, false); + return true; + } + } + return false; + } + + public boolean isEmpty(ItemStack stack) { + return getFluid(stack) == null; + } + + public int getFreeSpace(ItemStack stack) { + int capacity = getCapacity(stack); + if (capacity > 0) { + FluidStack fluidStack = getFluid(stack); + return fluidStack == null ? capacity : capacity - fluidStack.amount; + } + return 0; + } + + public int getMaxCapacity() { + return this.maxCapacity; + } + + public int getCapacity(ItemStack stack) { + int capacity = 1000; + if (stack.hasTagCompound()) { + NBTTagCompound nbt = stack.getTagCompound(); + if (nbt.hasKey("Capacity", 3)) + capacity = nbt.getInteger("Capacity"); + } + return Math.min(getMaxCapacity(), capacity); + } + + @Override + public void registerIcons(IIconRegister aIconRegister) { + super.registerIcons(aIconRegister); + iconWindow = aIconRegister.registerIcon(RES_PATH_ITEM + "gt.Volumetric_Flask.window"); + } + + public void setCapacity(ItemStack stack, int capacity) { + capacity = Math.min(capacity, getMaxCapacity()); + NBTTagCompound nbt = stack.getTagCompound(); + if (nbt == null) { + stack.setTagCompound(nbt = new NBTTagCompound()); + } + nbt.setInteger("Capacity", capacity); + } + + public FluidStack getFluid(ItemStack stack) { + if (stack.hasTagCompound()) { + NBTTagCompound nbt = stack.getTagCompound(); + if (nbt.hasKey("Fluid", 10)) + return FluidStack.loadFluidStackFromNBT(nbt.getCompoundTag("Fluid")); + } + return null; + } + + public void setFluid(ItemStack stack, FluidStack fluidStack) { + boolean removeFluid = (fluidStack == null) || (fluidStack.amount <= 0); + NBTTagCompound nbt = stack.getTagCompound(); + if (nbt == null) { + if (removeFluid) + return; + stack.setTagCompound(nbt = new NBTTagCompound()); + } + if (removeFluid) { + nbt.removeTag("Fluid"); + if (nbt.hasNoTags()) { + stack.setTagCompound(null); + } + } else { + nbt.setTag("Fluid", fluidStack.writeToNBT(new NBTTagCompound())); + } + } + + public int fill(ItemStack stack, FluidStack resource, boolean doFill) { + if (stack.stackSize != 1) + return 0; + if ((resource == null) || (resource.amount <= 0)) { + return 0; + } + FluidStack fluidStack = getFluid(stack); + if (fluidStack == null) { + fluidStack = new FluidStack(resource, 0); + } else if (!fluidStack.isFluidEqual(resource)) { + return 0; + } + int amount = Math.min(getCapacity(stack) - fluidStack.amount, resource.amount); + if ((doFill) && (amount > 0)) { + fluidStack.amount += amount; + setFluid(stack, fluidStack); + } + return amount; + } + + public FluidStack drain(ItemStack stack, int maxDrain, boolean doDrain) { + if (stack.stackSize != 1) + return null; + FluidStack fluidStack = getFluid(stack); + if (fluidStack == null) + return null; + maxDrain = Math.min(fluidStack.amount, maxDrain); + if (doDrain) { + fluidStack.amount -= maxDrain; + setFluid(stack, fluidStack); + } + return new FluidStack(fluidStack, maxDrain); + } + + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List info, boolean b) { + super.addInformation(stack, player, info, b); + FluidStack fs = getFluid(stack); + if (fs != null) { + info.add(String.format("< %s, %d mB >", FluidRegistry.getFluidName(fs), fs.amount)); + } else { + info.add(String.format("< Empty, %d mB >", getCapacity(stack))); + } + info.add("Rightclick on air to set volume (only while empty)"); + } + + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs creativeTabs, List itemList) { + itemList.add(new ItemStack(this)); + for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { + if (fluid != null) { + ItemStack stack = new ItemStack(this); + setCapacity(stack, getMaxCapacity()); + fill(stack, new FluidStack(fluid, Integer.MAX_VALUE), true); + itemList.add(stack); + } + } + } + + private boolean interactWithTank(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side) { + if (world.isRemote) { + return false; + } + TileEntity te = world.getTileEntity(x, y, z); + if (!(te instanceof IFluidHandler)) { + return false; + } + IFluidHandler handler = (IFluidHandler) te; + ForgeDirection dir = ForgeDirection.getOrientation(side); + FluidStack fs = this.getFluid(stack); + int capacity = getCapacity(stack); + if (fs != null && (!player.isSneaking() || fs.amount >= capacity)) { + int amount = handler.fill(dir, fs, false); + if (amount > 0) { + fs = LiquidUtil.drainContainerStack(stack, player, amount, false); + if (fs != null && fs.amount > 0) { + handler.fill(dir, fs, true); + } + } + } else { + int amount = fs == null ? capacity : capacity - fs.amount; + FluidStack input = handler.drain(dir, amount, false); + if (input != null && input.amount > 0) { + amount = LiquidUtil.fillContainerStack(stack, player, input, false); + if (amount > 0) { + handler.drain(dir, amount, true); + } + } + } + return true; + } + + private boolean collectFluidBlock(ItemStack stack, EntityPlayer player, World world, int x, int y, int z) { + Block block = world.getBlock(x, y, z); + if (block instanceof IFluidBlock) { + IFluidBlock liquid = (IFluidBlock) block; + if (liquid.canDrain(world, x, y, z)) { + FluidStack fluid = liquid.drain(world, x, y, z, false); + int amount = fillContainerStack(stack, player, fluid, true); + if (amount == fluid.amount) { + fillContainerStack(stack, player, fluid, false); + liquid.drain(world, x, y, z, true); + return true; + } + } + } else if (world.getBlockMetadata(x, y, z) == 0) { + FluidStack fluid = null; + if (block != Blocks.water && block != Blocks.flowing_water) { + if (block == Blocks.lava || block == Blocks.flowing_lava) { + fluid = new FluidStack(FluidRegistry.LAVA, 1000); + } + } else { + fluid = new FluidStack(FluidRegistry.WATER, 1000); + } + + if (fluid != null) { + int amount = fillContainerStack(stack, player, fluid, true); + if (amount == fluid.amount) { + fillContainerStack(stack, player, fluid, false); + world.setBlockToAir(x, y, z); + return true; + } + } + } + return false; + } +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java b/src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java new file mode 100644 index 0000000000..c20b4002c3 --- /dev/null +++ b/src/main/java/gregtech/common/net/MessageSetFlaskCapacity.java @@ -0,0 +1,42 @@ +package gregtech.common.net; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import gregtech.common.items.GT_VolumetricFlask; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public final class MessageSetFlaskCapacity implements IMessage { + private int capacity; + + public MessageSetFlaskCapacity() { + } + + public MessageSetFlaskCapacity(int capacity) { + this.capacity = capacity; + } + + + public void fromBytes(ByteBuf buf) { + this.capacity = buf.readInt(); + } + + public void toBytes(ByteBuf buf) { + buf.writeInt(this.capacity); + } + + public static final class Handler + implements IMessageHandler { + public IMessage onMessage(MessageSetFlaskCapacity message, MessageContext ctx) { + ItemStack stack = ctx.getServerHandler().playerEntity.getHeldItem(); + if ((stack != null) && (stack.stackSize > 0)) { + Item item = stack.getItem(); + if ((item instanceof GT_VolumetricFlask)) + ((GT_VolumetricFlask) item).setCapacity(stack, message.capacity); + } + return null; + } + } +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/render/GT_FlaskRenderer.java b/src/main/java/gregtech/common/render/GT_FlaskRenderer.java new file mode 100644 index 0000000000..8b1f505314 --- /dev/null +++ b/src/main/java/gregtech/common/render/GT_FlaskRenderer.java @@ -0,0 +1,89 @@ +package gregtech.common.render; + +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.ItemList; +import gregtech.common.items.GT_VolumetricFlask; +import ic2.core.util.DrawUtil; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.opengl.GL11; + +@SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) +public final class GT_FlaskRenderer implements net.minecraftforge.client.IItemRenderer { + public GT_FlaskRenderer() { + MinecraftForgeClient.registerItemRenderer(ItemList.VOLUMETRIC_FLASK.getItem(), this); + } + + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return type != ItemRenderType.FIRST_PERSON_MAP; + } + + + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, IItemRenderer.ItemRendererHelper helper) { + return type == ItemRenderType.ENTITY; + } + + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + GT_VolumetricFlask cell = (GT_VolumetricFlask) item.getItem(); + IIcon icon = item.getIconIndex(); + GL11.glEnable(3042); + GL11.glEnable(3008); + if (type.equals(ItemRenderType.ENTITY)) { + GL11.glRotated(180.0D, 0.0D, 0.0D, 1.0D); + GL11.glRotated(90.0D, 0.0D, 1.0D, 0.0D); + GL11.glTranslated(-0.5D, -0.6D, 0.0D); + } else if (type.equals(ItemRenderType.EQUIPPED_FIRST_PERSON)) { + GL11.glTranslated(1.0D, 1.0D, 0.0D); + GL11.glRotated(180.0D, 0.0D, 0.0D, 1.0D); + } else if (type.equals(ItemRenderType.EQUIPPED)) { + GL11.glRotated(180.0D, 0.0D, 0.0D, 1.0D); + GL11.glTranslated(-1.0D, -1.0D, 0.0D); + } + + FluidStack fs = cell.getFluid(item); + if (fs != null) { + IIcon iconWindow = cell.iconWindow; + IIcon fluidicon = fs.getFluid().getIcon(fs); + int fluidColor = fs.getFluid().getColor(fs); + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + GL11.glBlendFunc(0, 1); + if (type.equals(ItemRenderType.INVENTORY)) { + DrawUtil.renderIcon(iconWindow, 16.0D, 0.0D, 0.0F, 0.0F, -1.0F); + } else { + DrawUtil.renderIcon(iconWindow, 1.0D, -0.001D, 0.0F, 0.0F, 1.0F); + DrawUtil.renderIcon(iconWindow, 1.0D, -0.0615D, 0.0F, 0.0F, -1.0F); + } + + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + GL11.glBlendFunc(770, 771); + GL11.glDepthFunc(514); + GL11.glColor3ub((byte) (fluidColor >> 16), (byte) (fluidColor >> 8), (byte) fluidColor); + if (type.equals(ItemRenderType.INVENTORY)) { + DrawUtil.renderIcon(fluidicon, 16.0D, 0.0D, 0.0F, 0.0F, -1.0F); + } else { + DrawUtil.renderIcon(fluidicon, 1.0D, -0.001D, 0.0F, 0.0F, 1.0F); + DrawUtil.renderIcon(fluidicon, 1.0D, -0.0615D, 0.0F, 0.0F, -1.0F); + } + + GL11.glColor3ub((byte) -1, (byte) -1, (byte) -1); + GL11.glDepthFunc(515); + } + + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); + GL11.glBlendFunc(770, 771); + if (type.equals(ItemRenderType.INVENTORY)) { + DrawUtil.renderIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); + } else { + ItemRenderer.renderItemIn2D(Tessellator.instance, icon.getMaxU(), icon.getMinV(), icon.getMinU(), icon.getMaxV(), icon.getIconWidth(), icon.getIconHeight(), 0.0625F); + } + GL11.glDisable(3008); + GL11.glDisable(3042); + } +} \ No newline at end of file diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index d172e95115..7946381981 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -12,6 +12,8 @@ import ic2.core.Ic2Items; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; public class GT_CraftingRecipeLoader implements Runnable { private final static String aTextIron1 = "X X"; @@ -839,5 +841,6 @@ public class GT_CraftingRecipeLoader implements Runnable { } GT_ModHandler.addShapelessCraftingRecipe(Materials.Fireclay.getDust(2), new Object[]{Materials.Brick.getDust(1), Materials.Clay.getDust(1)}); + GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ball.get(0), new FluidStack(FluidRegistry.getFluid("molten.borosilicateglass"), 144), ItemList.VOLUMETRIC_FLASK.get(1), 44, 24); } } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 2023253eec..28968ef537 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -83,6 +83,8 @@ public class GT_Loader_Item_Block_And_Fluid ItemList.Rotor_EV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L)); ItemList.Rotor_IV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1L)); + ItemList.VOLUMETRIC_FLASK.set(new GT_VolumetricFlask("Volumetric_Flask", "Volumetric flask", 1000)); + Item tItem = (Item) GT_Utility.callConstructor("gregtech.common.items.GT_SensorCard_Item", 0, null, false, new Object[]{"sensorcard", "GregTech Sensor Card"}); ItemList.NC_SensorCard.set(tItem == null ? new GT_Generic_Item("sensorcard", "GregTech Sensor Card", "Nuclear Control not installed", false) : tItem); diff --git a/src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png b/src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png new file mode 100644 index 0000000000..59004127eb Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.png new file mode 100644 index 0000000000..3923f6c2fb Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png new file mode 100644 index 0000000000..567eccb544 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png differ -- cgit From 480408a7bfb63c176242172bab61a804105b440d Mon Sep 17 00:00:00 2001 From: YoungGT Date: Mon, 10 Dec 2018 07:16:02 +0800 Subject: cherry pick cd841ad39edfef8c4f32096416b0c68b98ccc96e Fix #1439 and #1456 (#1503) * Fix #1439 * Fix #1456 * mistake --- src/main/java/gregtech/api/enums/Materials.java | 28 +++++++++++----------- .../common/items/GT_MetaGenerated_Item_01.java | 4 ++-- src/main/java/gregtech/common/items/ItemComb.java | 2 +- .../loaders/oreprocessing/ProcessingItem.java | 2 +- .../oreprocessing/ProcessingOreSmelting.java | 5 +++- .../loaders/postload/GT_CraftingRecipeLoader.java | 4 ++-- .../loaders/postload/GT_MachineRecipeLoader.java | 22 ++++++++--------- .../loaders/postload/GT_Worldgenloader.java | 2 +- .../preload/GT_Loader_Item_Block_And_Fluid.java | 2 +- src/main/resources/assets/gregtech/lang/en_US.lang | 4 ++-- src/main/resources/assets/gregtech/lang/zh_CN.lang | 4 ++-- 11 files changed, 41 insertions(+), 38 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index ebcc27322c..1c25b5eb00 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -93,7 +93,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Osmium = new Materials( 83, TextureSet.SET_METALLIC , 16.0F, 1280, 4, 1|2 |8 |32|64|128 , 50, 50, 255, 0, "Osmium" , "Osmium" , 0, 0, 3306, 4500, true, false, 10, 1, 1, Dyes.dyeBlue , Element.Os , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.MACHINA, 1), new TC_AspectStack(TC_Aspects.NEBRISUM, 1))).disableAutoGeneratedBlastFurnaceRecipes(); public static Materials Oxygen = new Materials( 13, TextureSet.SET_FLUID , 1.0F, 0, 2, 16|32 , 0, 100, 200, 240, "Oxygen" , "Oxygen" , 0, 0, 54, 0, false, true, 1, 1, 1, Dyes.dyeWhite , Element.O , Arrays.asList(new TC_AspectStack(TC_Aspects.AER, 1))); public static Materials Palladium = new Materials( 52, TextureSet.SET_SHINY , 8.0F, 512, 4, 1|2 |8 |32|64|128 , 128, 128, 128, 0, "Palladium" , "Palladium" , 0, 0, 1828, 1828, true, false, 4, 1, 1, Dyes.dyeGray , Element.Pd , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 3))); - public static Materials Phosphor = new Materials( 21, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 |32 , 255, 255, 0, 0, "Phosphor" , "Phosphor" , 0, 0, 317, 0, false, false, 2, 1, 1, Dyes.dyeYellow , Element.P , Arrays.asList(new TC_AspectStack(TC_Aspects.IGNIS, 2), new TC_AspectStack(TC_Aspects.POTENTIA, 1))); + public static Materials Phosphorus = new Materials( 21, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |32 , 255, 255, 0, 0, "Phosphorus" , "Phosphorus" , 0, 0, 317, 0, false, false, 2, 1, 1, Dyes.dyeYellow , Element.P , Arrays.asList(new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2), new TC_AspectStack(TC_Aspects.POTENTIA, 1))); public static Materials Platinum = new Materials( 85, TextureSet.SET_SHINY , 12.0F, 64, 4, 1|2 |8 |32|64|128 , 255, 255, 200, 0, "Platinum" , "Platinum" , 0, 0, 2041, 0, false, false, 6, 1, 1, Dyes.dyeOrange , Element.Pt , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.NEBRISUM, 1))); public static Materials Plutonium = new Materials( 100, TextureSet.SET_METALLIC , 6.0F, 512, 3, 1|2 |8 |32|64 , 240, 50, 50, 0, "Plutonium" , "Plutonium 239" , 0, 0, 912, 0, false, false, 6, 1, 1, Dyes.dyeLime , Element.Pu , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 2))); public static Materials Plutonium241 = new Materials( 101, TextureSet.SET_SHINY , 6.0F, 512, 3, 1|2 |8 |32|64 , 250, 70, 70, 0, "Plutonium241" , "Plutonium 241" , 0, 0, 912, 0, false, false, 6, 1, 1, Dyes.dyeLime , Element.Pu_241 , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 3))); @@ -473,7 +473,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials NitroCarbon = new Materials( 716, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 0, 75, 100, 0, "NitroCarbon" , "Nitro-Carbon" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeCyan , 1, Arrays.asList(new MaterialStack(Nitrogen, 1), new MaterialStack(Carbon, 1))); public static Materials NitrogenDioxide = new Materials( 717, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 100, 175, 255, 0, "NitrogenDioxide" , "Nitrogen Dioxide" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeCyan , 1, Arrays.asList(new MaterialStack(Nitrogen, 1), new MaterialStack(Oxygen, 2))); public static Materials Obsidian = new Materials( 804, TextureSet.SET_DULL , 1.0F, 0, 3, 1 , 80, 50, 100, 0, "Obsidian" , "Obsidian" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeBlack , 1, Arrays.asList(new MaterialStack(Magnesium, 1), new MaterialStack(Iron, 1), new MaterialStack(Silicon, 2), new MaterialStack(Oxygen, 8))); - public static Materials Phosphate = new Materials( 833, TextureSet.SET_DULL , 1.0F, 0, 1, 1 |8|16 , 255, 255, 0, 0, "Phosphate" , "Phosphate" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Phosphor, 1), new MaterialStack(Oxygen, 4))); + public static Materials Phosphate = new Materials( 833, TextureSet.SET_DULL , 1.0F, 0, 1, 1 |8|16 , 255, 255, 0, 0, "Phosphate" , "Phosphate" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Phosphorus, 1), new MaterialStack(Oxygen, 4))); public static Materials PigIron = new Materials( 307, TextureSet.SET_METALLIC , 6.0F, 384, 2, 1|2 |8 |64 , 200, 180, 180, 0, "PigIron" , "Pig Iron" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyePink , 2, Arrays.asList(new MaterialStack(Iron, 1))); public static Materials Plastic = new Materials( 874, TextureSet.SET_DULL , 3.0F, 32, 1, 1|2 |64|128 , 200, 200, 200, 0, "Plastic" , "Polyethylene" , 0, 0, 400, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 0, Arrays.asList(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 2)), Arrays.asList(new TC_AspectStack(TC_Aspects.MOTUS, 2))); public static Materials Epoxid = new Materials( 470, TextureSet.SET_DULL , 3.0F, 32, 1, 1|2 |64|128 , 200, 140, 20, 0, "Epoxid" , "Epoxid" , 0, 0, 400, 0, false, false, 1, 1, 1, Dyes.dyeWhite , 0, Arrays.asList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 4), new MaterialStack(Oxygen, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.MOTUS, 2))); @@ -583,7 +583,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Ammonia = new MaterialBuilder(659, TextureSet.SET_FLUID , "Ammonia").addCell().addGas().setRGB(63, 52, 128).setColor(Dyes.dyeBlue).setMaterialList(new MaterialStack(Nitrogen, 1), new MaterialStack(Hydrogen, 3)).addElectrolyzerRecipe().constructMaterial(); public static Materials Dimethyldichlorosilane = new MaterialBuilder(663, TextureSet.SET_FLUID , "Dimethyldichlorosilane").addCell().addFluid().setRGB(68, 22, 80).setColor(Dyes.dyePurple).setMaterialList(new MaterialStack(Carbon, 2), new MaterialStack(Hydrogen, 6), new MaterialStack(Chlorine, 2), new MaterialStack(Silicon, 1)).addElectrolyzerRecipe().constructMaterial(); public static Materials Chloromethane = new MaterialBuilder(664, TextureSet.SET_FLUID , "Chloromethane").addCell().addGas().setRGB(200, 44, 160).setColor(Dyes.dyeMagenta).setMaterialList(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 3), new MaterialStack(Chlorine, 1)).addElectrolyzerRecipe().constructMaterial(); - public static Materials PhosphorousPentoxide = new MaterialBuilder(665, TextureSet.SET_FLUID , "Phosphorous Pentoxide").addCell().addDustItems().setRGB(220, 220, 0).setColor(Dyes.dyeYellow).setMaterialList(new MaterialStack(Phosphor, 4), new MaterialStack(Oxygen, 10)).addElectrolyzerRecipe().constructMaterial(); + public static Materials PhosphorousPentoxide = new MaterialBuilder(665, TextureSet.SET_FLUID , "Phosphorous Pentoxide").addCell().addDustItems().setRGB(220, 220, 0).setColor(Dyes.dyeYellow).setMaterialList(new MaterialStack(Phosphorus, 4), new MaterialStack(Oxygen, 10)).addElectrolyzerRecipe().constructMaterial(); public static Materials Tetrafluoroethylene = new MaterialBuilder(666, TextureSet.SET_FLUID , "Tetrafluoroethylene").addCell().addGas().setRGB(125, 125, 125).setColor(Dyes.dyeGray).setMaterialList(new MaterialStack(Carbon, 2), new MaterialStack(Fluorine, 4)).addElectrolyzerRecipe().constructMaterial(); public static Materials HydrofluoricAcid = new MaterialBuilder(667, TextureSet.SET_FLUID , "Hydrofluoric Acid").setName("HydrofluoricAcid_GT5U").addCell().addFluid().setRGB(0, 136, 170).setColor(Dyes.dyeLightBlue).setMaterialList(new MaterialStack(Hydrogen, 1), new MaterialStack(Fluorine, 1)).addElectrolyzerRecipe().constructMaterial(); public static Materials Chloroform = new MaterialBuilder(668, TextureSet.SET_FLUID , "Chloroform").addCell().addFluid().setRGB(137, 44, 160).setColor(Dyes.dyePurple).setMaterialList(new MaterialStack(Carbon, 1), new MaterialStack(Hydrogen, 1), new MaterialStack(Chlorine, 3)).addElectrolyzerRecipe().constructMaterial(); @@ -606,14 +606,14 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Benzene = new MaterialBuilder(686, TextureSet.SET_FLUID , "Benzene").addCell().addFluid().setRGB(26, 26, 26).setColor(Dyes.dyeGray).setFuelType(MaterialBuilder.GAS).setFuelPower(288).setMaterialList(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 6)).addElectrolyzerRecipe().constructMaterial(); public static Materials Phenol = new MaterialBuilder(687, TextureSet.SET_FLUID , "Phenol").addCell().addFluid().setRGB(120, 68, 33).setColor(Dyes.dyeBrown).setFuelType(MaterialBuilder.GAS).setFuelPower(288).setMaterialList(new MaterialStack(Carbon, 6), new MaterialStack(Hydrogen, 6), new MaterialStack(Oxygen, 1)).addElectrolyzerRecipe().constructMaterial(); public static Materials Cumene = new MaterialBuilder(688, TextureSet.SET_FLUID , "Isopropylbenzene").addCell().addFluid().setRGB(85, 34, 0).setColor(Dyes.dyeBrown).setMaterialList(new MaterialStack(Carbon, 9), new MaterialStack(Hydrogen, 12)).addElectrolyzerRecipe().constructMaterial(); - public static Materials PhosphoricAcid = new MaterialBuilder(689, TextureSet.SET_FLUID , "Phosphoric Acid").setName("PhosphoricAcid_GT5U").addCell().addFluid().setRGB(220, 220, 0).setColor(Dyes.dyeYellow).setMaterialList(new MaterialStack(Hydrogen, 3), new MaterialStack(Phosphor, 1), new MaterialStack(Oxygen, 4)).addElectrolyzerRecipe().constructMaterial(); + public static Materials PhosphoricAcid = new MaterialBuilder(689, TextureSet.SET_FLUID , "Phosphoric Acid").setName("PhosphoricAcid_GT5U").addCell().addFluid().setRGB(220, 220, 0).setColor(Dyes.dyeYellow).setMaterialList(new MaterialStack(Hydrogen, 3), new MaterialStack(Phosphorus, 1), new MaterialStack(Oxygen, 4)).addElectrolyzerRecipe().constructMaterial(); public static Materials SaltWater = new MaterialBuilder(692, TextureSet.SET_FLUID , "Salt Water").addCell().addFluid().setRGB(0, 0, 200).setColor(Dyes.dyeBlue).constructMaterial(); public static Materials IronIIIChloride = new MaterialBuilder(693, TextureSet.SET_FLUID , "Iron III Chloride").setName("IronIIIChloride").addCell().addFluid().setRGB(22, 21, 14).setColor(Dyes.dyeBlack).setMaterialList(new MaterialStack(Chlorine, 3), new MaterialStack(Iron, 1)).addElectrolyzerRecipe().constructMaterial(); public static Materials LifeEssence = new MaterialBuilder(694, TextureSet.SET_FLUID , "Life").setName("lifeessence").addCell().addFluid().setFuelPower(100).setFuelType(5).setRGB(110, 3, 3).setColor(Dyes.dyeRed).setMaterialList().constructMaterial(); public static Materials SolderingAlloy = new Materials( 314, TextureSet.SET_DULL , 1.0F, 0, 1, 1|2 , 220, 220, 230, 0, "SolderingAlloy" , "Soldering Alloy" , 0, 0, 400, 400, false, false, 1, 1, 1, Dyes.dyeWhite , 2, Arrays.asList(new MaterialStack(Tin, 9), new MaterialStack(Antimony, 1))); public static Materials GalliumArsenide = new Materials( 980, TextureSet.SET_DULL , 1.0F, 0, 1, 1|2 , 160, 160, 160, 0, "GalliumArsenide" , "Gallium Arsenide" , 0, 0, -1, 1200, true, false, 1, 1, 1, Dyes.dyeGray , 2, Arrays.asList(new MaterialStack(Arsenic, 1), new MaterialStack(Gallium, 1))); - public static Materials IndiumGalliumPhosphide = new Materials( 981, TextureSet.SET_DULL , 1.0F, 0, 1, 1|2 , 160, 140, 190, 0, "IndiumGalliumPhosphide" , "Indium Gallium Phosphide" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , 2, Arrays.asList(new MaterialStack(Indium, 1), new MaterialStack(Gallium, 1), new MaterialStack(Phosphor, 1))); + public static Materials IndiumGalliumPhosphide = new Materials( 981, TextureSet.SET_DULL , 1.0F, 0, 1, 1|2 , 160, 140, 190, 0, "IndiumGalliumPhosphide" , "Indium Gallium Phosphide" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , 2, Arrays.asList(new MaterialStack(Indium, 1), new MaterialStack(Gallium, 1), new MaterialStack(Phosphorus, 1))); public static Materials Spessartine = new Materials( 838, TextureSet.SET_DULL , 1.0F, 0, 2, 1 |8 , 255, 100, 100, 0, "Spessartine" , "Spessartine" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed , 1, Arrays.asList(new MaterialStack(Aluminium, 2), new MaterialStack(Manganese, 3), new MaterialStack(Silicon, 3), new MaterialStack(Oxygen, 12))); public static Materials Sphalerite = new Materials( 839, TextureSet.SET_DULL , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Sphalerite" , "Sphalerite" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Zinc, 1), new MaterialStack(Sulfur, 1))); public static Materials StainlessSteel = new Materials( 306, TextureSet.SET_SHINY , 7.0F, 480, 4, 1|2 |64|128 , 200, 200, 220, 0, "StainlessSteel" , "Stainless Steel" , 0, 0, -1, 1700, true, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Iron, 6), new MaterialStack(Chrome, 1), new MaterialStack(Manganese, 1), new MaterialStack(Nickel, 1))); @@ -685,7 +685,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { //\/public static Materials BlueAlloy = new Materials( 309, TextureSet.SET_DULL , 1.0F, 0, 0, 1|2 , 100, 180, 255, 0, "BlueAlloy" , "Blue Alloy" , 0, 0, -1, 0, false, false, 3, 5, 1, Dyes.dyeLightBlue , 2, Arrays.asList(new MaterialStack(Silver, 1), new MaterialStack(Electrotine, 4)), Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 3))); public static Materials RedAlloy = new Materials( 308, TextureSet.SET_DULL , 1.0F, 0, 0, 1|2 , 200, 0, 0, 0, "RedAlloy" , "Red Alloy" , 0, 0, 500, 0, false, false, 3, 5, 1, Dyes.dyeRed , 2, Arrays.asList(new MaterialStack(Copper, 1), new MaterialStack(Redstone, 4)), Arrays.asList(new TC_AspectStack(TC_Aspects.MACHINA, 3))); public static Materials CobaltBrass = new Materials( 343, TextureSet.SET_METALLIC , 8.0F, 256, 2, 1|2 |64|128 , 180, 180, 160, 0, "CobaltBrass" , "Cobalt Brass" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange , 2, Arrays.asList(new MaterialStack(Brass, 7), new MaterialStack(Aluminium, 1), new MaterialStack(Cobalt, 1))); - public static Materials Phosphorus = new Materials( 534, TextureSet.SET_FLINT , 1.0F, 0, 2, 1 |4|8|16 , 255, 255, 0, 0, "Phosphorus" , "Phosphorus" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Calcium, 3), new MaterialStack(Phosphate, 2))); + public static Materials TricalciumPhosphate = new Materials( 534, TextureSet.SET_FLINT , 1.0F, 0, 2, 1|4|8|16 , 255, 255, 0, 0, "TricalciumPhosphate" , "Tricalcium Phosphate" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Calcium, 3), new MaterialStack(Phosphate, 2))); public static Materials Basalt = new Materials( 844, TextureSet.SET_ROUGH , 1.0F, 0, 1, 1 , 30, 20, 20, 0, "Basalt" , "Basalt" , 0, 0, -1, 0, false, false, 2, 1, 1, Dyes.dyeBlack , 2, Arrays.asList(new MaterialStack(Olivine, 1), new MaterialStack(Calcite, 3), new MaterialStack(Flint, 8), new MaterialStack(DarkAsh, 4)), Arrays.asList(new TC_AspectStack(TC_Aspects.TENEBRAE, 1))); public static Materials GarnetRed = new Materials( 527, TextureSet.SET_RUBY , 7.0F, 128, 2, 1 |4|8 |64 , 200, 80, 80, 127, "GarnetRed" , "Red Garnet" , 0, 0, -1, 0, false, true, 4, 1, 1, Dyes.dyeRed , 2, Arrays.asList(new MaterialStack(Pyrope, 3), new MaterialStack(Almandine, 5), new MaterialStack(Spessartine, 8)), Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 3))); public static Materials GarnetYellow = new Materials( 528, TextureSet.SET_RUBY , 7.0F, 128, 2, 1 |4|8 |64 , 200, 200, 80, 127, "GarnetYellow" , "Yellow Garnet" , 0, 0, -1, 0, false, true, 4, 1, 1, Dyes.dyeYellow , 2, Arrays.asList(new MaterialStack(Andradite, 5), new MaterialStack(Grossular, 8), new MaterialStack(Uvarovite, 3)), Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 3))); @@ -880,7 +880,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { @Deprecated public static Materials Naquadriah = new Materials(Naquadria, false); @Deprecated public static Materials Obby = new Materials(Obsidian, false); @Deprecated public static Materials Peridot = new Materials(Olivine, true); - @Deprecated public static Materials Phosphorite = new Materials(Phosphorus, true); + @Deprecated public static Materials Phosphorite = new Materials(TricalciumPhosphate, true); @Deprecated public static Materials Quarried = new Materials(Marble, false); @Deprecated public static Materials Quicksilver = new Materials(Mercury, true); @Deprecated public static Materials QuickSilver = new Materials(Mercury, false); @@ -1014,7 +1014,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { CassiteriteSand .setOreMultiplier( 2).setSmeltingMultiplier( 2); NetherQuartz .setOreMultiplier( 2).setSmeltingMultiplier( 2); CertusQuartz .setOreMultiplier( 2).setSmeltingMultiplier( 2); - Phosphorus .setOreMultiplier( 3).setSmeltingMultiplier( 3); + TricalciumPhosphate .setOreMultiplier( 3).setSmeltingMultiplier( 3); Saltpeter .setOreMultiplier( 4).setSmeltingMultiplier( 4); Apatite .setOreMultiplier( 4).setSmeltingMultiplier( 4).setByProductMultiplier(2); Electrotine .setOreMultiplier( 5).setSmeltingMultiplier( 5); @@ -1129,7 +1129,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Pitchblende .addOreByProducts(Thorium , Uranium , Lead ); Galena .addOreByProducts(Sulfur , Silver , Lead ); Lapis .addOreByProducts(Lazurite , Sodalite , Pyrite ); - Pyrite .addOreByProducts(Sulfur , Phosphorus , Iron ); + Pyrite .addOreByProducts(Sulfur , TricalciumPhosphate , Iron ); Copper .addOreByProducts(Cobalt , Gold , Nickel ); Nickel .addOreByProducts(Cobalt , Platinum , Iron ); GarnetRed .addOreByProducts(Spessartine , Pyrope , Almandine ); @@ -1155,8 +1155,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Lepidolite .addOreByProducts(Lithium , Caesium ); Andradite .addOreByProducts(GarnetYellow , Iron ); Pyrolusite .addOreByProducts(Manganese , Tantalite , Niobium ).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); - Phosphorus .addOreByProducts(Apatite , Phosphate , Pyrochlore ); - Apatite .addOreByProducts(Phosphorus , Phosphate , Pyrochlore ); + TricalciumPhosphate .addOreByProducts(Apatite , Phosphate , Pyrochlore ); + Apatite .addOreByProducts(TricalciumPhosphate , Phosphate , Pyrochlore ); Pyrochlore .addOreByProducts(Apatite , Calcite , Niobium ); Quartzite .addOreByProducts(CertusQuartz , Barite ); CertusQuartz .addOreByProducts(Quartzite , Barite ); @@ -1253,8 +1253,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { CassiteriteSand .addOreByProducts(Tin); GraniteBlack .addOreByProducts(Biotite ); GraniteRed .addOreByProducts(PotassiumFeldspar); - Phosphate .addOreByProducts(Phosphor ); - Phosphor .addOreByProducts(Phosphate ); + Phosphate .addOreByProducts(Phosphorus ); + Phosphorus .addOreByProducts(Phosphate ); Tanzanite .addOreByProducts(Opal ); Opal .addOreByProducts(Tanzanite); Amethyst .addOreByProducts(Amethyst); @@ -1472,7 +1472,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { NetherQuartz .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); CertusQuartz .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); Fluix .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); - Phosphorus .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE); + TricalciumPhosphate .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE); Phosphate .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE); InfusedAir .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.UNBURNABLE); InfusedFire .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.UNBURNABLE); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 042811eba5..d61e89dfac 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -347,10 +347,10 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { addItemBehavior(32472, tBehaviour); addItemBehavior(32473, tBehaviour); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphor, 1L), ItemList.Tool_Matches.get(1L, new Object[0]), 16, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Phosphorus, 1L), ItemList.Tool_Matches.get(1L, new Object[0]), 16, 16); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphor, 1L), ItemList.Tool_Matches.get(4L, new Object[0]), 64, 16); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.TricalciumPhosphate, 1L), ItemList.Tool_Matches.get(1L, new Object[0]), 16, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), ItemList.Tool_Matches.get(4L, new Object[0]), 64, 16); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Wood, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), ItemList.Tool_Matches.get(4L, new Object[0]), 64, 16); GT_Values.RA.addBoxingRecipe(ItemList.Tool_Matches.get(16L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1L), ItemList.Tool_MatchBox_Full.get(1L, new Object[0]), 64, 16); GT_Values.RA.addUnboxingRecipe(ItemList.Tool_MatchBox_Full.get(1L, new Object[0]), ItemList.Tool_Matches.get(16L, new Object[0]), null, 32, 16); diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 91218763dd..fcf33eaa7d 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -210,7 +210,7 @@ public class ItemComb extends Item { addProcessLV(tComb, Materials.Talc, 90); addProcessLV(tComb, Materials.Apatite, 80); addProcessLV(tComb, Materials.Phosphate, 75); - addProcessLV(tComb, Materials.Phosphorus, 75); + addProcessLV(tComb, Materials.TricalciumPhosphate, 75); tComb = getStackForType(CombType.CERTUS); addProcessLV(tComb, Materials.CertusQuartz, 100); addProcessLV(tComb, Materials.Quartzite, 80); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java index c504c92efa..271a7cc337 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingItem.java @@ -30,7 +30,7 @@ public class ProcessingItem implements gregtech.api.interfaces.IOreRecipeRegistr case "itemMagnesium": GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Magnesium, 3628800L, new MaterialStack[0])); case "itemPhosphorite": - GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Phosphorus, 3628800L, new MaterialStack[0])); + GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.TricalciumPhosphate, 3628800L, new MaterialStack[0])); case "itemSulfur": GT_OreDictUnificator.addItemData(aStack, new ItemData(Materials.Sulfur, 3628800L, new MaterialStack[0])); case "itemAluminum": diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java index a9a7f72195..6690e435ce 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java @@ -55,7 +55,10 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe GT_Values.RA.addPrimitiveBlastRecipe(aMaterial.getDust(2), Materials.SiliconDioxide.getDust(2), 2, aMaterial.mDirectSmelting.getIngots(outputAmount), Materials.Ferrosilite.getDust(outputAmount), 2400); } else if (aMaterial == Materials.Tetrahedrite) { GT_Values.RA.addPrimitiveBlastRecipe(aMaterial.getDust(2), GT_Values.NI, 2, aMaterial.mDirectSmelting.getIngots(outputAmount), Materials.Antimony.getNuggets(3 * outputAmount), 2400); - } + } else if (aMaterial == Materials.Galena) { + GT_Values.RA.addPrimitiveBlastRecipe(aMaterial.getDust(2), GT_Values.NI, 2, aMaterial.mDirectSmelting.getIngots(outputAmount), Materials.Silver.getNuggets(3 * outputAmount), 2400); + + } } case dustImpure: case dustPure: diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index 7946381981..af9bfc619f 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -461,7 +461,7 @@ public class GT_CraftingRecipeLoader implements Runnable { //GT_ModHandler.addCraftingRecipe(ItemList.IC2_Item_Casing_Steel.get(1L), new Object[]{"h P", 'P', OrePrefixes.plate.get(Materials.Steel)}); GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.torch, 2), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"C", "S", 'C', OrePrefixes.dust.get(Materials.Sulfur), 'S', OrePrefixes.stick.get(Materials.Wood)}); - GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.torch, 6), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"C", "S", 'C', OrePrefixes.dust.get(Materials.Phosphorus), 'S', OrePrefixes.stick.get(Materials.Wood)}); + GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.torch, 6), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"C", "S", 'C', OrePrefixes.dust.get(Materials.TricalciumPhosphate), 'S', OrePrefixes.stick.get(Materials.Wood)}); GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.piston, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"WWW", "CBC", "CRC", 'W', OrePrefixes.plank.get(Materials.Wood), 'C', OrePrefixes.stoneCobble, 'R', OrePrefixes.dust.get(Materials.Redstone), 'B', OrePrefixes.ingot.get(Materials.AnyIron)}); GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.piston, 1), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"WWW", "CBC", "CRC", 'W', OrePrefixes.plank.get(Materials.Wood), 'C', OrePrefixes.stoneCobble, 'R', OrePrefixes.dust.get(Materials.Redstone), 'B', OrePrefixes.ingot.get(Materials.AnyBronze)}); @@ -567,7 +567,7 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(Items.gunpowder, 6), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{OrePrefixes.dust.get(Materials.Charcoal), OrePrefixes.dust.get(Materials.Charcoal), OrePrefixes.dust.get(Materials.Charcoal), OrePrefixes.dust.get(Materials.Sulfur), OrePrefixes.dust.get(Materials.Saltpeter), OrePrefixes.dust.get(Materials.Saltpeter)}); GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(Items.gunpowder, 6), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{OrePrefixes.dust.get(Materials.Carbon), OrePrefixes.dust.get(Materials.Carbon), OrePrefixes.dust.get(Materials.Carbon), OrePrefixes.dust.get(Materials.Sulfur), OrePrefixes.dust.get(Materials.Saltpeter), OrePrefixes.dust.get(Materials.Saltpeter)}); - GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IndiumGalliumPhosphide, 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{OrePrefixes.dust.get(Materials.Indium), OrePrefixes.dust.get(Materials.Gallium), OrePrefixes.dust.get(Materials.Phosphor)}); + GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IndiumGalliumPhosphide, 3L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{OrePrefixes.dust.get(Materials.Indium), OrePrefixes.dust.get(Materials.Gallium), OrePrefixes.dust.get(Materials.Phosphorus)}); GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 5L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{OrePrefixes.dust.get(Materials.Potassium), OrePrefixes.cell.get(Materials.Nitrogen), OrePrefixes.cell.get(Materials.Oxygen), OrePrefixes.cell.get(Materials.Oxygen), OrePrefixes.cell.get(Materials.Oxygen)}); GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getIC2Item("carbonFiber", 1L)); diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 869333d884..f6739c0a98 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -112,7 +112,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(tPrefix, Materials.Saltpeter, 2L), GT_OreDictUnificator.get(tPrefix, Materials.Sulfur, 1L), GT_OreDictUnificator.get(tPrefix, Materials.Charcoal, 3L), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * tPrefix.mMaterialAmount), (int) (600L * tPrefix.mMaterialAmount / 3628800L), 8); GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(tPrefix, Materials.Saltpeter, 2L), GT_OreDictUnificator.get(tPrefix, Materials.Sulfur, 1L), GT_OreDictUnificator.get(tPrefix, Materials.Carbon, 3L), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.getDust(Materials.Gunpowder, 6L * tPrefix.mMaterialAmount), (int) (600L * tPrefix.mMaterialAmount / 3628800L), 8); - GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(tPrefix, Materials.Indium, 1L), GT_OreDictUnificator.get(tPrefix, Materials.Gallium, 1L), GT_OreDictUnificator.get(tPrefix, Materials.Phosphor, 1L), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.getDust(Materials.IndiumGalliumPhosphide, 3L * tPrefix.mMaterialAmount), (int) (200L * tPrefix.mMaterialAmount / 3628800L), 8); + GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(tPrefix, Materials.Indium, 1L), GT_OreDictUnificator.get(tPrefix, Materials.Gallium, 1L), GT_OreDictUnificator.get(tPrefix, Materials.TricalciumPhosphate, 1L), GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.getDust(Materials.IndiumGalliumPhosphide, 3L * tPrefix.mMaterialAmount), (int) (200L * tPrefix.mMaterialAmount / 3628800L), 8); GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(tPrefix, Materials.Brick, 1L), GT_OreDictUnificator.get(tPrefix, Materials.Clay, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.getDust(Materials.Fireclay, 2L * tPrefix.mMaterialAmount), (int) (200L * tPrefix.mMaterialAmount / 3628800L), 8); GT_Values.RA.addMixerRecipe(GT_OreDictUnificator.get(tPrefix, Materials.Nickel, 4L), GT_OreDictUnificator.get(tPrefix, Materials.Chrome, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Utility.getIntegratedCircuit(1), GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.getDust(Materials.Nichrome, 5L * tPrefix.mMaterialAmount), (int) (500L * tPrefix.mMaterialAmount / 3628800L), 120); @@ -470,7 +470,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addFluidSmelterRecipe(new ItemStack(Items.snowball, 1, 0), GT_Values.NI, Materials.Water.getFluid(250L), 10000, 32, 4); GT_Values.RA.addFluidSmelterRecipe(new ItemStack(Blocks.snow, 1, 0), GT_Values.NI, Materials.Water.getFluid(1000L), 10000, 128, 4); GT_Values.RA.addFluidSmelterRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ice, 1L), GT_Values.NI, Materials.Ice.getSolid(1000L), 10000, 128, 4); - GT_Values.RA.addFluidSmelterRecipe(GT_ModHandler.getModItem(aTextForestry, "phosphor", 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphor, 1L), Materials.Lava.getFluid(800L), 1000, 256, 128); + GT_Values.RA.addFluidSmelterRecipe(GT_ModHandler.getModItem(aTextForestry, "phosphor", 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), Materials.Lava.getFluid(800L), 1000, 256, 128); GT_Values.RA.addAutoclaveRecipe(ItemList.IC2_Energium_Dust.get(9L), Materials.EnergeticAlloy.getMolten(288), ItemList.IC2_EnergyCrystal.get(1L), 10000, 600, 256); GT_Values.RA.addAutoclaveRecipe(GT_ModHandler.getModItem(aTextAE, "item.ItemCrystalSeed", 1L, 0), Materials.Water.getFluid(200L), GT_ModHandler.getModItem(aTextAE, aTextAEMM, 1L, 10), 10000, 2000, 24); @@ -995,27 +995,27 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addBrewingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L), tFluid, FluidRegistry.getFluid("potion.chillysauce"), false); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(2L, new Object[0]), 200); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(3L, new Object[0]), 300); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(3L, new Object[0]), 300); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(2L, new Object[0]), 200); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(1L, new Object[0]), 100); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(1L, new Object[0]), 100); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(3L, new Object[0]), 300); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(4L, new Object[0]), 400); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(4L, new Object[0]), 400); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(3L, new Object[0]), 300); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(2L, new Object[0]), 200); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(2L, new Object[0]), 200); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(3L, new Object[0]), 300); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(4L, new Object[0]), 400); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(4L, new Object[0]), 400); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(3L, new Object[0]), 300); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(2L, new Object[0]), 200); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Apatite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(2L, new Object[0]), 200); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(3L, new Object[0]), 300); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(4L, new Object[0]), 400); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(4L, new Object[0]), 400); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(3L, new Object[0]), 300); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(2L, new Object[0]), 200); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glauconite, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(2L, new Object[0]), 200); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(3L, new Object[0]), 300); - GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(4L, new Object[0]), 400); + GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(4L, new Object[0]), 400); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphate, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(3L, new Object[0]), 300); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 3L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(2L, new Object[0]), 200); GT_Values.RA.addChemicalRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GlauconiteSand, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L), new FluidStack(tFluid, 1000), GT_Values.NF, ItemList.IC2_Fertilizer.get(2L, new Object[0]), 200); @@ -1810,7 +1810,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 4L), new ItemStack(Items.compass, 1), 400, 4); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Gold, 4L), new ItemStack(Items.clock, 1), 400, 4); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1L), new ItemStack(Blocks.torch, 2), 400, 1); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Phosphorus, 1L), new ItemStack(Blocks.torch, 6), 400, 1); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 1L), new ItemStack(Blocks.torch, 6), 400, 1); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Wood, 1L), ItemList.IC2_Resin.get(1L, new Object[0]), new ItemStack(Blocks.torch, 6), 400, 1); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 8L), new ItemStack(Items.flint, 1), ItemList.IC2_Compressed_Coal_Ball.get(1L, new Object[0]), 400, 4); @@ -3176,10 +3176,10 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addDistilleryRecipe(3, Materials.HeavyFuel.getFluid(100), Materials.Phenol.getFluid(25), 160, 24, false); GT_Values.RA.addChemicalRecipe(Materials.Apatite.getDust(1), Materials.SulfuricAcid.getCells(5), Materials.Water.getFluid(10000), Materials.PhosphoricAcid.getFluid(3000), Materials.HydrochloricAcid.getCells(1), Materials.Empty.getCells(4), 320); - GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Phosphor.getDust(4), GT_Values.NI, Materials.Oxygen.getGas(10000), GT_Values.NF, Materials.PhosphorousPentoxide.getDust(1), GT_Values.NI, 40, 30); - GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{Materials.Phosphor.getDust(4), GT_Utility.getIntegratedCircuit(1)}, new FluidStack[]{Materials.Oxygen.getGas(10000)}, null, new ItemStack[]{Materials.PhosphorousPentoxide.getDust(1)}, 40, 30); + GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Phosphorus.getDust(4), GT_Values.NI, Materials.Oxygen.getGas(10000), GT_Values.NF, Materials.PhosphorousPentoxide.getDust(1), GT_Values.NI, 40, 30); + GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{Materials.Phosphorus.getDust(4), GT_Utility.getIntegratedCircuit(1)}, new FluidStack[]{Materials.Oxygen.getGas(10000)}, null, new ItemStack[]{Materials.PhosphorousPentoxide.getDust(1)}, 40, 30); GT_Values.RA.addChemicalRecipe(Materials.PhosphorousPentoxide.getDust(1), GT_Values.NI, Materials.Water.getFluid(6000), Materials.PhosphoricAcid.getFluid(4000), GT_Values.NI, 40); - GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{Materials.Phosphor.getDust(1), GT_Utility.getIntegratedCircuit(24)}, new FluidStack[]{Materials.Oxygen.getGas(2500), Materials.Water.getFluid(1500)}, new FluidStack[]{Materials.PhosphoricAcid.getFluid(1000)}, null, 320, 30); + GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{Materials.Phosphorus.getDust(1), GT_Utility.getIntegratedCircuit(24)}, new FluidStack[]{Materials.Oxygen.getGas(2500), Materials.Water.getFluid(1500)}, new FluidStack[]{Materials.PhosphoricAcid.getFluid(1000)}, null, 320, 30); GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.Propene.getCells(8), Materials.PhosphoricAcid.getCells(1), Materials.Benzene.getFluid(8000), Materials.Cumene.getFluid(8000), Materials.Empty.getCells(9), GT_Values.NI, 1920, 30); GT_Values.RA.addChemicalRecipeForBasicMachineOnly(Materials.PhosphoricAcid.getCells(1), Materials.Benzene.getCells(8), Materials.Propene.getGas(8000), Materials.Cumene.getFluid(8000), Materials.Empty.getCells(9), GT_Values.NI, 1920, 30); diff --git a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java index bca78b507b..f995a81343 100644 --- a/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java +++ b/src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java @@ -155,7 +155,7 @@ public class GT_Worldgenloader new GT_Worldgen_GT_Ore_Layer("ore.mix.quartz", true, 80, 120, 30, 3, 16, false, true, false, Materials.Quartzite, Materials.Barite, Materials.CertusQuartz, Materials.CertusQuartz); new GT_Worldgen_GT_Ore_Layer("ore.mix.diamond", true, 5, 20, 40, 2, 16, true, false, false, Materials.Graphite, Materials.Graphite, Materials.Diamond, Materials.Coal); new GT_Worldgen_GT_Ore_Layer("ore.mix.olivine", true, 10, 40, 60, 3, 16, false, false, false, Materials.Bentonite, Materials.Magnesite, Materials.Olivine, Materials.Glauconite); - new GT_Worldgen_GT_Ore_Layer("ore.mix.apatite", true, 40, 60, 60, 3, 16, true, false, false, Materials.Apatite, Materials.Apatite, Materials.Phosphorus, Materials.Pyrochlore); + new GT_Worldgen_GT_Ore_Layer("ore.mix.apatite", true, 40, 60, 60, 3, 16, true, false, false, Materials.Apatite, Materials.Apatite, Materials.TricalciumPhosphate, Materials.Pyrochlore); new GT_Worldgen_GT_Ore_Layer("ore.mix.galena", true, 5, 45, 40, 5, 16, false, false, false, Materials.Galena, Materials.Galena, Materials.Silver, Materials.Lead); new GT_Worldgen_GT_Ore_Layer("ore.mix.lapis", true, 20, 50, 40, 5, 16, true, false, false, Materials.Lazurite, Materials.Sodalite, Materials.Lapis, Materials.Calcite); new GT_Worldgen_GT_Ore_Layer("ore.mix.beryllium", true, 5, 30, 30, 3, 16, false, true, true, Materials.Beryllium, Materials.Beryllium, Materials.Emerald, Materials.Thorium); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 28968ef537..145cbc8b54 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -399,7 +399,7 @@ public class GT_Loader_Item_Block_And_Fluid Materials.Opal, Materials.InfusedOrder, Materials.InfusedEntropy, - Materials.Phosphorus, + Materials.TricalciumPhosphate, Materials.Quartzite, Materials.GarnetRed, Materials.Ruby, diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 3fb9c3ce04..002824c0a2 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -202,8 +202,8 @@ achievement.Olivine=Find Olivine Ore achievement.Olivine.desc=Height: 10-40, Chance: 60, Twilight-Forest/Makemake/Haumea/BarnardE// achievement.Apatite=Find Apatite Ore achievement.Apatite.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forest/Tceti// -achievement.Phosphorus=Find Phosphorus Ore -achievement.Phosphorus.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forest/Tceti// +achievement.TricalciumPhosphate=Find TricalciumPhosphate Ore +achievement.TricalciumPhosphate.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forest/Tceti// achievement.Phosphate=Find Phosphate Ore achievement.Phosphate.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forest/Tceti// achievement.Galena=Find Galena Ore diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang index 93873856d0..2925d4f4c3 100644 --- a/src/main/resources/assets/gregtech/lang/zh_CN.lang +++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang @@ -200,8 +200,8 @@ achievement.Olivine=找到橄榄石矿石 achievement.Olivine.desc=高度：10-40，几率：60， 暮色森林/鸟神星/妊神星/巴德纳E// achievement.Apatite=找到磷灰石矿石 achievement.Apatite.desc=高度：40-60，几率：60，主世界/暮色森林/鲸鱼座T星// 大概已经不存在了 -achievement.Phosphorus=找到磷矿石 -achievement.Phosphorus.desc=高度：40-60，几率：60，主世界/暮色森林/鲸鱼座T星// 大概已经不存在了 +achievement.TricalciumPhosphate=找到磷矿石 +achievement.TricalciumPhosphate.desc=高度：40-60，几率：60，主世界/暮色森林/鲸鱼座T星// 大概已经不存在了 achievement.Phosphate=找到磷酸盐矿石 achievement.Phosphate.desc=高度：40-60，几率：60，主世界/暮色森林/鲸鱼座T星// 大概已经不存在了 achievement.Galena=找到方铅矿矿石 -- cgit From fd7d0b82bce855fd5c6c3901dd458fdf5da10959 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 29 Dec 2018 14:37:05 +0100 Subject: Input grid in 9-input assembler is not centered to items #3865 https://github.com/GTNewHorizons/NewHorizons/issues/3865 --- .../textures/gui/basicmachines/Assembler2.png | Bin 5212 -> 7966 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png index 054d9169f2..a52fee09ba 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png differ -- cgit From 93d32f3ba6a0b0235767aadee03c092db2836927 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 6 Jan 2019 23:36:23 +0100 Subject: add Core mod reinforced blocks to gt --- src/main/java/gregtech/api/enums/ItemList.java | 2 +- src/main/java/gregtech/api/enums/Textures.java | 2 +- .../common/blocks/GT_Block_Reinforced.java | 49 +++++++++++++++++++-- .../textures/blocks/iconsets/BLOCK_BRONZEPREIN.png | Bin 822 -> 353 bytes .../textures/blocks/iconsets/BLOCK_IRREIN.png | Bin 822 -> 261 bytes .../blocks/iconsets/BLOCK_NAQUADAHPREIN.png | Bin 0 -> 2942 bytes .../blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png | Bin 0 -> 2959 bytes .../textures/blocks/iconsets/BLOCK_STEELPREIN.png | Bin 0 -> 3003 bytes .../blocks/iconsets/BLOCK_TITANIUMPREIN.png | Bin 0 -> 2998 bytes .../textures/blocks/iconsets/BLOCK_TSREIN.png | Bin 822 -> 341 bytes 10 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 5b25e5a3d2..40b5fed57e 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -665,7 +665,7 @@ public enum ItemList implements IItemContainer { Casing_Coil_Cupronickel, Casing_Coil_Kanthal, Casing_Coil_Nichrome, Casing_Coil_TungstenSteel, Casing_Coil_HSSG, Casing_Coil_Naquadah, Casing_Coil_NaquadahAlloy, Casing_Coil_ElectrumFlux, Casing_Coil_AwakenedDraconium, Casing_Tank_1, Casing_Tank_2, Casing_Tank_3, Casing_Tank_4, Casing_Tank_5, Casing_Tank_6, Casing_Tank_7, Casing_Tank_8, Casing_Tank_9, Casing_Tank_10, Casing_Tank_11, Casing_Tank_12, Casing_Tank_13, Casing_Tank_14, Casing_Tank_15, Casing_Tank_0, MobRep_LV, MobRep_MV, MobRep_HV, MobRep_EV, MobRep_IV, MobRep_LuV, MobRep_ZPM, MobRep_UV, Cover_PlayerDetector, Machine_Multi_HeatExchanger, - Block_BronzePlate, Block_IridiumTungstensteel, Block_Plascrete, Block_TungstenSteelReinforced, + Block_BronzePlate, Block_SteelPlate, Block_TitaniumPlate, Block_IridiumTungstensteel, Block_Plascrete, Block_TungstenSteelReinforced, Block_NaquadahPlate, Block_NeutroniumPlate, Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector_LV, Seismic_Prospector_MV, Seismic_Prospector_HV, Seismic_Prospector_Adv_LV, Seismic_Prospector_Adv_MV, Seismic_Prospector_Adv_HV, Seismic_Prospector_Adv_EV, OilDrill1, OilDrill2, OilDrill3, ConcreteBackfiller1, ConcreteBackfiller2, OreDrill1, OreDrill2, OreDrill3, OreDrill4, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite, Battery_Charger_4by4_ULV, Battery_Charger_4by4_LV, Battery_Charger_4by4_MV, Battery_Charger_4by4_HV, Battery_Charger_4by4_EV, Battery_Charger_4by4_IV, Battery_Charger_4by4_LuV, Battery_Charger_4by4_ZPM, Battery_Charger_4by4_UV, Battery_Charger_4by4_MAX, MicroTransmitter_HV, MicroTransmitter_EV, MicroTransmitter_IV, MicroTransmitter_LUV, MicroTransmitter_ZPM, MicroTransmitter_UV, diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 1a9d7e2b4c..1c1aaa3bd8 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -65,7 +65,7 @@ public class Textures { DIESEL_GENERATOR_SIDE_ACTIVE, DIESEL_GENERATOR_BOTTOM_ACTIVE, DIESEL_GENERATOR_TOP_ACTIVE, GAS_TURBINE_BACK, GAS_TURBINE_FRONT, GAS_TURBINE_SIDE, GAS_TURBINE_BOTTOM, GAS_TURBINE_TOP, GAS_TURBINE_BACK_ACTIVE, GAS_TURBINE_FRONT_ACTIVE, GAS_TURBINE_SIDE_ACTIVE, GAS_TURBINE_BOTTOM_ACTIVE, GAS_TURBINE_TOP_ACTIVE, STEAM_TURBINE_BACK, STEAM_TURBINE_FRONT, STEAM_TURBINE_SIDE, STEAM_TURBINE_BOTTOM, STEAM_TURBINE_TOP, STEAM_TURBINE_BACK_ACTIVE, STEAM_TURBINE_FRONT_ACTIVE, STEAM_TURBINE_SIDE_ACTIVE, - STEAM_TURBINE_BOTTOM_ACTIVE, STEAM_TURBINE_TOP_ACTIVE, BLOCK_BRONZEPREIN, BLOCK_IRREIN, BLOCK_PLASCRETE, BLOCK_TSREIN, OVERLAY_LOCKER, OVERLAY_LOCKER_000, OVERLAY_LOCKER_001, + STEAM_TURBINE_BOTTOM_ACTIVE, STEAM_TURBINE_TOP_ACTIVE, BLOCK_BRONZEPREIN, BLOCK_STEELPREIN, BLOCK_TITANIUMPREIN, BLOCK_NAQUADAHPREIN, BLOCK_NEUTRONIUMPREIN, BLOCK_IRREIN, BLOCK_PLASCRETE, BLOCK_TSREIN, OVERLAY_LOCKER, OVERLAY_LOCKER_000, OVERLAY_LOCKER_001, OVERLAY_LOCKER_002, OVERLAY_LOCKER_003, OVERLAY_LOCKER_004, OVERLAY_LOCKER_005, OVERLAY_LOCKER_006, OVERLAY_LOCKER_007, OVERLAY_LOCKER_008, OVERLAY_LOCKER_009, OVERLAY_LOCKER_010, OVERLAY_LOCKER_011, OVERLAY_LOCKER_012, OVERLAY_LOCKER_013, OVERLAY_LENS, OVERLAY_PIPE, OVERLAY_PIPE_IN, OVERLAY_PIPE_OUT, OVERLAY_MUFFLER, OVERLAY_CONTROLLER, OVERLAY_ACTIVITYDETECTOR, OVERLAY_ENERGYDETECTOR, OVERLAY_FLUIDDETECTOR, OVERLAY_ITEMDETECTOR, OVERLAY_FUSION1, OVERLAY_FUSION2, OVERLAY_FUSION3, OVERLAY_SCREEN, OVERLAY_QTANK, OVERLAY_QCHEST, OVERLAY_SHUTTER, diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java index 7422e2644c..ec2e6c6016 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java @@ -54,6 +54,10 @@ public class GT_Block_Reinforced extends GT_Generic_Block { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Powderbarrel"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Solid Super Fuel"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Solid Super Fuel"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Steel Reinforced Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Titanium Reinforced Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Naquadah Reinforced Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Neutronium Reinforced Block"); ItemList.Block_BronzePlate.set(new ItemStack(this.setHardness(60.0f).setResistance(150.0f), 1, 0)); ItemList.Block_IridiumTungstensteel.set(new ItemStack(this.setHardness(400.0f).setResistance(600.0f), 1, 1)); ItemList.Block_Plascrete.set(new ItemStack(this.setHardness(40.0f).setResistance(100.0f), 1, 2)); @@ -62,6 +66,10 @@ public class GT_Block_Reinforced extends GT_Generic_Block { ItemList.Block_Powderbarrel.set(new ItemStack(this.setHardness(2.5f).setResistance(2.0f), 1, 5)); ItemList.Block_SSFUEL.set(new ItemStack(this.setHardness(2.5f).setResistance(2.0f), 1, 6)); ItemList.Block_MSSFUEL.set(new ItemStack(this.setHardness(2.5f).setResistance(2.0f), 1, 7)); + ItemList.Block_SteelPlate.set(new ItemStack(this.setHardness(150.0f).setResistance(200.0f), 1, 8)); + ItemList.Block_TitaniumPlate.set(new ItemStack(this.setHardness(200.0f).setResistance(300.0f), 1, 9)); + ItemList.Block_NaquadahPlate.set(new ItemStack(this.setHardness(500.0f).setResistance(1000.0f), 1, 10)); + ItemList.Block_NeutroniumPlate.set(new ItemStack(this.setHardness(750.0f).setResistance(2500.0f), 1, 11)); GT_ModHandler.addCraftingRecipe(ItemList.Block_BronzePlate.get(1L, new Object[0]),GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hP ", "PBP", " P ", 'P', OrePrefixes.plate.get(Materials.Bronze), 'B', OrePrefixes.stone.get(Materials.GraniteBlack)}); GT_ModHandler.addCraftingRecipe(ItemList.Block_BronzePlate.get(1L, new Object[0]),GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hP ", "PBP", " P ", 'P', OrePrefixes.plate.get(Materials.Bronze), 'B', OrePrefixes.stone.get(Materials.GraniteRed)}); GT_ModHandler.addCraftingRecipe(ItemList.Block_IridiumTungstensteel.get(1L, new Object[0]),GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hBP", 'P', OrePrefixes.plate.get(Materials.Iridium), 'B', ItemList.Block_TungstenSteelReinforced.get(1L, new Object[0])}); @@ -79,6 +87,8 @@ public class GT_Block_Reinforced extends GT_Generic_Block { public int getHarvestLevel(int aMeta) { if (aMeta == 4||aMeta == 5 || aMeta == 6 || aMeta == 7) return 1; if (aMeta == 2) return 2; + if (aMeta == 9||aMeta == 3 || aMeta == 1) return 5; + if (aMeta == 10||aMeta == 11) return 7; return 4; } @@ -101,6 +111,14 @@ public class GT_Block_Reinforced extends GT_Generic_Block { return Blocks.coal_block.getIcon(0, 0); case 7: return Blocks.coal_block.getIcon(0, 0); + case 8: + return Textures.BlockIcons.BLOCK_STEELPREIN.getIcon(); + case 9: + return Textures.BlockIcons.BLOCK_TITANIUMPREIN.getIcon(); + case 10: + return Textures.BlockIcons.BLOCK_NAQUADAHPREIN.getIcon(); + case 11: + return Textures.BlockIcons.BLOCK_NEUTRONIUMPREIN.getIcon(); } } return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); @@ -118,17 +136,29 @@ public class GT_Block_Reinforced extends GT_Generic_Block { return 60.0F; } if (tMeta == 1) { - return 200.0F; + return 400.0F; } if (tMeta == 2) { - return 40.0F; + return 400.0F; } if (tMeta == 3) { - return 100.0F; + return 250.0F; } if (tMeta == 4||tMeta == 5 || tMeta == 6 || tMeta == 7) { return 0.5F; } + if (tMeta == 8) { + return 150.0F; + } + if (tMeta == 9) { + return 200.0F; + } + if (tMeta == 10) { + return 500.0F; + } + if (tMeta == 11) { + return 750.0F; + } return Blocks.iron_block.getBlockHardness(aWorld, aX, aY, aZ); } @@ -155,6 +185,19 @@ public class GT_Block_Reinforced extends GT_Generic_Block { if (tMeta == 5) { return 1.0F; } + if (tMeta == 8) { + return 200.0F; + } + if (tMeta == 9) { + return 300.0F; + } + if (tMeta == 10) { + return 1000.0F; + } + if (tMeta == 11) { + return 2500.0F; + + } return super.getExplosionResistance(par1Entity, world, x, y, z, explosionX, explosionY, explosionZ); } diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BRONZEPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BRONZEPREIN.png index d314d50ee3..fb56f12c85 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BRONZEPREIN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BRONZEPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IRREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IRREIN.png index 7e4c63cee1..97f48411b1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IRREIN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IRREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png new file mode 100644 index 0000000000..a4828d2439 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png new file mode 100644 index 0000000000..42a2d3dbe3 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png new file mode 100644 index 0000000000..f2359665cd Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png new file mode 100644 index 0000000000..1db84e04c8 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TSREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TSREIN.png index d0ea9e6113..5a93336b04 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TSREIN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TSREIN.png differ -- cgit From a04ec622d8eb82ac66deb69d0f4bf4bc58a522f0 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 3 Mar 2019 11:44:35 +0100 Subject: add a second intput slots to the cutter to add a circuit --- .../api/interfaces/internal/IGT_RecipeAdder.java | 4 +++- src/main/java/gregtech/common/GT_RecipeAdder.java | 17 ++++++++++++++++- .../loaders/postload/GT_MachineRecipeLoader.java | 8 ++++---- .../loaders/preload/GT_Loader_MetaTileEntities.java | 8 ++++---- .../gregtech/textures/gui/basicmachines/Cutter2.png | Bin 0 -> 5160 bytes 5 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java index 5cf094fcb2..59b69f0fd0 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -464,7 +464,9 @@ public interface IGT_RecipeAdder { */ public boolean addCutterRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt); - public boolean addCutterRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, boolean aCleanroom); + public boolean addCutterRecipe(ItemStack aInput, ItemStack aCircuit, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt); + + public boolean addCutterRecipe(ItemStack aInput, ItemStack aCircuit, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, boolean aCleanroom); /** * Adds a Boxing Recipe diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index b7f075777d..36901870f6 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -328,7 +328,22 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } - public boolean addCutterRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, boolean aCleanroom) { + @Override + public boolean addCutterRecipe(ItemStack aInput, ItemStack aCircuit, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt) { + if ((aInput == null) || (aOutput1 == null)) { + return false; + } + if ((aDuration = GregTech_API.sRecipeFile.get("cutting", aInput, aDuration)) <= 0) { + return false; + + } + GT_Recipe.GT_Recipe_Map.sCutterRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput1, aOutput2}, null, new FluidStack[]{Materials.Water.getFluid(Math.max(4, Math.min(1000, aDuration * aEUt / 320)))}, null, aDuration * 2, aEUt, 0); + GT_Recipe.GT_Recipe_Map.sCutterRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput1, aOutput2}, null, new FluidStack[]{GT_ModHandler.getDistilledWater(Math.max(3, Math.min(750, aDuration * aEUt / 426)))}, null, aDuration * 2, aEUt, 0); + GT_Recipe.GT_Recipe_Map.sCutterRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput1, aOutput2}, null, new FluidStack[]{Materials.Lubricant.getFluid(Math.max(1, Math.min(250, aDuration * aEUt / 1280)))}, null, aDuration, aEUt, 0); + return true; + } + + public boolean addCutterRecipe(ItemStack aInput, ItemStack aCircuit, ItemStack aOutput1, ItemStack aOutput2, int aDuration, int aEUt, boolean aCleanroom) { if ((aInput == null) || (aOutput1 == null)) { return false; } diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 3db8e05d0b..91c1588368 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -781,13 +781,13 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 32), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.GalliumArsenide, 1), null, null, ItemList.Circuit_Silicon_Ingot.get(1, new Object[0]), null, 9000, 120, 1784); GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot.get(1, new Object[0]), ItemList.Circuit_Silicon_Wafer.get(16, new Object[0]), null, 400, 30); GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 64), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 8), Materials.Nitrogen.getGas(8000), null, ItemList.Circuit_Silicon_Ingot2.get(1, new Object[0]), null, 12000, 480, 2484); - GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot2.get(1, new Object[0]), ItemList.Circuit_Silicon_Wafer2.get(32, new Object[0]), null, 800, 120, true); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot2.get(1, new Object[0]), GT_Values.NI, ItemList.Circuit_Silicon_Wafer2.get(32, new Object[0]), null, 800, 120, true); GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Silicon, 16), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1), Materials.Argon.getGas(8000), null, ItemList.Circuit_Silicon_Ingot3.get(1, new Object[0]), null, 15000, 1920, 4484); - GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot3.get(1, new Object[0]), ItemList.Circuit_Silicon_Wafer3.get(64, new Object[0]), null, 1600, 480, true); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot3.get(1, new Object[0]), GT_Values.NI, ItemList.Circuit_Silicon_Wafer3.get(64, new Object[0]), null, 1600, 480, true); GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Silicon, 32), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Europium, 2), Materials.Radon.getGas(8000), null, ItemList.Circuit_Silicon_Ingot4.get(1, new Object[0]), null, 18000, 7680, 6484); - GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot4.get(1, new Object[0]), ItemList.Circuit_Silicon_Wafer4.get(64, new Object[0]), ItemList.Circuit_Silicon_Wafer4.get(32, new Object[0]), 2400, 1920, true); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot4.get(1, new Object[0]), GT_Values.NI, ItemList.Circuit_Silicon_Wafer4.get(64, new Object[0]), ItemList.Circuit_Silicon_Wafer4.get(32, new Object[0]), 2400, 1920, true); GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Silicon, 64), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Americium, 4), Materials.Radon.getGas(16000), null, ItemList.Circuit_Silicon_Ingot5.get(1, new Object[0]), null, 21000, 30720, 9000); - GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot5.get(1, new Object[0]), ItemList.Circuit_Silicon_Wafer5.get(64, new Object[0]), ItemList.Circuit_Silicon_Wafer5.get(64, new Object[0]), 3200, 7680, true); + GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot5.get(1, new Object[0]), GT_Values.NI, ItemList.Circuit_Silicon_Wafer5.get(64, new Object[0]), ItemList.Circuit_Silicon_Wafer5.get(64, new Object[0]), 3200, 7680, true); GT_Values.RA.addAssemblerRecipe(new ItemStack(Blocks.redstone_torch, 2, 32767), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), Materials.Concrete.getMolten(144L), new ItemStack(Items.repeater, 1, 0), 80, 10); GT_Values.RA.addAssemblerRecipe(new ItemStack(Items.leather, 1, 32767), new ItemStack(Items.lead, 1, 32767), Materials.Glue.getFluid(72L), new ItemStack(Items.name_tag, 1, 0), 100, 8); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 32bf572192..9e6649c7d5 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -580,10 +580,10 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI //ItemList.Machine_UV_Compressor.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(248, "basicmachine.compressor.tier.08", "Singularity Compressor", 8, "Compress-O-Matic C77", GT_Recipe.GT_Recipe_Map.sCompressorRecipes, 1, 1, 0, 0, 1, "Compressor.png", (String) GregTech_API.sSoundList.get(Integer.valueOf(203)), aBoolConst_0, aBoolConst_0, 0, "COMPRESSOR", new Object[]{aTextWireCoil, aTextPlateMotor, aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE}).getStackForm(1L)); ItemList.Machine_LV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(251, "basicmachine.cutter.tier.01", "Basic Cutting Machine", 1, "Slice'N Dice", GT_Recipe.GT_Recipe_Map.sCutterRecipes, 1, 2, 1000, 0, 1, "Cutter.png", "", aBoolConst_0, aBoolConst_0, 0, "CUTTER", new Object[]{"WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade}).getStackForm(1L)); - ItemList.Machine_MV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(252, "basicmachine.cutter.tier.02", "Advanced Cutting Machine", 2, "Slice'N Dice", GT_Recipe.GT_Recipe_Map.sCutterRecipes, 1, 2, 1000, 0, 1, "Cutter.png", "", aBoolConst_0, aBoolConst_0, 0, "CUTTER", new Object[]{"WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade}).getStackForm(1L)); - ItemList.Machine_HV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(253, "basicmachine.cutter.tier.03", "Advanced Cutting Machine II", 3, "Slice'N Dice", GT_Recipe.GT_Recipe_Map.sCutterRecipes, 1, 2, 1000, 0, 1, "Cutter.png", "", aBoolConst_0, aBoolConst_0, 0, "CUTTER", new Object[]{"WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade}).getStackForm(1L)); - ItemList.Machine_EV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(254, "basicmachine.cutter.tier.04", "Advanced Cutting Machine III", 4, "Slice'N Dice", GT_Recipe.GT_Recipe_Map.sCutterRecipes, 1, 2, 1000, 0, 1, "Cutter.png", "", aBoolConst_0, aBoolConst_0, 0, "CUTTER", new Object[]{"WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade}).getStackForm(1L)); - ItemList.Machine_IV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(255, "basicmachine.cutter.tier.05", "Advanced Cutting Machine IV", 5, "Slice'N Dice", GT_Recipe.GT_Recipe_Map.sCutterRecipes, 1, 2, 1000, 0, 1, "Cutter.png", "", aBoolConst_0, aBoolConst_0, 0, "CUTTER", new Object[]{"WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade}).getStackForm(1L)); + ItemList.Machine_MV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(252, "basicmachine.cutter.tier.02", "Advanced Cutting Machine", 2, "Slice'N Dice", GT_Recipe.GT_Recipe_Map.sCutterRecipes, 2, 2, 1000, 0, 1, "Cutter2.png", "", aBoolConst_0, aBoolConst_0, 0, "CUTTER", new Object[]{"WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade}).getStackForm(1L)); + ItemList.Machine_HV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(253, "basicmachine.cutter.tier.03", "Advanced Cutting Machine II", 3, "Slice'N Dice", GT_Recipe.GT_Recipe_Map.sCutterRecipes, 2, 2, 1000, 0, 1, "Cutter2.png", "", aBoolConst_0, aBoolConst_0, 0, "CUTTER", new Object[]{"WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade}).getStackForm(1L)); + ItemList.Machine_EV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(254, "basicmachine.cutter.tier.04", "Advanced Cutting Machine III", 4, "Slice'N Dice", GT_Recipe.GT_Recipe_Map.sCutterRecipes, 2, 2, 1000, 0, 1, "Cutter2.png", "", aBoolConst_0, aBoolConst_0, 0, "CUTTER", new Object[]{"WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade}).getStackForm(1L)); + ItemList.Machine_IV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(255, "basicmachine.cutter.tier.05", "Advanced Cutting Machine IV", 5, "Slice'N Dice", GT_Recipe.GT_Recipe_Map.sCutterRecipes, 2, 2, 1000, 0, 1, "Cutter2.png", "", aBoolConst_0, aBoolConst_0, 0, "CUTTER", new Object[]{"WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade}).getStackForm(1L)); //ItemList.Machine_LuV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(256, "basicmachine.cutter.tier.06", "Advanced Cutting Machine V", 6, "Slice'N Dice", GT_Recipe.GT_Recipe_Map.sCutterRecipes, 1, 2, 1000, 0, 1, "Cutter.png", "", aBoolConst_0, aBoolConst_0, 0, "CUTTER", new Object[]{"WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade}).getStackForm(1L)); //ItemList.Machine_ZPM_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(257, "basicmachine.cutter.tier.07", "Advanced Cutting Machine VI", 7, "Slice'N Dice", GT_Recipe.GT_Recipe_Map.sCutterRecipes, 1, 2, 1000, 0, 1, "Cutter.png", "", aBoolConst_0, aBoolConst_0, 0, "CUTTER", new Object[]{"WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade}).getStackForm(1L)); //ItemList.Machine_UV_Cutter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(258, "basicmachine.cutter.tier.08", "Advanced Cutting Machine VII", 8, "Slice'N Dice", GT_Recipe.GT_Recipe_Map.sCutterRecipes, 1, 2, 1000, 0, 1, "Cutter.png", "", aBoolConst_0, aBoolConst_0, 0, "CUTTER", new Object[]{"WCG", "VMB", "CWE", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS, 'B', OreDictNames.craftingDiamondBlade}).getStackForm(1L)); diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png new file mode 100644 index 0000000000..57d556dc77 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png differ -- cgit From 240a0803f4ecfe2e4e0e0f55a608bde8e5bf4596 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 3 Mar 2019 22:13:34 +0100 Subject: Grammar/Spelling in Achievement #4141 https://github.com/GTNewHorizons/NewHorizons/issues/4141 --- src/main/resources/assets/gregtech/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 002824c0a2..d4b8009f6b 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -567,7 +567,7 @@ achievement.electricproblems=Electric Problems achievement.electricproblems.desc=Lose a Machine due to Overvoltage achievement.ebf=Electric Blast Furnace achievement.ebf.desc=Craft an Electric Blast Furnace -achievement.energyhatch=You need 2 of them (3 if you did not fully fixed it) +achievement.energyhatch=You need 2 of them (3 if the EBF has maintenance issues) achievement.energyhatch.desc=Craft a LV Energy Hatch achievement.gtaluminium=Aluminium achievement.gtaluminium.desc=Produce an Aluminium Ingot -- cgit From 1d1074af2d3026698976ecee207772e4537e1add Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 3 Mar 2019 22:15:11 +0100 Subject: Achievement Misspelled #4139 https://github.com/GTNewHorizons/NewHorizons/issues/4139 --- src/main/resources/assets/gregtech/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index d4b8009f6b..f294afa83b 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -559,7 +559,7 @@ achievement.filterregulate=Filter and Regulate achievement.filterregulate.desc=Get an Item Filter achievement.steampower=Steampower achievement.steampower.desc=Craft a Basic Steam Turbine -achievement.batterys=Batterys +achievement.batterys=Batteries achievement.batterys.desc=Craft a Battery Buffer achievement.badweather=Bad Weather achievement.badweather.desc=Forget to build a Roof above your Machines -- cgit From 2d8cbff191745bad46125cf492486f73b781e26a Mon Sep 17 00:00:00 2001 From: ImgBotApp Date: Wed, 22 May 2019 10:23:20 +0000 Subject: [ImgBot] Optimize images *Total -- 6,158.30kb -> 1,661.45kb (73.02%) /src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.png -- 259.40kb -> 0.88kb (99.66%) /src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png -- 256.77kb -> 1.04kb (99.6%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.png -- 15.60kb -> 0.83kb (94.67%) /src/main/resources/assets/gregtech/textures/DevCape.png -- 513.17kb -> 32.23kb (93.72%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png -- 35.28kb -> 2.37kb (93.28%) /src/main/resources/assets/gregtech/textures/TecCape.png -- 1,539.07kb -> 109.27kb (92.9%) /src/main/resources/assets/gregtech/textures/DonorCape.png -- 384.95kb -> 32.55kb (91.54%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_SIDES.png -- 8.24kb -> 0.74kb (91.08%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png -- 4.17kb -> 0.37kb (91.05%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png -- 2.74kb -> 0.30kb (88.93%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadMallet.png -- 2.82kb -> 0.33kb (88.24%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png -- 2.87kb -> 0.35kb (87.96%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.1.png -- 2.79kb -> 0.34kb (87.9%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.1.png -- 2.79kb -> 0.34kb (87.9%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.1.png -- 2.79kb -> 0.34kb (87.9%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.1.png -- 2.79kb -> 0.34kb (87.9%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.1.png -- 2.79kb -> 0.34kb (87.9%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png -- 2.89kb -> 0.35kb (87.82%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/SAND/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/DULL/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/FINE/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/NONE/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/handleMallet.png -- 2.84kb -> 0.35kb (87.76%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.1.png -- 2.79kb -> 0.34kb (87.76%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.2.png -- 2.85kb -> 0.35kb (87.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Diareed.4.png -- 2.85kb -> 0.35kb (87.6%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png -- 2.85kb -> 0.36kb (87.52%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/78.png -- 2.86kb -> 0.36kb (87.52%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.1.png -- 2.81kb -> 0.35kb (87.51%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.1.png -- 2.81kb -> 0.35kb (87.51%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.2.png -- 2.86kb -> 0.36kb (87.46%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.2.png -- 2.86kb -> 0.36kb (87.46%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.2.png -- 2.86kb -> 0.36kb (87.46%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.2.png -- 2.86kb -> 0.36kb (87.46%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.2.png -- 2.86kb -> 0.36kb (87.46%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png -- 2.84kb -> 0.36kb (87.46%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/69.png -- 2.84kb -> 0.36kb (87.38%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png -- 2.92kb -> 0.37kb (87.36%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.2.png -- 2.88kb -> 0.36kb (87.34%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png -- 2.86kb -> 0.36kb (87.31%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.png -- 2.86kb -> 0.36kb (87.28%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Withereed.4.png -- 2.87kb -> 0.37kb (87.27%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/669.png -- 2.83kb -> 0.36kb (87.2%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.3.png -- 2.94kb -> 0.38kb (87.16%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.3.png -- 2.94kb -> 0.38kb (87.16%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.3.png -- 2.94kb -> 0.38kb (87.16%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.3.png -- 2.94kb -> 0.38kb (87.16%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.3.png -- 2.94kb -> 0.38kb (87.16%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.png -- 2.85kb -> 0.37kb (87.12%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/143.png -- 2.88kb -> 0.37kb (87.1%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png -- 2.87kb -> 0.37kb (87.05%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/140.png -- 2.86kb -> 0.37kb (87.01%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/144.png -- 2.86kb -> 0.37kb (87%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/142.png -- 2.86kb -> 0.37kb (86.99%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/148.png -- 2.86kb -> 0.37kb (86.99%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png -- 2.86kb -> 0.37kb (86.98%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/141.png -- 2.86kb -> 0.37kb (86.98%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/145.png -- 2.85kb -> 0.37kb (86.97%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png -- 2.91kb -> 0.38kb (86.96%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/146.png -- 2.85kb -> 0.37kb (86.96%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png -- 2.89kb -> 0.38kb (86.96%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png -- 2.92kb -> 0.38kb (86.93%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png -- 2.90kb -> 0.38kb (86.93%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.3.png -- 2.95kb -> 0.39kb (86.9%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.png -- 2.89kb -> 0.38kb (86.89%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/147.png -- 2.84kb -> 0.37kb (86.88%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png -- 2.89kb -> 0.38kb (86.82%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE.png -- 6.20kb -> 0.82kb (86.8%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png -- 2.95kb -> 0.39kb (86.77%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png -- 2.91kb -> 0.39kb (86.69%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png -- 2.90kb -> 0.39kb (86.65%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png -- 2.95kb -> 0.40kb (86.6%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png -- 2.96kb -> 0.40kb (86.53%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.4.png -- 3.03kb -> 0.41kb (86.45%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.4.png -- 3.03kb -> 0.41kb (86.45%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png -- 2.93kb -> 0.40kb (86.35%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK.png -- 3.75kb -> 0.52kb (86.21%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.4.png -- 3.00kb -> 0.42kb (86.06%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.2.png -- 2.85kb -> 0.40kb (85.95%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.2.png -- 2.85kb -> 0.40kb (85.95%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.3.png -- 2.90kb -> 0.42kb (85.52%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.3.png -- 2.90kb -> 0.42kb (85.52%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/22.png -- 2.96kb -> 0.43kb (85.46%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.3.png -- 2.94kb -> 0.43kb (85.26%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.4.png -- 2.95kb -> 0.44kb (85.08%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png -- 2.93kb -> 0.44kb (84.92%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/536.png -- 2.99kb -> 0.45kb (84.89%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.4.png -- 3.06kb -> 0.47kb (84.54%) /src/main/resources/assets/gregtech/textures/MrBrainCape.png -- 3.60kb -> 0.59kb (83.63%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png -- 4.17kb -> 0.69kb (83.48%) /src/main/resources/assets/gregtech/textures/BrainTechCape.png -- 3.57kb -> 0.59kb (83.47%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png -- 3.19kb -> 0.53kb (83.45%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELEAF.png -- 2.99kb -> 0.50kb (83.35%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.4.png -- 3.17kb -> 0.53kb (83.31%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png -- 3.06kb -> 0.51kb (83.2%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png -- 3.04kb -> 0.51kb (83.13%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png -- 3.10kb -> 0.53kb (83.03%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.2.png -- 3.10kb -> 0.53kb (83.03%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.2.png -- 3.10kb -> 0.53kb (83.03%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ICHORIUM.png -- 3.00kb -> 0.51kb (82.99%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png -- 3.05kb -> 0.52kb (82.95%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png -- 3.06kb -> 0.52kb (82.91%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png -- 3.05kb -> 0.52kb (82.9%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png -- 3.06kb -> 0.52kb (82.88%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png -- 3.04kb -> 0.52kb (82.87%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png -- 3.05kb -> 0.52kb (82.87%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png -- 3.05kb -> 0.52kb (82.82%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png -- 3.03kb -> 0.52kb (82.81%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.4.png -- 3.06kb -> 0.53kb (82.8%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png -- 3.05kb -> 0.53kb (82.74%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png -- 3.03kb -> 0.52kb (82.73%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png -- 3.02kb -> 0.52kb (82.64%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.4.png -- 3.16kb -> 0.55kb (82.51%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_11.png -- 3.75kb -> 0.67kb (82.04%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_14.png -- 3.75kb -> 0.68kb (81.97%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_13.png -- 3.75kb -> 0.68kb (81.89%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_10.png -- 3.75kb -> 0.68kb (81.89%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_12.png -- 3.75kb -> 0.68kb (81.86%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_15.png -- 3.75kb -> 0.68kb (81.78%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png -- 7.78kb -> 1.42kb (81.76%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png -- 3.22kb -> 0.61kb (81.1%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.3.png -- 3.22kb -> 0.61kb (81.1%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.3.png -- 3.22kb -> 0.61kb (81.1%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/110.png -- 3.01kb -> 0.58kb (80.86%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png -- 3.13kb -> 0.62kb (80.31%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.1.png -- 3.04kb -> 0.60kb (80.22%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.1.png -- 3.04kb -> 0.60kb (80.22%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png -- 3.04kb -> 0.60kb (80.22%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png -- 3.14kb -> 0.62kb (80.22%) /src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png -- 4.26kb -> 0.84kb (80.21%) /src/main/resources/assets/gregtech/textures/gui/multimachines/Advanced_Miner2.png -- 4.27kb -> 0.85kb (80.04%) /src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png -- 4.26kb -> 0.85kb (80%) /src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.png -- 4.21kb -> 0.85kb (79.9%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/106.png -- 3.04kb -> 0.61kb (79.81%) /src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.png -- 4.28kb -> 0.87kb (79.74%) /src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png -- 4.32kb -> 0.88kb (79.71%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_5.png -- 3.75kb -> 0.77kb (79.52%) /src/main/resources/assets/gregtech/textures/gui/multimachines/LargeHeatExchanger.png -- 4.33kb -> 0.89kb (79.45%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png -- 3.32kb -> 0.69kb (79.26%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png -- 3.32kb -> 0.69kb (79.26%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png -- 3.13kb -> 0.65kb (79.1%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_6.png -- 3.75kb -> 0.79kb (79.02%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/21.png -- 3.09kb -> 0.65kb (78.89%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png -- 3.13kb -> 0.66kb (78.85%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_9.png -- 3.75kb -> 0.79kb (78.84%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/376.png -- 2.99kb -> 0.64kb (78.61%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png -- 3.15kb -> 0.68kb (78.36%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/665.png -- 3.16kb -> 0.69kb (78.09%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png -- 3.08kb -> 0.68kb (78.05%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png -- 3.15kb -> 0.69kb (78%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_1.png -- 3.75kb -> 0.83kb (77.93%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.4.png -- 3.17kb -> 0.71kb (77.49%) /src/main/resources/assets/gregtech/textures/gui/Sonictron.png -- 3.63kb -> 0.82kb (77.34%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_8.png -- 3.75kb -> 0.85kb (77.25%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_7.png -- 3.75kb -> 0.85kb (77.25%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/375.png -- 3.02kb -> 0.69kb (77.06%) /src/main/resources/assets/gregtech/textures/gui/4by4.png -- 3.57kb -> 0.82kb (77.04%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png -- 2.96kb -> 0.69kb (76.63%) /src/main/resources/assets/gregtech/textures/gui/3by3.png -- 3.52kb -> 0.82kb (76.6%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png -- 2.99kb -> 0.70kb (76.52%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_AWAKENEDDRACONIUM.png -- 3.14kb -> 0.74kb (76.49%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png -- 3.10kb -> 0.73kb (76.3%) /src/main/resources/assets/gregtech/textures/gui/1by1.png -- 3.37kb -> 0.80kb (76.15%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ELECTRUMFLUX.png -- 3.14kb -> 0.75kb (76.11%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_2.png -- 3.75kb -> 0.90kb (76.05%) /src/main/resources/assets/gregtech/textures/gui/BasicTank.png -- 3.88kb -> 0.93kb (76.01%) /src/main/resources/assets/gregtech/textures/gui/2by2.png -- 3.37kb -> 0.81kb (75.91%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_4.png -- 3.75kb -> 0.92kb (75.45%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_3.png -- 3.75kb -> 0.92kb (75.45%) /src/main/resources/assets/gregtech/textures/gui/multimachines/MultiblockDisplay.png -- 3.56kb -> 0.88kb (75.33%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png -- 3.13kb -> 0.78kb (75.23%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png -- 2.99kb -> 0.75kb (75.03%) /src/main/resources/assets/gregtech/textures/gui/Safe.png -- 3.45kb -> 0.86kb (74.99%) /src/main/resources/assets/gregtech/textures/gui/Teleporter.png -- 3.82kb -> 0.96kb (74.9%) /src/main/resources/assets/gregtech/textures/gui/Maintenance.png -- 3.40kb -> 0.85kb (74.86%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png -- 2.95kb -> 0.75kb (74.64%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png -- 4.67kb -> 1.19kb (74.57%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionReactor.png -- 4.67kb -> 1.19kb (74.57%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png -- 3.04kb -> 0.78kb (74.2%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_0.png -- 3.75kb -> 0.97kb (74.15%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png -- 3.06kb -> 0.80kb (73.95%) /src/main/resources/assets/gregtech/textures/gui/ItemDistributor.png -- 3.99kb -> 1.04kb (73.8%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png -- 3.03kb -> 0.80kb (73.56%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE_IDLE.png -- 2.14kb -> 0.57kb (73.53%) /src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadSoldering.png -- 1.13kb -> 0.31kb (72.88%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png -- 5.04kb -> 1.37kb (72.87%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/325.png -- 3.07kb -> 0.84kb (72.73%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png -- 3.12kb -> 0.85kb (72.69%) /src/main/resources/assets/gregtech/textures/gui/ElectricBufferSmall.png -- 3.85kb -> 1.06kb (72.53%) /src/main/resources/assets/gregtech/textures/gui/ElectricItemCleaner.png -- 3.85kb -> 1.06kb (72.36%) /src/main/resources/assets/gregtech/textures/gui/CropHarvestor.png -- 3.85kb -> 1.06kb (72.36%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png -- 3.15kb -> 0.88kb (72.19%) /src/main/resources/assets/gregtech/textures/gui/AdvancedCraftingTable.png -- 4.23kb -> 1.18kb (72.01%) /src/main/resources/assets/gregtech/textures/gui/Implosion.png -- 4.13kb -> 1.16kb (71.85%) /src/main/resources/assets/gregtech/textures/items/iconsets/HANDLE_SOLDERING.png -- 1.14kb -> 0.32kb (71.82%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.4.png -- 3.40kb -> 0.96kb (71.72%) /src/main/resources/assets/gregtech/textures/items/gt.neutroniumHeatCapacitor.png -- 1.12kb -> 0.32kb (71.67%) /src/main/resources/assets/gregtech/textures/gui/ChestBuffer.png -- 4.41kb -> 1.27kb (71.12%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer.png -- 5.53kb -> 1.61kb (70.97%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png -- 3.64kb -> 1.08kb (70.42%) /src/main/resources/assets/gregtech/textures/gui/ElectricAutoWorkbench.png -- 5.49kb -> 1.64kb (70.15%) /src/main/resources/assets/gregtech/textures/gui/RedstoneCircuitBlock.png -- 4.59kb -> 1.43kb (68.94%) /src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE.png -- 1.20kb -> 0.37kb (68.87%) /src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE.png -- 1.20kb -> 0.37kb (68.87%) /src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL.png -- 1.20kb -> 0.37kb (68.87%) /src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE.png -- 1.20kb -> 0.37kb (68.87%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png -- 3.43kb -> 1.08kb (68.47%) /src/main/resources/assets/gregtech/textures/gui/BronzeBoiler.png -- 4.29kb -> 1.36kb (68.39%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/104.png -- 3.22kb -> 1.02kb (68.37%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.4.png -- 3.40kb -> 1.08kb (68.24%) /src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE.png -- 1.21kb -> 0.39kb (68.09%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png -- 3.21kb -> 1.03kb (68.04%) /src/main/resources/assets/gregtech/textures/gui/multimachines/FusionComputer.png -- 5.16kb -> 1.69kb (67.25%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/101.png -- 3.27kb -> 1.09kb (66.62%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/103.png -- 3.21kb -> 1.09kb (66.15%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png -- 9.88kb -> 3.35kb (66.08%) /src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png -- 1.12kb -> 0.39kb (65.21%) /src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png -- 1.12kb -> 0.39kb (65.21%) /src/main/resources/assets/gregtech/textures/gui/InventoryManager.png -- 6.65kb -> 2.32kb (65.12%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png -- 3.28kb -> 1.14kb (65.09%) /src/main/resources/assets/gregtech/textures/items/gt.MNqCell.png -- 1.12kb -> 0.39kb (64.95%) /src/main/resources/assets/gregtech/textures/items/gt.MNqCellDep.png -- 1.12kb -> 0.40kb (64.17%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/153.png -- 3.85kb -> 1.39kb (63.88%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.png -- 3.85kb -> 1.40kb (63.66%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/151.png -- 3.87kb -> 1.41kb (63.59%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/105.png -- 3.26kb -> 1.19kb (63.51%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png -- 1.12kb -> 0.41kb (63.38%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png -- 1.12kb -> 0.41kb (63.38%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png -- 1.12kb -> 0.41kb (63.38%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png -- 1.12kb -> 0.41kb (63.38%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png -- 1.12kb -> 0.41kb (63.38%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png -- 1.12kb -> 0.41kb (63.38%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png -- 1.12kb -> 0.41kb (63.38%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png -- 1.12kb -> 0.41kb (63.38%) /src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png -- 1.12kb -> 0.41kb (63.03%) /src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png -- 1.12kb -> 0.41kb (63.03%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/40.png -- 3.71kb -> 1.38kb (62.75%) /src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCell.png -- 1.12kb -> 0.42kb (62.69%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.png -- 3.69kb -> 1.38kb (62.56%) /src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCellDep.png -- 1.12kb -> 0.42kb (62.42%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.png -- 3.39kb -> 1.28kb (62.3%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/150.png -- 3.67kb -> 1.40kb (61.94%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/152.png -- 3.66kb -> 1.40kb (61.81%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.png -- 3.75kb -> 1.46kb (61.21%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.png -- 3.55kb -> 1.39kb (60.78%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.png -- 3.47kb -> 1.37kb (60.46%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png -- 14.35kb -> 5.69kb (60.37%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.png -- 3.85kb -> 1.53kb (60.37%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png -- 14.77kb -> 5.86kb (60.33%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.png -- 3.91kb -> 1.58kb (59.56%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.png -- 4.05kb -> 1.65kb (59.2%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png -- 4.05kb -> 1.66kb (59.1%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png -- 4.05kb -> 1.66kb (59.09%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png -- 3.98kb -> 1.63kb (59.09%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/162.png -- 4.05kb -> 1.66kb (59.08%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/160.png -- 4.05kb -> 1.66kb (59.03%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/164.png -- 4.04kb -> 1.66kb (58.99%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png -- 4.00kb -> 1.64kb (58.96%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png -- 12.69kb -> 5.24kb (58.68%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lithium.png -- 12.69kb -> 5.24kb (58.68%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potassium.png -- 12.57kb -> 5.20kb (58.61%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.titaniumtetrachloride.png -- 12.57kb -> 5.20kb (58.61%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel.png -- 13.05kb -> 5.41kb (58.56%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.png -- 4.02kb -> 1.69kb (57.99%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png -- 4.13kb -> 1.74kb (57.94%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/161.png -- 3.73kb -> 1.57kb (57.89%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.png -- 4.02kb -> 1.69kb (57.86%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png -- 3.71kb -> 1.57kb (57.85%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png -- 3.77kb -> 1.59kb (57.81%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png -- 3.77kb -> 1.59kb (57.79%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/163.png -- 3.76kb -> 1.59kb (57.75%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/165.png -- 3.75kb -> 1.59kb (57.6%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.png -- 3.67kb -> 1.56kb (57.54%) /src/main/resources/assets/gregtech/textures/gui/multimachines/LargeBoiler.png -- 2.21kb -> 0.94kb (57.44%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png -- 8.01kb -> 3.41kb (57.4%) /src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png -- 1.12kb -> 0.48kb (57.19%) /src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png -- 1.12kb -> 0.48kb (57.19%) /src/main/resources/assets/gregtech/textures/gui/ComputerCubeRedstone.png -- 2.81kb -> 1.20kb (57.18%) /src/main/resources/assets/gregtech/textures/gui/Tradeomat_Settings.png -- 2.04kb -> 0.87kb (57.07%) /src/main/resources/assets/gregtech/textures/gui/DataAccess4by4.png -- 2.17kb -> 0.93kb (57.01%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png -- 11.99kb -> 5.18kb (56.83%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.png -- 3.86kb -> 1.67kb (56.82%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.reedwater.png -- 13.54kb -> 5.85kb (56.8%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.awkward.png -- 13.54kb -> 5.85kb (56.8%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodium.png -- 13.54kb -> 5.85kb (56.8%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.saltywater.png -- 13.54kb -> 5.85kb (56.8%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.thick.png -- 13.54kb -> 5.85kb (56.8%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mundane.png -- 13.54kb -> 5.85kb (56.8%) /src/main/resources/assets/gregtech/textures/gui/Retriever.png -- 2.34kb -> 1.01kb (56.74%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodiumpersulfate.png -- 11.57kb -> 5.01kb (56.69%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png -- 11.13kb -> 4.84kb (56.5%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_toluene.png -- 11.13kb -> 4.84kb (56.5%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png -- 11.13kb -> 4.84kb (56.5%) /src/main/resources/assets/gregtech/textures/gui/multimachines/ElectricBlastFurnace.png -- 2.16kb -> 0.94kb (56.38%) /src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCell.png -- 1.12kb -> 0.49kb (56.32%) /src/main/resources/assets/gregtech/textures/gui/DataAccess2by2.png -- 2.07kb -> 0.91kb (56.27%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.png -- 4.07kb -> 1.78kb (56.25%) /src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCellDep.png -- 1.12kb -> 0.49kb (56.06%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.png -- 3.78kb -> 1.66kb (56%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.png -- 3.73kb -> 1.65kb (55.94%) /src/main/resources/assets/gregtech/textures/gui/multimachines/VacuumFreezer.png -- 2.07kb -> 0.91kb (55.86%) /src/main/resources/assets/gregtech/textures/gui/multimachines/AssemblyLine.png -- 2.07kb -> 0.91kb (55.86%) /src/main/resources/assets/gregtech/textures/gui/multimachines/ImplosionCompressor.png -- 2.07kb -> 0.91kb (55.86%) /src/main/resources/assets/gregtech/textures/gui/multimachines/ProcessingArray.png -- 2.07kb -> 0.91kb (55.86%) /src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png -- 2.08kb -> 0.92kb (55.85%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png -- 3.05kb -> 1.35kb (55.73%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.png -- 3.71kb -> 1.65kb (55.67%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.png -- 3.70kb -> 1.64kb (55.61%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.png -- 3.59kb -> 1.60kb (55.36%) /src/main/resources/assets/gregtech/textures/gui/multimachines/MultiFurnace.png -- 2.06kb -> 0.92kb (55.32%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Bender.png -- 3.06kb -> 1.37kb (55.28%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png -- 2.57kb -> 1.16kb (54.92%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Default.png -- 2.57kb -> 1.16kb (54.92%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png -- 11.65kb -> 5.26kb (54.83%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Disassembler.png -- 3.13kb -> 1.42kb (54.68%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Fermenter.png -- 2.98kb -> 1.35kb (54.64%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/ArcFurnace.png -- 2.92kb -> 1.33kb (54.58%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/PotionBrewer.png -- 3.09kb -> 1.40kb (54.52%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/766.png -- 3.88kb -> 1.77kb (54.38%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter.png -- 3.03kb -> 1.38kb (54.23%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator4.png -- 3.39kb -> 1.55kb (54.22%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png -- 8.75kb -> 4.02kb (54.03%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png -- 7.28kb -> 3.35kb (53.99%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/RockBreaker.png -- 3.15kb -> 1.46kb (53.67%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/63.png -- 3.75kb -> 1.74kb (53.67%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/61.png -- 3.83kb -> 1.78kb (53.53%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png -- 2.38kb -> 1.10kb (53.51%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator2.png -- 3.21kb -> 1.49kb (53.51%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator1.png -- 3.15kb -> 1.47kb (53.47%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Massfabricator.png -- 3.06kb -> 1.42kb (53.42%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator3.png -- 3.21kb -> 1.50kb (53.41%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png -- 3.60kb -> 1.68kb (53.32%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/OreWasher.png -- 3.38kb -> 1.58kb (53.32%) /src/main/resources/assets/gregtech/textures/gui/MagicAbsorber.png -- 5.59kb -> 2.61kb (53.32%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mineralwater.png -- 11.96kb -> 5.61kb (53.06%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Replicator.png -- 3.09kb -> 1.45kb (53.03%) /src/main/resources/assets/gregtech/textures/gui/Filter.png -- 2.65kb -> 1.24kb (53.02%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png -- 6.95kb -> 3.27kb (52.98%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.redstone.png -- 9.10kb -> 4.29kb (52.9%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Wiremill.png -- 2.90kb -> 1.37kb (52.84%) /src/main/resources/assets/gregtech/textures/gui/TypeFilter.png -- 2.61kb -> 1.23kb (52.83%) /src/main/resources/assets/gregtech/textures/gui/Tradeomat_Inventory.png -- 1.79kb -> 0.84kb (52.81%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.piratebrew.png -- 10.13kb -> 4.79kb (52.76%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/ThermalCentrifuge.png -- 3.13kb -> 1.48kb (52.73%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Lathe.png -- 3.00kb -> 1.42kb (52.61%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Printer.png -- 3.01kb -> 1.43kb (52.6%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Unpackager.png -- 2.92kb -> 1.39kb (52.51%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Recycler.png -- 3.05kb -> 1.45kb (52.5%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Compressor.png -- 2.86kb -> 1.36kb (52.44%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.rum.png -- 10.05kb -> 4.79kb (52.39%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCanner.png -- 3.04kb -> 1.45kb (52.31%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCannerNEI.png -- 3.05kb -> 1.46kb (52.3%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Oven.png -- 2.97kb -> 1.42kb (52.3%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Furnace.png -- 2.97kb -> 1.42kb (52.3%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrocoalfuel.png -- 9.52kb -> 4.55kb (52.2%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.silicon.png -- 9.51kb -> 4.55kb (52.15%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.blaze.png -- 7.38kb -> 3.53kb (52.13%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Scanner.png -- 3.04kb -> 1.46kb (52.05%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidExtractor.png -- 2.98kb -> 1.43kb (51.98%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Packager.png -- 2.95kb -> 1.42kb (51.94%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Extractor.png -- 2.93kb -> 1.41kb (51.9%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/AlloySmelter.png -- 3.01kb -> 1.45kb (51.88%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.milk.png -- 9.72kb -> 4.68kb (51.82%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png -- 9.43kb -> 4.59kb (51.37%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png -- 7.88kb -> 3.92kb (50.32%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/8.png -- 4.14kb -> 2.06kb (50.25%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vodka.png -- 10.08kb -> 5.03kb (50.13%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vinegar.png -- 9.87kb -> 4.95kb (49.88%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.seedoil.png -- 8.67kb -> 4.35kb (49.79%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png -- 8.65kb -> 4.35kb (49.75%) /src/main/resources/assets/gregtech/textures/gui/SolarBoiler.png -- 2.54kb -> 1.28kb (49.73%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/5.png -- 4.14kb -> 2.08kb (49.66%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/4.png -- 4.14kb -> 2.09kb (49.45%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/6.png -- 4.14kb -> 2.10kb (49.3%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.strong.png -- 9.54kb -> 4.84kb (49.23%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wine.png -- 9.54kb -> 4.84kb (49.23%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hotsauce.png -- 9.54kb -> 4.84kb (49.23%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chillysauce.png -- 9.54kb -> 4.84kb (49.23%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.png -- 9.54kb -> 4.84kb (49.23%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diabolosauce.png -- 9.54kb -> 4.84kb (49.23%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/3.png -- 4.14kb -> 2.10kb (49.14%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/7.png -- 4.14kb -> 2.10kb (49.14%) /src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png -- 2.55kb -> 1.30kb (49.12%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/2.png -- 4.14kb -> 2.10kb (49.11%) /src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png -- 1.83kb -> 0.93kb (49.09%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/1.png -- 4.14kb -> 2.11kb (49.09%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png -- 8.12kb -> 4.14kb (49%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Extruder.png -- 3.08kb -> 1.57kb (48.87%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_SIDE.png -- 1.12kb -> 0.57kb (48.74%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_SIDE.png -- 1.12kb -> 0.57kb (48.74%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_BOTTOM.png -- 1.12kb -> 0.57kb (48.74%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_TOP.png -- 1.12kb -> 0.57kb (48.74%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_TOP.png -- 1.12kb -> 0.57kb (48.74%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_BOTTOM.png -- 1.12kb -> 0.57kb (48.74%) /src/main/resources/assets/gregtech/textures/gui/BronzeCraftingTable.png -- 2.00kb -> 1.03kb (48.51%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_SIDE.png -- 1.12kb -> 0.58kb (48.47%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_TOP.png -- 1.12kb -> 0.58kb (48.47%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_BOTTOM.png -- 1.12kb -> 0.58kb (48.47%) /src/main/resources/assets/gregtech/textures/gui/Tradeomat_Main.png -- 1.71kb -> 0.88kb (48.45%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png -- 6.13kb -> 3.17kb (48.36%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricheavy_fuel.png -- 6.12kb -> 3.17kb (48.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png -- 6.12kb -> 3.17kb (48.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png -- 6.12kb -> 3.17kb (48.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png -- 6.12kb -> 3.17kb (48.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lubricant.png -- 6.12kb -> 3.17kb (48.27%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_SIDE.png -- 1.12kb -> 0.58kb (47.95%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_TOP.png -- 1.12kb -> 0.58kb (47.95%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_BOTTOM.png -- 1.12kb -> 0.58kb (47.95%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mercury.png -- 4.65kb -> 2.43kb (47.82%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png -- 6.43kb -> 3.37kb (47.49%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_BOTTOM.png -- 1.12kb -> 0.59kb (47.08%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_SIDE.png -- 1.12kb -> 0.59kb (47.08%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_TOP.png -- 1.12kb -> 0.59kb (47.08%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_BOTTOM.png -- 1.12kb -> 0.59kb (46.99%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_SIDE.png -- 1.12kb -> 0.59kb (46.99%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_TOP.png -- 1.12kb -> 0.59kb (46.99%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Slicer.png -- 3.27kb -> 1.74kb (46.97%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png -- 2.63kb -> 1.41kb (46.29%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wolframium.png -- 8.05kb -> 4.33kb (46.19%) /src/main/resources/assets/gregtech/textures/gui/Regulator.png -- 1.94kb -> 1.05kb (45.87%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png -- 1.12kb -> 0.61kb (45.68%) /src/main/resources/assets/gregtech/textures/gui/armorgui3x3.png -- 3.68kb -> 2.00kb (45.56%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.alcopops.png -- 7.88kb -> 4.29kb (45.52%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.beer.png -- 7.88kb -> 4.29kb (45.52%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonjuice.png -- 7.88kb -> 4.29kb (45.52%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonade.png -- 7.88kb -> 4.29kb (45.52%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.limoncello.png -- 7.88kb -> 4.29kb (45.52%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.potatojuice.png -- 7.88kb -> 4.29kb (45.52%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.leninade.png -- 7.88kb -> 4.29kb (45.52%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyjuice.png -- 7.88kb -> 4.29kb (45.52%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cavejohnsonsgrenadejuice.png -- 7.88kb -> 4.29kb (45.52%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TRINIUM.png -- 0.87kb -> 0.47kb (45.45%) /src/main/resources/assets/gregtech/textures/gui/armorgui3x4.png -- 4.86kb -> 2.65kb (45.4%) /src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png -- 2.29kb -> 1.26kb (44.99%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.png -- 2.71kb -> 1.51kb (44.18%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidHeater.png -- 2.66kb -> 1.49kb (43.92%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/ElectromagneticSeparator.png -- 2.56kb -> 1.44kb (43.91%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png -- 2.72kb -> 1.54kb (43.62%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Distillery.png -- 2.69kb -> 1.52kb (43.44%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Sifter.png -- 2.51kb -> 1.42kb (43.4%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Polarizer.png -- 2.30kb -> 1.31kb (43.35%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.steam.png -- 2.16kb -> 1.23kb (43.24%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png -- 1.12kb -> 0.64kb (42.72%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png -- 2.45kb -> 1.41kb (42.62%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Miner.png -- 2.33kb -> 1.34kb (42.53%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Hammer.png -- 2.28kb -> 1.31kb (42.51%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaArcFurnace.png -- 2.32kb -> 1.33kb (42.48%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png -- 5.35kb -> 3.08kb (42.48%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png -- 5.35kb -> 3.08kb (42.48%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png -- 3.70kb -> 2.13kb (42.48%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Amplifabricator.png -- 2.47kb -> 1.42kb (42.42%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Centrifuge.png -- 2.58kb -> 1.49kb (42.42%) /src/main/resources/assets/gregtech/textures/aspects/NEBRISUM.png -- 2.40kb -> 1.38kb (42.26%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png -- 1.12kb -> 0.65kb (42.11%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Press.png -- 2.38kb -> 1.38kb (42.1%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Canner.png -- 2.45kb -> 1.42kb (42.04%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER.png -- 1.12kb -> 0.65kb (42.02%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TUNGSTENSTEEL.png -- 0.87kb -> 0.50kb (41.98%) /src/main/resources/assets/gregtech/textures/aspects/RADIO.png -- 2.12kb -> 1.24kb (41.77%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png -- 8.34kb -> 4.87kb (41.69%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png -- 6.64kb -> 3.91kb (41.15%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png -- 6.64kb -> 3.91kb (41.15%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyhopsjuice.png -- 7.16kb -> 4.22kb (41.06%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cider.png -- 7.16kb -> 4.22kb (41.06%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hopsjuice.png -- 7.15kb -> 4.22kb (41.02%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.grapejuice.png -- 7.15kb -> 4.22kb (41.02%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE.png -- 0.74kb -> 0.44kb (40.95%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/Electrolyzer.png -- 2.54kb -> 1.50kb (40.87%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png -- 7.13kb -> 4.22kb (40.81%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png -- 7.13kb -> 4.22kb (40.81%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png -- 7.13kb -> 4.22kb (40.81%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricnaphtha.png -- 7.13kb -> 4.22kb (40.81%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_naphtha.png -- 7.13kb -> 4.22kb (40.81%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sufluriclight_fuel.png -- 7.13kb -> 4.22kb (40.81%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png -- 7.09kb -> 4.22kb (40.45%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png -- 8.38kb -> 4.99kb (40.37%) /src/main/resources/assets/gregtech/textures/gui/SteelBoiler.png -- 2.31kb -> 1.38kb (40.36%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.splash.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.splash.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.tea.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweettea.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcoffee.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mcguffium.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cafeaulait.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldenapplejuice.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.scotch.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.applejuice.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.glenmckenner.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcafeaulait.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldencider.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chocolatemilk.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.splash.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.splash.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.splash.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.idunsapplejuice.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.laitaucafe.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkchocolatemilk.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.dragonblood.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.splash.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.splash.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.splash.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkbeer.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.coffee.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.notchesbrew.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.splash.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.splash.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.splash.png -- 7.06kb -> 4.22kb (40.27%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.splash.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.splash.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.uuamplifier.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.purpledrink.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.splash.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.splash.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.splash.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.splash.png -- 7.06kb -> 4.22kb (40.26%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.splash.png -- 7.06kb -> 4.22kb (40.25%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.png -- 7.06kb -> 4.22kb (40.25%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.icetea.png -- 7.06kb -> 4.22kb (40.25%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.splash.png -- 7.06kb -> 4.22kb (40.25%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.png -- 7.06kb -> 4.22kb (40.25%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.splash.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.splash.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.splash.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.splash.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.splash.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.splash.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.splash.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.png -- 7.06kb -> 4.22kb (40.24%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.png -- 7.05kb -> 4.22kb (40.18%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.splash.png -- 7.05kb -> 4.22kb (40.18%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.png -- 7.05kb -> 4.22kb (40.18%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.splash.png -- 7.05kb -> 4.22kb (40.18%) /src/main/resources/assets/gregtech/textures/aspects/MAGNETO.png -- 1.83kb -> 1.10kb (39.85%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.autogenerated.png -- 11.26kb -> 6.85kb (39.12%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.glass.png -- 11.42kb -> 6.97kb (38.93%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png -- 2.35kb -> 1.43kb (38.89%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png -- 2.34kb -> 1.43kb (38.85%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png -- 2.36kb -> 1.45kb (38.37%) /src/main/resources/assets/gregtech/textures/GregTechCape.png -- 0.57kb -> 0.35kb (38.27%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png -- 2.36kb -> 1.46kb (38.25%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png -- 2.42kb -> 1.50kb (38.07%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png -- 2.42kb -> 1.50kb (38.07%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png -- 2.48kb -> 1.54kb (37.9%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png -- 2.49kb -> 1.55kb (37.72%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png -- 6.53kb -> 4.06kb (37.71%) /src/main/resources/assets/gregtech/textures/gui/SuperBuffer.png -- 7.46kb -> 4.67kb (37.42%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png -- 2.40kb -> 1.51kb (37.2%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png -- 2.40kb -> 1.51kb (37.08%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogenplasma.png -- 2.26kb -> 1.43kb (36.78%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.plasma.autogenerated.png -- 2.26kb -> 1.43kb (36.78%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png -- 10.30kb -> 6.51kb (36.75%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png -- 2.47kb -> 1.57kb (36.33%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png -- 2.47kb -> 1.58kb (36.19%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/LaserEngraver.png -- 2.71kb -> 1.73kb (36.05%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE.png -- 0.68kb -> 0.43kb (35.98%) /src/main/resources/assets/gregtech/textures/aspects/STRONTIO.png -- 2.11kb -> 1.36kb (35.84%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE.png -- 0.74kb -> 0.49kb (34.08%) /src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png -- 1.75kb -> 1.18kb (32.42%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE.png -- 0.61kb -> 0.42kb (30.45%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block1.png -- 0.67kb -> 0.48kb (28.8%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block1.png -- 0.67kb -> 0.48kb (28.8%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/COVER_WOOD_PLATE.png -- 0.53kb -> 0.38kb (28.34%) /src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png -- 0.73kb -> 0.54kb (26.93%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block1.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block1.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block4.png -- 0.64kb -> 0.47kb (26.72%) /src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidSolidifier.png -- 2.69kb -> 1.97kb (26.63%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE_MOSSY.png -- 0.91kb -> 0.67kb (26.31%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block1.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block1.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block1.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block1.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block1.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block1.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block2.png -- 0.61kb -> 0.45kb (25.97%) /src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png -- 1.49kb -> 1.11kb (25.65%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE.png -- 0.83kb -> 0.62kb (25%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.4.png -- 0.61kb -> 0.46kb (24.72%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE_MOSSY.png -- 0.90kb -> 0.68kb (24.35%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png -- 4.46kb -> 3.37kb (24.3%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png -- 4.46kb -> 3.37kb (24.3%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png -- 4.46kb -> 3.37kb (24.3%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.squidink.png -- 4.46kb -> 3.37kb (24.3%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png -- 4.46kb -> 3.37kb (24.3%) /src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oil.png -- 4.46kb -> 3.37kb (24.3%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_STEAM_MACERATOR_ACTIVE.png -- 1.34kb -> 1.02kb (24.14%) /src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png -- 1.34kb -> 1.02kb (24.14%) /src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png -- 1.34kb -> 1.02kb (24.14%) /src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png -- 1.34kb -> 1.02kb (24.14%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/763.png -- 1.80kb -> 1.36kb (24.03%) /src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushedPurified.png -- 0.59kb -> 0.45kb (23.71%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block1.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block1.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block1.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block1.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block1.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block1.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block1.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block1.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block1.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block3.png -- 0.63kb -> 0.48kb (23.68%) /src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png -- 0.83kb -> 0.64kb (23.11%) /src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png -- 0.83kb -> 0.64kb (23.11%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE.png -- 0.61kb -> 0.47kb (23.09%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.3.png -- 0.56kb -> 0.43kb (22.74%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CRACKED.png -- 0.59kb -> 0.46kb (22.53%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png -- 0.59kb -> 0.46kb (22.19%) /src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumQuad.png -- 0.72kb -> 0.56kb (21.92%) /src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png -- 1.19kb -> 0.93kb (21.48%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PLASCRETE.png -- 0.49kb -> 0.38kb (21.44%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/CFOAM_HARDENED.png -- 0.49kb -> 0.38kb (21.44%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CRACKED.png -- 0.53kb -> 0.42kb (21.36%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png -- 1.45kb -> 1.15kb (20.8%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE_MOSSY.png -- 0.86kb -> 0.68kb (20.73%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CRACKED.png -- 0.52kb -> 0.41kb (20.64%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ROCK_BREAKER_ACTIVE.png -- 1.39kb -> 1.10kb (20.63%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE_MOSSY.png -- 0.86kb -> 0.68kb (20.55%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.1.png -- 0.69kb -> 0.55kb (20.54%) /src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/plate.png -- 0.66kb -> 0.53kb (19.82%) /src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png -- 0.81kb -> 0.65kb (19.47%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE_MOSSY.png -- 0.81kb -> 0.65kb (19.28%) /src/main/resources/assets/gregtech/textures/items/gt.sensorcard.png -- 1.41kb -> 1.15kb (18.4%) /src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png -- 0.57kb -> 0.47kb (17.86%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_MOSSY.png -- 0.78kb -> 0.64kb (17.83%) /src/main/resources/assets/gregtech/textures/GregoriusCape.png -- 0.96kb -> 0.79kb (17.66%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png -- 1.12kb -> 0.93kb (16.65%) /src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/plate.png -- 0.50kb -> 0.42kb (16.05%) /src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/plate.png -- 0.50kb -> 0.42kb (16.05%) /src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/plate.png -- 0.50kb -> 0.42kb (16.05%) /src/main/resources/assets/gregtech/textures/items/materialicons/SAND/plate.png -- 0.50kb -> 0.42kb (16.05%) /src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/plate.png -- 0.50kb -> 0.42kb (16.05%) /src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/plate.png -- 0.50kb -> 0.42kb (16.05%) /src/main/resources/assets/gregtech/textures/items/materialicons/FINE/plate.png -- 0.50kb -> 0.42kb (16.05%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/488.png -- 0.53kb -> 0.44kb (15.96%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/473.png -- 0.53kb -> 0.45kb (15.72%) /src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumDual.png -- 0.56kb -> 0.47kb (15.51%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/499.png -- 0.52kb -> 0.44kb (15.49%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CRACKED.png -- 0.66kb -> 0.56kb (15.45%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/491.png -- 0.52kb -> 0.44kb (15.01%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE_MOSSY.png -- 0.90kb -> 0.77kb (14.84%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_SIDE.png -- 0.53kb -> 0.46kb (14.1%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_BOTTOM.png -- 0.53kb -> 0.46kb (14.1%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_TOP.png -- 0.53kb -> 0.46kb (14.1%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_MOSSY.png -- 0.75kb -> 0.65kb (14.1%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.4.png -- 0.56kb -> 0.48kb (13.86%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/ore.png -- 0.51kb -> 0.45kb (13.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/ore.png -- 0.51kb -> 0.45kb (13.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/ore.png -- 0.51kb -> 0.45kb (13.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/ore.png -- 0.51kb -> 0.45kb (13.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/ore.png -- 0.51kb -> 0.45kb (13.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/ore.png -- 0.51kb -> 0.45kb (13.47%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/483.png -- 0.58kb -> 0.50kb (13.32%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/481.png -- 0.46kb -> 0.40kb (13.32%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block1.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block1.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block1.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block1.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block1.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block1.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block1.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block1.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block6.png -- 0.49kb -> 0.43kb (13.29%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/479.png -- 0.51kb -> 0.44kb (13.22%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/470.png -- 0.51kb -> 0.44kb (13.05%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/463.png -- 0.52kb -> 0.46kb (13.04%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/562.png -- 0.64kb -> 0.55kb (13.02%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_CRACKED.png -- 0.47kb -> 0.41kb (12.94%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/478.png -- 0.51kb -> 0.44kb (12.88%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/480.png -- 0.51kb -> 0.44kb (12.88%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png -- 0.93kb -> 0.81kb (12.86%) /src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed.png -- 0.49kb -> 0.43kb (12.85%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/498.png -- 0.51kb -> 0.44kb (12.72%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/494.png -- 0.51kb -> 0.44kb (12.72%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/497.png -- 0.51kb -> 0.44kb (12.72%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/482.png -- 0.51kb -> 0.44kb (12.72%) /src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumSimple.png -- 0.52kb -> 0.45kb (12.69%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/723.png -- 0.51kb -> 0.44kb (12.55%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/462.png -- 0.52kb -> 0.45kb (12.5%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_MOSSY.png -- 0.74kb -> 0.65kb (12.29%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/496.png -- 0.50kb -> 0.44kb (12.21%) /src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png -- 0.65kb -> 0.57kb (12.13%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png -- 1.32kb -> 1.16kb (12.1%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.4.png -- 0.50kb -> 0.44kb (12.03%) /src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png -- 0.40kb -> 0.35kb (11.98%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/477.png -- 0.50kb -> 0.44kb (11.87%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_MOSSY.png -- 0.74kb -> 0.65kb (11.82%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_SMOOTH.png -- 0.50kb -> 0.44kb (11.52%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/gem.png -- 0.50kb -> 0.45kb (11.26%) /src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png -- 0.50kb -> 0.44kb (11.13%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/464.png -- 0.51kb -> 0.46kb (11.03%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/490.png -- 0.50kb -> 0.44kb (11%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/484.png -- 0.50kb -> 0.44kb (11%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.3.png -- 0.52kb -> 0.46kb (10.9%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png -- 0.71kb -> 0.63kb (10.76%) /src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingot.png -- 0.47kb -> 0.42kb (10.58%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.3.png -- 0.45kb -> 0.41kb (10.54%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Fertilia.3.png -- 0.45kb -> 0.41kb (10.54%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/220.png -- 0.60kb -> 0.54kb (10.52%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png -- 0.72kb -> 0.64kb (10.45%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png -- 0.72kb -> 0.64kb (10.45%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/240.png -- 0.59kb -> 0.53kb (10.32%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/492.png -- 0.49kb -> 0.44kb (10.3%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/472.png -- 0.51kb -> 0.46kb (10.17%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/489.png -- 0.49kb -> 0.44kb (10.12%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/493.png -- 0.49kb -> 0.44kb (10.12%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CHISELED.png -- 0.45kb -> 0.41kb (9.7%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/483.png -- 0.49kb -> 0.44kb (9.58%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_MOSSY.png -- 0.77kb -> 0.70kb (9.52%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CRACKED.png -- 0.49kb -> 0.44kb (9.46%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/425.png -- 0.60kb -> 0.55kb (9.39%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.3.png -- 0.44kb -> 0.40kb (9.31%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tine.3.png -- 0.44kb -> 0.40kb (9.31%) /src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png -- 0.58kb -> 0.53kb (9.23%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/243.png -- 0.67kb -> 0.61kb (9%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/1.png -- 0.52kb -> 0.47kb (8.99%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/564.png -- 0.61kb -> 0.56kb (8.92%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/487.png -- 0.44kb -> 0.40kb (8.91%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/471.png -- 0.50kb -> 0.46kb (8.81%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/224.png -- 0.67kb -> 0.61kb (8.72%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.3.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bauxia.2.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.2.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.3.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Titania.2.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.2.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.2.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.2.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.3.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png -- 0.51kb -> 0.47kb (8.6%) /src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack_layer_1.png -- 0.51kb -> 0.47kb (8.57%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/11.png -- 0.56kb -> 0.51kb (8.55%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_STONE.png -- 0.41kb -> 0.38kb (8.53%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_MOSSY.png -- 0.68kb -> 0.62kb (8.49%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/567.png -- 0.61kb -> 0.56kb (8.43%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/0.png -- 0.52kb -> 0.47kb (8.3%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/484.png -- 0.53kb -> 0.48kb (8.18%) /src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png -- 0.48kb -> 0.44kb (8.11%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/221.png -- 0.64kb -> 0.59kb (8.04%) /src/main/resources/assets/minecraft/textures/models/armor/lapotronpack_layer_1.png -- 1.23kb -> 1.13kb (7.97%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/3.png -- 0.50kb -> 0.46kb (7.93%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CHISELED.png -- 0.49kb -> 0.45kb (7.63%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/14.png -- 0.54kb -> 0.50kb (7.62%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/474.png -- 0.49kb -> 0.45kb (7.62%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/495.png -- 0.48kb -> 0.44kb (7.55%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/476.png -- 0.48kb -> 0.44kb (7.36%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/241.png -- 0.61kb -> 0.57kb (7.32%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/486.png -- 0.48kb -> 0.44kb (7.17%) /src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/SAND/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/FINE/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/NONE/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/DULL/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/gem.png -- 0.44kb -> 0.41kb (7.1%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS.png -- 0.49kb -> 0.46kb (6.97%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/13.png -- 0.54kb -> 0.50kb (6.88%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Starwart.3.png -- 0.48kb -> 0.45kb (6.69%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Milkwart.3.png -- 0.48kb -> 0.45kb (6.69%) /src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed_OVERLAY.png -- 0.47kb -> 0.44kb (6.67%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS.png -- 0.44kb -> 0.41kb (6.61%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/482.png -- 0.50kb -> 0.46kb (6.48%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CHISELED.png -- 0.56kb -> 0.53kb (6.43%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.4.png -- 0.44kb -> 0.42kb (6.39%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/230.png -- 0.55kb -> 0.52kb (6.37%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/2.png -- 0.51kb -> 0.47kb (6.36%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/485.png -- 0.42kb -> 0.39kb (6.31%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CHISELED.png -- 0.43kb -> 0.41kb (6.11%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.3.png -- 0.45kb -> 0.42kb (5.92%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/722.png -- 0.46kb -> 0.44kb (5.88%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/563.png -- 0.54kb -> 0.51kb (5.79%) /src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png -- 0.71kb -> 0.67kb (5.76%) /src/main/resources/assets/gregtech/textures/items/gt.Quad_ThoriumcellDep.png -- 0.46kb -> 0.43kb (5.76%) /src/main/resources/assets/gregtech/textures/items/gt.Quad_Thoriumcell.png -- 0.46kb -> 0.43kb (5.76%) /src/main/resources/assets/gregtech/textures/items/gt.360k_NaK_Coolantcell.png -- 0.47kb -> 0.44kb (5.63%) /src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/gem.png -- 0.40kb -> 0.38kb (5.61%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.4.png -- 0.51kb -> 0.48kb (5.59%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/4.png -- 0.49kb -> 0.46kb (5.56%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png -- 0.60kb -> 0.57kb (5.52%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCICIUM.png -- 0.53kb -> 0.50kb (5.19%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCILLIUM.png -- 0.53kb -> 0.50kb (5.19%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/419.png -- 0.47kb -> 0.45kb (4.95%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/554.png -- 0.63kb -> 0.59kb (4.84%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png -- 1.15kb -> 1.09kb (4.76%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS.png -- 0.43kb -> 0.41kb (4.55%) /src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png -- 0.58kb -> 0.55kb (4.38%) /src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed_OVERLAY.png -- 0.59kb -> 0.56kb (4.31%) /src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed_OVERLAY.png -- 0.44kb -> 0.42kb (4.26%) /src/main/resources/assets/gregtech/textures/aspects/ELECTRUM.png -- 2.54kb -> 2.44kb (4.03%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PERDITIOCRYSTAL.png -- 0.53kb -> 0.51kb (3.85%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeLarge.png -- 0.44kb -> 0.42kb (3.81%) /src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png -- 0.49kb -> 0.47kb (3.77%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/214.png -- 0.48kb -> 0.46kb (3.49%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/222.png -- 0.66kb -> 0.64kb (3.4%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png -- 1.10kb -> 1.07kb (3.27%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS.png -- 0.54kb -> 0.53kb (3.23%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/5.png -- 0.49kb -> 0.47kb (3.19%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/565.png -- 0.53kb -> 0.51kb (3.14%) /src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png -- 0.53kb -> 0.51kb (3.13%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block5.png -- 0.42kb -> 0.40kb (3.04%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/6.png -- 0.49kb -> 0.47kb (3%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeMedium.png -- 0.43kb -> 0.42kb (2.94%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/427.png -- 0.58kb -> 0.56kb (2.86%) /src/main/resources/assets/gregtech/textures/LogoGTI_Long.png -- 3.92kb -> 3.80kb (2.84%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DILITHIUM.png -- 0.50kb -> 0.48kb (2.56%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ORDOCRYSTAL.png -- 0.50kb -> 0.48kb (2.56%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NETHERSTAR.png -- 0.50kb -> 0.48kb (2.56%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.6.png -- 0.85kb -> 0.83kb (2.53%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/7.png -- 0.49kb -> 0.47kb (2.41%) /src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png -- 0.65kb -> 0.63kb (2.41%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/113.png -- 0.51kb -> 0.50kb (2.31%) /src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png -- 0.47kb -> 0.46kb (2.28%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/242.png -- 0.64kb -> 0.63kb (2.14%) /src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png -- 0.51kb -> 0.50kb (2.12%) /src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/SAND/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/FINE/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/DULL/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/NONE/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/rotor.png -- 0.44kb -> 0.43kb (1.99%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/SAND/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/FINE/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/NONE/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/DULL/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/lens_OVERLAY.png -- 0.55kb -> 0.54kb (1.94%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/223.png -- 0.63kb -> 0.62kb (1.71%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.5.png -- 0.47kb -> 0.46kb (1.67%) /src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png -- 0.53kb -> 0.52kb (1.66%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.4.png -- 0.49kb -> 0.48kb (1.59%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/566.png -- 0.55kb -> 0.54kb (1.59%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/426.png -- 0.57kb -> 0.56kb (1.54%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.5.png -- 0.73kb -> 0.72kb (1.07%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.3.png -- 0.49kb -> 0.48kb (1%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.3.png -- 0.49kb -> 0.48kb (1%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.3.png -- 0.49kb -> 0.48kb (1%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.4.png -- 0.49kb -> 0.48kb (1%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.3.png -- 0.49kb -> 0.48kb (1%) /src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.4.png -- 0.49kb -> 0.48kb (1%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/frameGt.png -- 0.43kb -> 0.43kb (0.91%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/233.png -- 0.62kb -> 0.62kb (0.79%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png -- 0.87kb -> 0.86kb (0.67%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png -- 0.87kb -> 0.86kb (0.67%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png -- 0.87kb -> 0.86kb (0.67%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/16.png -- 0.49kb -> 0.49kb (0.6%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/202.png -- 0.67kb -> 0.66kb (0.59%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeSmall.png -- 0.42kb -> 0.42kb (0.47%) /src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/gem.png -- 0.40kb -> 0.40kb (0.24%) /src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CHISELED.png -- 0.44kb -> 0.43kb (0.22%) /src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/561.png -- 0.54kb -> 0.54kb (0.18%) /src/main/resources/assets/minecraft/textures/models/armor/cloakingdevice_layer_1.png -- 1.22kb -> 1.21kb (0.16%) --- .../assets/gregtech/textures/BrainTechCape.png | Bin 3654 -> 604 bytes .../resources/assets/gregtech/textures/DevCape.png | Bin 525481 -> 33006 bytes .../assets/gregtech/textures/DonorCape.png | Bin 394192 -> 33330 bytes .../assets/gregtech/textures/GregTechCape.png | Bin 588 -> 363 bytes .../assets/gregtech/textures/GregoriusCape.png | Bin 985 -> 811 bytes .../assets/gregtech/textures/LogoGTI_Long.png | Bin 4009 -> 3895 bytes .../assets/gregtech/textures/MrBrainCape.png | Bin 3689 -> 604 bytes .../resources/assets/gregtech/textures/TecCape.png | Bin 1576004 -> 111897 bytes .../assets/gregtech/textures/aspects/ELECTRUM.png | Bin 2606 -> 2501 bytes .../assets/gregtech/textures/aspects/MAGNETO.png | Bin 1877 -> 1129 bytes .../assets/gregtech/textures/aspects/NEBRISUM.png | Bin 2454 -> 1417 bytes .../assets/gregtech/textures/aspects/RADIO.png | Bin 2174 -> 1266 bytes .../assets/gregtech/textures/aspects/STRONTIO.png | Bin 2165 -> 1389 bytes .../centrifuge/OVERLAY_FRONT_ACTIVE.png | Bin 848 -> 652 bytes .../centrifuge/OVERLAY_SIDE_ACTIVE.png | Bin 848 -> 652 bytes .../OVERLAY_FRONT_ACTIVE.png | Bin 832 -> 670 bytes .../laser_engraver/OVERLAY_FRONT_ACTIVE.png | Bin 729 -> 687 bytes .../basicmachines/macerator/OVERLAY_TOP_ACTIVE.png | Bin 1371 -> 1040 bytes .../basicmachines/miner/OVERLAY_TOP_ACTIVE.png | Bin 1371 -> 1040 bytes .../basicmachines/mixer/OVERLAY_TOP_ACTIVE.png | Bin 512 -> 455 bytes .../pulverizer/OVERLAY_TOP_ACTIVE.png | Bin 1371 -> 1040 bytes .../gregtech/textures/blocks/fluids/fluid.air.png | Bin 36130 -> 2428 bytes .../textures/blocks/fluids/fluid.argon.png | Bin 6797 -> 4000 bytes .../textures/blocks/fluids/fluid.berylium.png | Bin 9660 -> 4698 bytes .../textures/blocks/fluids/fluid.bioethanol.png | Bin 7231 -> 4320 bytes .../textures/blocks/fluids/fluid.biomass.png | Bin 6797 -> 4000 bytes .../textures/blocks/fluids/fluid.calcium.png | Bin 14695 -> 5824 bytes .../blocks/fluids/fluid.calciumcarbonate.png | Bin 11401 -> 4960 bytes .../textures/blocks/fluids/fluid.chlorine.png | Bin 15124 -> 6000 bytes .../textures/blocks/fluids/fluid.creosote.png | Bin 7232 -> 4320 bytes .../gregtech/textures/blocks/fluids/fluid.dyes.png | Bin 6580 -> 3455 bytes .../textures/blocks/fluids/fluid.fieryblood.png | Bin 3788 -> 2179 bytes .../textures/blocks/fluids/fluid.fishoil.png | Bin 7265 -> 4326 bytes .../textures/blocks/fluids/fluid.fluorine.png | Bin 12997 -> 5370 bytes .../textures/blocks/fluids/fluid.for.honey.png | Bin 7112 -> 3344 bytes .../gregtech/textures/blocks/fluids/fluid.fuel.png | Bin 7298 -> 4320 bytes .../textures/blocks/fluids/fluid.glyceryl.png | Bin 12278 -> 5300 bytes .../textures/blocks/fluids/fluid.heliumplasma.png | Bin 5475 -> 3149 bytes .../textures/blocks/fluids/fluid.holywater.png | Bin 8205 -> 3495 bytes .../textures/blocks/fluids/fluid.hotfryingoil.png | Bin 2433 -> 1131 bytes .../blocks/fluids/fluid.hydrochloricacid.png | Bin 8311 -> 4239 bytes .../gregtech/textures/blocks/fluids/fluid.ice.png | Bin 8961 -> 4119 bytes .../textures/blocks/fluids/fluid.indigo.png | Bin 11925 -> 5387 bytes .../blocks/fluids/fluid.indiumconcentrate.png | Bin 8576 -> 5114 bytes .../textures/blocks/fluids/fluid.iron3chloride.png | Bin 8856 -> 4450 bytes .../blocks/fluids/fluid.leadzincsolution.png | Bin 8544 -> 4982 bytes .../textures/blocks/fluids/fluid.lifeessence.png | Bin 8072 -> 4010 bytes .../fluids/fluid.liquid_cracked_heavy_fuel.png | Bin 6267 -> 3242 bytes .../fluids/fluid.liquid_cracked_light_fuel.png | Bin 7298 -> 4320 bytes .../blocks/fluids/fluid.liquid_drillingfluid.png | Bin 6267 -> 3242 bytes .../blocks/fluids/fluid.liquid_epichlorhydrin.png | Bin 11401 -> 4960 bytes .../blocks/fluids/fluid.liquid_extra_heavy_oil.png | Bin 4563 -> 3454 bytes .../blocks/fluids/fluid.liquid_heavy_fuel.png | Bin 6267 -> 3242 bytes .../blocks/fluids/fluid.liquid_heavy_oil.png | Bin 4563 -> 3454 bytes .../blocks/fluids/fluid.liquid_light_fuel.png | Bin 7298 -> 4320 bytes .../blocks/fluids/fluid.liquid_light_oil.png | Bin 4563 -> 3454 bytes .../textures/blocks/fluids/fluid.liquid_lpg.png | Bin 5475 -> 3149 bytes .../blocks/fluids/fluid.liquid_medium_oil.png | Bin 4563 -> 3454 bytes .../blocks/fluids/fluid.liquid_naphtha.png | Bin 7298 -> 4320 bytes .../fluids/fluid.liquid_sufluriclight_fuel.png | Bin 7298 -> 4320 bytes .../fluids/fluid.liquid_sulfuricheavy_fuel.png | Bin 6267 -> 3242 bytes .../blocks/fluids/fluid.liquid_sulfuricnaphtha.png | Bin 7298 -> 4320 bytes .../blocks/fluids/fluid.liquid_toluene.png | Bin 11401 -> 4960 bytes .../textures/blocks/fluids/fluid.liquidair.png | Bin 2809 -> 311 bytes .../textures/blocks/fluids/fluid.lithium.png | Bin 12997 -> 5370 bytes .../textures/blocks/fluids/fluid.lubricant.png | Bin 6267 -> 3242 bytes .../textures/blocks/fluids/fluid.mcguffium.png | Bin 7233 -> 4320 bytes .../textures/blocks/fluids/fluid.mercury.png | Bin 4766 -> 2487 bytes .../gregtech/textures/blocks/fluids/fluid.milk.png | Bin 9957 -> 4797 bytes .../blocks/fluids/fluid.molten.autogenerated.png | Bin 11530 -> 7019 bytes .../textures/blocks/fluids/fluid.molten.blaze.png | Bin 7556 -> 3617 bytes .../blocks/fluids/fluid.molten.concrete.png | Bin 7457 -> 3431 bytes .../textures/blocks/fluids/fluid.molten.glass.png | Bin 11695 -> 7142 bytes .../blocks/fluids/fluid.molten.redstone.png | Bin 9322 -> 4391 bytes .../textures/blocks/fluids/fluid.nitrocoalfuel.png | Bin 9745 -> 4658 bytes .../textures/blocks/fluids/fluid.nitrofuel.png | Bin 13364 -> 5538 bytes .../blocks/fluids/fluid.nitrogenplasma.png | Bin 2311 -> 1461 bytes .../gregtech/textures/blocks/fluids/fluid.oil.png | Bin 4563 -> 3454 bytes .../blocks/fluids/fluid.plasma.autogenerated.png | Bin 2311 -> 1461 bytes .../textures/blocks/fluids/fluid.potassium.png | Bin 12870 -> 5327 bytes .../blocks/fluids/fluid.potion.alcopops.png | Bin 8064 -> 4393 bytes .../blocks/fluids/fluid.potion.applejuice.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.awkward.png | Bin 13866 -> 5990 bytes .../textures/blocks/fluids/fluid.potion.beer.png | Bin 8064 -> 4393 bytes .../blocks/fluids/fluid.potion.cafeaulait.png | Bin 7233 -> 4320 bytes .../fluid.potion.cavejohnsonsgrenadejuice.png | Bin 8064 -> 4393 bytes .../blocks/fluids/fluid.potion.chillysauce.png | Bin 9766 -> 4958 bytes .../blocks/fluids/fluid.potion.chocolatemilk.png | Bin 7233 -> 4320 bytes .../textures/blocks/fluids/fluid.potion.cider.png | Bin 7330 -> 4320 bytes .../textures/blocks/fluids/fluid.potion.coffee.png | Bin 7233 -> 4320 bytes .../textures/blocks/fluids/fluid.potion.damage.png | Bin 7229 -> 4320 bytes .../blocks/fluids/fluid.potion.damage.splash.png | Bin 7229 -> 4320 bytes .../blocks/fluids/fluid.potion.damage.strong.png | Bin 7229 -> 4320 bytes .../fluids/fluid.potion.damage.strong.splash.png | Bin 7229 -> 4320 bytes .../blocks/fluids/fluid.potion.darkbeer.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.darkcafeaulait.png | Bin 7233 -> 4320 bytes .../fluids/fluid.potion.darkchocolatemilk.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.darkcoffee.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.diablosauce.png | Bin 9766 -> 4958 bytes .../fluids/fluid.potion.diablosauce.strong.png | Bin 9766 -> 4958 bytes .../blocks/fluids/fluid.potion.diabolosauce.png | Bin 9766 -> 4958 bytes .../blocks/fluids/fluid.potion.dragonblood.png | Bin 7233 -> 4320 bytes .../fluids/fluid.potion.fireresistance.long.png | Bin 7230 -> 4320 bytes .../fluid.potion.fireresistance.long.splash.png | Bin 7230 -> 4320 bytes .../blocks/fluids/fluid.potion.fireresistance.png | Bin 7230 -> 4320 bytes .../fluids/fluid.potion.fireresistance.splash.png | Bin 7230 -> 4320 bytes .../blocks/fluids/fluid.potion.glenmckenner.png | Bin 7233 -> 4320 bytes .../fluids/fluid.potion.goldenapplejuice.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.goldencider.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.grapejuice.png | Bin 7324 -> 4320 bytes .../textures/blocks/fluids/fluid.potion.health.png | Bin 7222 -> 4320 bytes .../blocks/fluids/fluid.potion.health.splash.png | Bin 7222 -> 4320 bytes .../blocks/fluids/fluid.potion.health.strong.png | Bin 7222 -> 4320 bytes .../fluids/fluid.potion.health.strong.splash.png | Bin 7222 -> 4320 bytes .../blocks/fluids/fluid.potion.hopsjuice.png | Bin 7324 -> 4320 bytes .../blocks/fluids/fluid.potion.hotsauce.png | Bin 9766 -> 4958 bytes .../textures/blocks/fluids/fluid.potion.icetea.png | Bin 7230 -> 4320 bytes .../blocks/fluids/fluid.potion.idunsapplejuice.png | Bin 7233 -> 4320 bytes .../fluids/fluid.potion.invisibility.long.png | Bin 7233 -> 4320 bytes .../fluid.potion.invisibility.long.splash.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.invisibility.png | Bin 7233 -> 4320 bytes .../fluids/fluid.potion.invisibility.splash.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.laitaucafe.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.lemonade.png | Bin 8064 -> 4393 bytes .../blocks/fluids/fluid.potion.lemonjuice.png | Bin 8064 -> 4393 bytes .../blocks/fluids/fluid.potion.leninade.png | Bin 8064 -> 4393 bytes .../blocks/fluids/fluid.potion.limoncello.png | Bin 8064 -> 4393 bytes .../blocks/fluids/fluid.potion.mineralwater.png | Bin 12247 -> 5749 bytes .../blocks/fluids/fluid.potion.mundane.png | Bin 13866 -> 5990 bytes .../fluids/fluid.potion.nightvision.long.png | Bin 7229 -> 4320 bytes .../fluid.potion.nightvision.long.splash.png | Bin 7229 -> 4320 bytes .../blocks/fluids/fluid.potion.nightvision.png | Bin 7229 -> 4320 bytes .../fluids/fluid.potion.nightvision.splash.png | Bin 7229 -> 4320 bytes .../blocks/fluids/fluid.potion.notchesbrew.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.piratebrew.png | Bin 10377 -> 4902 bytes .../blocks/fluids/fluid.potion.poison.long.png | Bin 7232 -> 4320 bytes .../fluids/fluid.potion.poison.long.splash.png | Bin 7232 -> 4320 bytes .../textures/blocks/fluids/fluid.potion.poison.png | Bin 7232 -> 4320 bytes .../blocks/fluids/fluid.potion.poison.splash.png | Bin 7232 -> 4320 bytes .../blocks/fluids/fluid.potion.poison.strong.png | Bin 7232 -> 4320 bytes .../fluids/fluid.potion.poison.strong.splash.png | Bin 7232 -> 4320 bytes .../blocks/fluids/fluid.potion.potatojuice.png | Bin 8064 -> 4393 bytes .../blocks/fluids/fluid.potion.purpledrink.png | Bin 7231 -> 4320 bytes .../blocks/fluids/fluid.potion.reedwater.png | Bin 13866 -> 5990 bytes .../blocks/fluids/fluid.potion.regen.long.png | Bin 7231 -> 4320 bytes .../fluids/fluid.potion.regen.long.splash.png | Bin 7231 -> 4320 bytes .../textures/blocks/fluids/fluid.potion.regen.png | Bin 7231 -> 4320 bytes .../blocks/fluids/fluid.potion.regen.splash.png | Bin 7231 -> 4320 bytes .../blocks/fluids/fluid.potion.regen.strong.png | Bin 7231 -> 4320 bytes .../fluids/fluid.potion.regen.strong.splash.png | Bin 7231 -> 4320 bytes .../textures/blocks/fluids/fluid.potion.rum.png | Bin 10296 -> 4902 bytes .../blocks/fluids/fluid.potion.saltywater.png | Bin 13866 -> 5990 bytes .../textures/blocks/fluids/fluid.potion.scotch.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.slowness.long.png | Bin 7233 -> 4320 bytes .../fluids/fluid.potion.slowness.long.splash.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.slowness.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.slowness.splash.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.speed.long.png | Bin 7231 -> 4320 bytes .../fluids/fluid.potion.speed.long.splash.png | Bin 7231 -> 4320 bytes .../textures/blocks/fluids/fluid.potion.speed.png | Bin 7231 -> 4320 bytes .../blocks/fluids/fluid.potion.speed.splash.png | Bin 7231 -> 4320 bytes .../blocks/fluids/fluid.potion.speed.strong.png | Bin 7231 -> 4320 bytes .../fluids/fluid.potion.speed.strong.splash.png | Bin 7231 -> 4320 bytes .../blocks/fluids/fluid.potion.strength.long.png | Bin 7229 -> 4320 bytes .../fluids/fluid.potion.strength.long.splash.png | Bin 7229 -> 4320 bytes .../blocks/fluids/fluid.potion.strength.png | Bin 7229 -> 4320 bytes .../blocks/fluids/fluid.potion.strength.splash.png | Bin 7229 -> 4320 bytes .../blocks/fluids/fluid.potion.strength.strong.png | Bin 7229 -> 4320 bytes .../fluids/fluid.potion.strength.strong.splash.png | Bin 7229 -> 4320 bytes .../blocks/fluids/fluid.potion.sweettea.png | Bin 7233 -> 4320 bytes .../textures/blocks/fluids/fluid.potion.tea.png | Bin 7233 -> 4320 bytes .../textures/blocks/fluids/fluid.potion.thick.png | Bin 13866 -> 5990 bytes .../blocks/fluids/fluid.potion.vinegar.png | Bin 10107 -> 5066 bytes .../textures/blocks/fluids/fluid.potion.vodka.png | Bin 10322 -> 5148 bytes .../fluids/fluid.potion.waterbreathing.long.png | Bin 7233 -> 4320 bytes .../fluid.potion.waterbreathing.long.splash.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.waterbreathing.png | Bin 7233 -> 4320 bytes .../fluids/fluid.potion.waterbreathing.splash.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.weakness.long.png | Bin 7233 -> 4320 bytes .../fluids/fluid.potion.weakness.long.splash.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.weakness.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.weakness.splash.png | Bin 7233 -> 4320 bytes .../blocks/fluids/fluid.potion.wheatyhopsjuice.png | Bin 7330 -> 4320 bytes .../blocks/fluids/fluid.potion.wheatyjuice.png | Bin 8064 -> 4393 bytes .../textures/blocks/fluids/fluid.potion.wine.png | Bin 9766 -> 4958 bytes .../textures/blocks/fluids/fluid.refinedglue.png | Bin 6278 -> 3242 bytes .../textures/blocks/fluids/fluid.seedoil.png | Bin 8876 -> 4457 bytes .../textures/blocks/fluids/fluid.silicon.png | Bin 9734 -> 4658 bytes .../textures/blocks/fluids/fluid.sodium.png | Bin 13866 -> 5990 bytes .../blocks/fluids/fluid.sodiumpersulfate.png | Bin 11851 -> 5133 bytes .../textures/blocks/fluids/fluid.squidink.png | Bin 4563 -> 3454 bytes .../textures/blocks/fluids/fluid.steam.png | Bin 2213 -> 1256 bytes .../blocks/fluids/fluid.titaniumtetrachloride.png | Bin 12870 -> 5327 bytes .../textures/blocks/fluids/fluid.uuamplifier.png | Bin 7231 -> 4320 bytes .../textures/blocks/fluids/fluid.wet.concrete.png | Bin 10116 -> 3431 bytes .../textures/blocks/fluids/fluid.wolframium.png | Bin 8242 -> 4435 bytes .../textures/blocks/iconsets/BASALT_BRICKS.png | Bin 454 -> 424 bytes .../blocks/iconsets/BASALT_BRICKS_CHISELED.png | Bin 464 -> 419 bytes .../blocks/iconsets/BASALT_BRICKS_CRACKED.png | Bin 543 -> 427 bytes .../blocks/iconsets/BASALT_BRICKS_MOSSY.png | Bin 757 -> 664 bytes .../textures/blocks/iconsets/BASALT_COBBLE.png | Bin 757 -> 447 bytes .../blocks/iconsets/BASALT_COBBLE_MOSSY.png | Bin 878 -> 696 bytes .../textures/blocks/iconsets/BLOCK_BLAZE.png | Bin 15979 -> 851 bytes .../textures/blocks/iconsets/BLOCK_DILITHIUM.png | Bin 508 -> 495 bytes .../textures/blocks/iconsets/BLOCK_FORCICIUM.png | Bin 539 -> 511 bytes .../textures/blocks/iconsets/BLOCK_FORCILLIUM.png | Bin 539 -> 511 bytes .../textures/blocks/iconsets/BLOCK_ICHORIUM.png | Bin 3075 -> 523 bytes .../blocks/iconsets/BLOCK_NAQUADAHPREIN.png | Bin 2942 -> 381 bytes .../textures/blocks/iconsets/BLOCK_NETHERSTAR.png | Bin 508 -> 495 bytes .../blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png | Bin 2959 -> 390 bytes .../textures/blocks/iconsets/BLOCK_ORDOCRYSTAL.png | Bin 508 -> 495 bytes .../blocks/iconsets/BLOCK_PERDITIOCRYSTAL.png | Bin 545 -> 524 bytes .../textures/blocks/iconsets/BLOCK_PLASCRETE.png | Bin 499 -> 392 bytes .../textures/blocks/iconsets/BLOCK_STEELEAF.png | Bin 3063 -> 510 bytes .../textures/blocks/iconsets/BLOCK_STEELPREIN.png | Bin 3003 -> 410 bytes .../blocks/iconsets/BLOCK_TITANIUMPREIN.png | Bin 2998 -> 452 bytes .../textures/blocks/iconsets/BLOCK_TRINIUM.png | Bin 891 -> 486 bytes .../blocks/iconsets/BLOCK_TUNGSTENSTEEL.png | Bin 891 -> 517 bytes .../textures/blocks/iconsets/CFOAM_HARDENED.png | Bin 499 -> 392 bytes .../iconsets/CONCRETE_DARK_BRICKS_CHISELED.png | Bin 446 -> 445 bytes .../iconsets/CONCRETE_DARK_BRICKS_CRACKED.png | Bin 497 -> 450 bytes .../blocks/iconsets/CONCRETE_DARK_BRICKS_MOSSY.png | Bin 695 -> 636 bytes .../blocks/iconsets/CONCRETE_DARK_COBBLE.png | Bin 628 -> 483 bytes .../blocks/iconsets/CONCRETE_DARK_COBBLE_MOSSY.png | Bin 830 -> 670 bytes .../blocks/iconsets/CONCRETE_LIGHT_BRICKS.png | Bin 502 -> 467 bytes .../iconsets/CONCRETE_LIGHT_BRICKS_CHISELED.png | Bin 498 -> 460 bytes .../iconsets/CONCRETE_LIGHT_BRICKS_CRACKED.png | Bin 608 -> 471 bytes .../iconsets/CONCRETE_LIGHT_BRICKS_MOSSY.png | Bin 802 -> 659 bytes .../blocks/iconsets/CONCRETE_LIGHT_COBBLE.png | Bin 754 -> 497 bytes .../iconsets/CONCRETE_LIGHT_COBBLE_MOSSY.png | Bin 935 -> 689 bytes .../textures/blocks/iconsets/COVER_WOOD_PLATE.png | Bin 547 -> 392 bytes .../iconsets/GRANITE_BLACK_BRICKS_CRACKED.png | Bin 479 -> 417 bytes .../blocks/iconsets/GRANITE_BLACK_BRICKS_MOSSY.png | Bin 753 -> 664 bytes .../blocks/iconsets/GRANITE_BLACK_COBBLE.png | Bin 624 -> 434 bytes .../blocks/iconsets/GRANITE_BLACK_COBBLE_MOSSY.png | Bin 876 -> 696 bytes .../blocks/iconsets/GRANITE_RED_BRICKS.png | Bin 557 -> 539 bytes .../iconsets/GRANITE_RED_BRICKS_CHISELED.png | Bin 575 -> 538 bytes .../blocks/iconsets/GRANITE_RED_BRICKS_CRACKED.png | Bin 673 -> 569 bytes .../blocks/iconsets/GRANITE_RED_BRICKS_MOSSY.png | Bin 788 -> 713 bytes .../blocks/iconsets/GRANITE_RED_COBBLE.png | Bin 852 -> 639 bytes .../blocks/iconsets/GRANITE_RED_COBBLE_MOSSY.png | Bin 923 -> 786 bytes .../blocks/iconsets/GRANITE_RED_SMOOTH.png | Bin 512 -> 453 bytes .../textures/blocks/iconsets/GRANITE_RED_STONE.png | Bin 422 -> 386 bytes .../textures/blocks/iconsets/INSULATION_LARGE.png | Bin 1147 -> 657 bytes .../blocks/iconsets/INSULATION_MEDIUM_PLUS.png | Bin 1147 -> 956 bytes .../blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png | Bin 890 -> 884 bytes .../blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png | Bin 1131 -> 1094 bytes .../blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png | Bin 1347 -> 1184 bytes .../blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png | Bin 949 -> 827 bytes .../blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png | Bin 1481 -> 1173 bytes .../blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png | Bin 1176 -> 1120 bytes .../blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png | Bin 890 -> 884 bytes .../blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png | Bin 890 -> 884 bytes .../iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png | Bin 737 -> 660 bytes .../blocks/iconsets/MACHINE_CASING_TANK.png | Bin 3837 -> 529 bytes .../blocks/iconsets/MACHINE_CASING_TANK_0.png | Bin 3837 -> 992 bytes .../blocks/iconsets/MACHINE_CASING_TANK_1.png | Bin 3837 -> 847 bytes .../blocks/iconsets/MACHINE_CASING_TANK_10.png | Bin 3837 -> 695 bytes .../blocks/iconsets/MACHINE_CASING_TANK_11.png | Bin 3837 -> 689 bytes .../blocks/iconsets/MACHINE_CASING_TANK_12.png | Bin 3837 -> 696 bytes .../blocks/iconsets/MACHINE_CASING_TANK_13.png | Bin 3837 -> 695 bytes .../blocks/iconsets/MACHINE_CASING_TANK_14.png | Bin 3837 -> 692 bytes .../blocks/iconsets/MACHINE_CASING_TANK_15.png | Bin 3837 -> 699 bytes .../blocks/iconsets/MACHINE_CASING_TANK_2.png | Bin 3837 -> 919 bytes .../blocks/iconsets/MACHINE_CASING_TANK_3.png | Bin 3837 -> 942 bytes .../blocks/iconsets/MACHINE_CASING_TANK_4.png | Bin 3837 -> 942 bytes .../blocks/iconsets/MACHINE_CASING_TANK_5.png | Bin 3837 -> 786 bytes .../blocks/iconsets/MACHINE_CASING_TANK_6.png | Bin 3837 -> 805 bytes .../blocks/iconsets/MACHINE_CASING_TANK_7.png | Bin 3837 -> 873 bytes .../blocks/iconsets/MACHINE_CASING_TANK_8.png | Bin 3837 -> 873 bytes .../blocks/iconsets/MACHINE_CASING_TANK_9.png | Bin 3837 -> 812 bytes .../iconsets/MACHINE_COIL_AWAKENEDDRACONIUM.png | Bin 3211 -> 755 bytes .../blocks/iconsets/MACHINE_COIL_ELECTRUMFLUX.png | Bin 3211 -> 767 bytes .../blocks/iconsets/MACHINE_MAXV_BOTTOM.png | Bin 1147 -> 608 bytes .../textures/blocks/iconsets/MACHINE_MAXV_SIDE.png | Bin 1147 -> 608 bytes .../textures/blocks/iconsets/MACHINE_MAXV_TOP.png | Bin 1147 -> 608 bytes .../blocks/iconsets/MACHINE_MAX_BOTTOM.png | Bin 546 -> 469 bytes .../textures/blocks/iconsets/MACHINE_MAX_SIDE.png | Bin 546 -> 469 bytes .../textures/blocks/iconsets/MACHINE_MAX_TOP.png | Bin 546 -> 469 bytes .../blocks/iconsets/MACHINE_OPV_BOTTOM.png | Bin 1147 -> 597 bytes .../textures/blocks/iconsets/MACHINE_OPV_SIDE.png | Bin 1147 -> 597 bytes .../textures/blocks/iconsets/MACHINE_OPV_TOP.png | Bin 1147 -> 597 bytes .../blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png | Bin 737 -> 660 bytes .../blocks/iconsets/MACHINE_UEV_BOTTOM.png | Bin 1147 -> 588 bytes .../textures/blocks/iconsets/MACHINE_UEV_SIDE.png | Bin 1147 -> 588 bytes .../textures/blocks/iconsets/MACHINE_UEV_TOP.png | Bin 1147 -> 588 bytes .../blocks/iconsets/MACHINE_UIV_BOTTOM.png | Bin 1147 -> 591 bytes .../textures/blocks/iconsets/MACHINE_UIV_SIDE.png | Bin 1147 -> 591 bytes .../textures/blocks/iconsets/MACHINE_UIV_TOP.png | Bin 1147 -> 591 bytes .../blocks/iconsets/MACHINE_UMV_BOTTOM.png | Bin 1147 -> 607 bytes .../textures/blocks/iconsets/MACHINE_UMV_SIDE.png | Bin 1147 -> 607 bytes .../textures/blocks/iconsets/MACHINE_UMV_TOP.png | Bin 1147 -> 607 bytes .../blocks/iconsets/MACHINE_UXV_BOTTOM.png | Bin 1147 -> 588 bytes .../textures/blocks/iconsets/MACHINE_UXV_SIDE.png | Bin 1147 -> 588 bytes .../textures/blocks/iconsets/MACHINE_UXV_TOP.png | Bin 1147 -> 588 bytes .../textures/blocks/iconsets/MARBLE_BRICKS.png | Bin 440 -> 420 bytes .../blocks/iconsets/MARBLE_BRICKS_CHISELED.png | Bin 442 -> 415 bytes .../blocks/iconsets/MARBLE_BRICKS_CRACKED.png | Bin 533 -> 423 bytes .../blocks/iconsets/MARBLE_BRICKS_MOSSY.png | Bin 773 -> 664 bytes .../textures/blocks/iconsets/MARBLE_COBBLE.png | Bin 692 -> 443 bytes .../blocks/iconsets/MARBLE_COBBLE_MOSSY.png | Bin 920 -> 696 bytes .../blocks/iconsets/OVERLAY_AUTOMAINTENANCE.png | Bin 6347 -> 838 bytes .../iconsets/OVERLAY_AUTOMAINTENANCE_IDLE.png | Bin 2187 -> 579 bytes .../blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png | Bin 1147 -> 664 bytes .../blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png | Bin 1147 -> 623 bytes .../iconsets/OVERLAY_FRONT_ROCK_BREAKER_ACTIVE.png | Bin 1425 -> 1131 bytes .../textures/blocks/iconsets/OVERLAY_SCHEST.png | Bin 3400 -> 705 bytes .../textures/blocks/iconsets/OVERLAY_SCREEN.png | Bin 4267 -> 705 bytes .../textures/blocks/iconsets/OVERLAY_STANK.png | Bin 3400 -> 705 bytes .../blocks/iconsets/OVERLAY_TELEPORTER.png | Bin 1147 -> 665 bytes .../blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png | Bin 4267 -> 382 bytes .../blocks/iconsets/OVERLAY_TELEPORTER_SIDES.png | Bin 8439 -> 753 bytes .../OVERLAY_TOP_STEAM_MACERATOR_ACTIVE.png | Bin 1371 -> 1040 bytes .../blocks/materialicons/DIAMOND/block1.png | Bin 642 -> 490 bytes .../blocks/materialicons/DIAMOND/block2.png | Bin 620 -> 459 bytes .../blocks/materialicons/DIAMOND/block3.png | Bin 642 -> 490 bytes .../blocks/materialicons/DIAMOND/block4.png | Bin 655 -> 480 bytes .../blocks/materialicons/DIAMOND/block5.png | Bin 427 -> 414 bytes .../blocks/materialicons/DIAMOND/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/DIAMOND/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/DIAMOND/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/DIAMOND/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/DIAMOND/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/DULL/block1.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/DULL/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/DULL/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/DULL/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/DULL/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/DULL/block6.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/DULL/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/DULL/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/DULL/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/DULL/pipeSmall.png | Bin 429 -> 427 bytes .../blocks/materialicons/EMERALD/block1.png | Bin 642 -> 490 bytes .../blocks/materialicons/EMERALD/block2.png | Bin 620 -> 459 bytes .../blocks/materialicons/EMERALD/block3.png | Bin 642 -> 490 bytes .../blocks/materialicons/EMERALD/block4.png | Bin 655 -> 480 bytes .../blocks/materialicons/EMERALD/block5.png | Bin 427 -> 414 bytes .../blocks/materialicons/EMERALD/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/EMERALD/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/EMERALD/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/EMERALD/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/EMERALD/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/FIERY/block1.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/FIERY/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/FIERY/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/FIERY/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/FIERY/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/FIERY/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/FIERY/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/FIERY/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/FIERY/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/FIERY/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/FINE/block1.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/FINE/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/FINE/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/FINE/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/FINE/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/FINE/block6.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/FINE/frameGt.png | Bin 441 -> 437 bytes .../textures/blocks/materialicons/FINE/ore.png | Bin 527 -> 456 bytes .../blocks/materialicons/FINE/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/FINE/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/FINE/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/FLINT/block1.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/FLINT/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/FLINT/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/FLINT/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/FLINT/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/FLINT/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/FLINT/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/FLINT/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/FLINT/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/FLINT/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/FLUID/block1.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/FLUID/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/FLUID/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/FLUID/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/FLUID/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/FLUID/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/FLUID/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/FLUID/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/FLUID/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/FLUID/pipeSmall.png | Bin 429 -> 427 bytes .../blocks/materialicons/GEM_HORIZONTAL/block1.png | Bin 642 -> 490 bytes .../blocks/materialicons/GEM_HORIZONTAL/block2.png | Bin 620 -> 459 bytes .../blocks/materialicons/GEM_HORIZONTAL/block3.png | Bin 642 -> 490 bytes .../blocks/materialicons/GEM_HORIZONTAL/block4.png | Bin 655 -> 480 bytes .../blocks/materialicons/GEM_HORIZONTAL/block5.png | Bin 427 -> 414 bytes .../blocks/materialicons/GEM_HORIZONTAL/block6.png | Bin 504 -> 437 bytes .../materialicons/GEM_HORIZONTAL/frameGt.png | Bin 441 -> 437 bytes .../materialicons/GEM_HORIZONTAL/pipeLarge.png | Bin 446 -> 429 bytes .../materialicons/GEM_HORIZONTAL/pipeMedium.png | Bin 442 -> 429 bytes .../materialicons/GEM_HORIZONTAL/pipeSmall.png | Bin 429 -> 427 bytes .../blocks/materialicons/GEM_VERTICAL/block1.png | Bin 642 -> 490 bytes .../blocks/materialicons/GEM_VERTICAL/block2.png | Bin 620 -> 459 bytes .../blocks/materialicons/GEM_VERTICAL/block3.png | Bin 642 -> 490 bytes .../blocks/materialicons/GEM_VERTICAL/block4.png | Bin 655 -> 480 bytes .../blocks/materialicons/GEM_VERTICAL/block5.png | Bin 427 -> 414 bytes .../blocks/materialicons/GEM_VERTICAL/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/GEM_VERTICAL/frameGt.png | Bin 441 -> 437 bytes .../materialicons/GEM_VERTICAL/pipeLarge.png | Bin 446 -> 429 bytes .../materialicons/GEM_VERTICAL/pipeMedium.png | Bin 442 -> 429 bytes .../materialicons/GEM_VERTICAL/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/GLASS/block1.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/GLASS/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/GLASS/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/GLASS/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/GLASS/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/GLASS/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/GLASS/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/GLASS/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/GLASS/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/GLASS/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/LAPIS/block1.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/LAPIS/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/LAPIS/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/LAPIS/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/LAPIS/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/LAPIS/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/LAPIS/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/LAPIS/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/LAPIS/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/LAPIS/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/LEAF/block1.png | Bin 684 -> 487 bytes .../textures/blocks/materialicons/LEAF/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/LEAF/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/LEAF/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/LEAF/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/LEAF/block6.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/LEAF/frameGt.png | Bin 441 -> 437 bytes .../textures/blocks/materialicons/LEAF/ore.png | Bin 527 -> 456 bytes .../blocks/materialicons/LIGNITE/block1.png | Bin 620 -> 459 bytes .../blocks/materialicons/LIGNITE/block2.png | Bin 620 -> 459 bytes .../blocks/materialicons/LIGNITE/block3.png | Bin 642 -> 490 bytes .../blocks/materialicons/LIGNITE/block4.png | Bin 655 -> 480 bytes .../blocks/materialicons/LIGNITE/block5.png | Bin 427 -> 414 bytes .../blocks/materialicons/LIGNITE/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/LIGNITE/frameGt.png | Bin 441 -> 437 bytes .../textures/blocks/materialicons/LIGNITE/ore.png | Bin 527 -> 456 bytes .../blocks/materialicons/LIGNITE/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/LIGNITE/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/LIGNITE/pipeSmall.png | Bin 429 -> 427 bytes .../blocks/materialicons/MAGNETIC/block1.png | Bin 504 -> 437 bytes .../blocks/materialicons/MAGNETIC/block2.png | Bin 620 -> 459 bytes .../blocks/materialicons/MAGNETIC/block3.png | Bin 642 -> 490 bytes .../blocks/materialicons/MAGNETIC/block4.png | Bin 655 -> 480 bytes .../blocks/materialicons/MAGNETIC/block5.png | Bin 427 -> 414 bytes .../blocks/materialicons/MAGNETIC/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/MAGNETIC/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/MAGNETIC/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/MAGNETIC/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/MAGNETIC/pipeSmall.png | Bin 429 -> 427 bytes .../blocks/materialicons/METALLIC/block1.png | Bin 504 -> 437 bytes .../blocks/materialicons/METALLIC/block2.png | Bin 620 -> 459 bytes .../blocks/materialicons/METALLIC/block3.png | Bin 642 -> 490 bytes .../blocks/materialicons/METALLIC/block4.png | Bin 655 -> 480 bytes .../blocks/materialicons/METALLIC/block5.png | Bin 427 -> 414 bytes .../blocks/materialicons/METALLIC/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/METALLIC/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/METALLIC/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/METALLIC/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/METALLIC/pipeSmall.png | Bin 429 -> 427 bytes .../blocks/materialicons/NETHERSTAR/block1.png | Bin 642 -> 490 bytes .../blocks/materialicons/NETHERSTAR/block2.png | Bin 620 -> 459 bytes .../blocks/materialicons/NETHERSTAR/block3.png | Bin 642 -> 490 bytes .../blocks/materialicons/NETHERSTAR/block4.png | Bin 655 -> 480 bytes .../blocks/materialicons/NETHERSTAR/block5.png | Bin 427 -> 414 bytes .../blocks/materialicons/NETHERSTAR/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/NETHERSTAR/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/NETHERSTAR/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/NETHERSTAR/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/NETHERSTAR/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/NONE/block1.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/NONE/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/NONE/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/NONE/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/NONE/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/NONE/block6.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/NONE/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/NONE/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/NONE/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/NONE/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/OPAL/block1.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/OPAL/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/OPAL/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/OPAL/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/OPAL/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/OPAL/block6.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/OPAL/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/OPAL/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/OPAL/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/OPAL/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/PAPER/block1.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/PAPER/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/PAPER/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/PAPER/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/PAPER/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/PAPER/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/PAPER/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/PAPER/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/PAPER/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/PAPER/pipeSmall.png | Bin 429 -> 427 bytes .../blocks/materialicons/POWDER/block1.png | Bin 620 -> 459 bytes .../blocks/materialicons/POWDER/block2.png | Bin 620 -> 459 bytes .../blocks/materialicons/POWDER/block3.png | Bin 642 -> 490 bytes .../blocks/materialicons/POWDER/block4.png | Bin 655 -> 480 bytes .../blocks/materialicons/POWDER/block5.png | Bin 427 -> 414 bytes .../blocks/materialicons/POWDER/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/POWDER/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/POWDER/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/POWDER/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/POWDER/pipeSmall.png | Bin 429 -> 427 bytes .../blocks/materialicons/QUARTZ/block1.png | Bin 504 -> 437 bytes .../blocks/materialicons/QUARTZ/block2.png | Bin 620 -> 459 bytes .../blocks/materialicons/QUARTZ/block3.png | Bin 642 -> 490 bytes .../blocks/materialicons/QUARTZ/block4.png | Bin 655 -> 480 bytes .../blocks/materialicons/QUARTZ/block5.png | Bin 427 -> 414 bytes .../blocks/materialicons/QUARTZ/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/QUARTZ/frameGt.png | Bin 441 -> 437 bytes .../textures/blocks/materialicons/QUARTZ/ore.png | Bin 527 -> 456 bytes .../blocks/materialicons/QUARTZ/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/QUARTZ/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/QUARTZ/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/ROUGH/block1.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/ROUGH/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/ROUGH/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/ROUGH/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/ROUGH/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/ROUGH/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/ROUGH/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/ROUGH/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/ROUGH/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/ROUGH/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/RUBY/block1.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/RUBY/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/RUBY/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/RUBY/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/RUBY/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/RUBY/block6.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/RUBY/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/RUBY/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/RUBY/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/RUBY/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/SAND/block1.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/SAND/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/SAND/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/SAND/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/SAND/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/SAND/block6.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/SAND/frameGt.png | Bin 441 -> 437 bytes .../textures/blocks/materialicons/SAND/ore.png | Bin 527 -> 456 bytes .../blocks/materialicons/SAND/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/SAND/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/SAND/pipeSmall.png | Bin 429 -> 427 bytes .../blocks/materialicons/SHARDS/block1.png | Bin 642 -> 490 bytes .../blocks/materialicons/SHARDS/block2.png | Bin 620 -> 459 bytes .../blocks/materialicons/SHARDS/block3.png | Bin 642 -> 490 bytes .../blocks/materialicons/SHARDS/block4.png | Bin 655 -> 480 bytes .../blocks/materialicons/SHARDS/block5.png | Bin 427 -> 414 bytes .../blocks/materialicons/SHARDS/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/SHARDS/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/SHARDS/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/SHARDS/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/SHARDS/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/SHINY/block1.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/SHINY/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/SHINY/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/SHINY/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/SHINY/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/SHINY/block6.png | Bin 504 -> 437 bytes .../blocks/materialicons/SHINY/frameGt.png | Bin 441 -> 437 bytes .../blocks/materialicons/SHINY/pipeLarge.png | Bin 446 -> 429 bytes .../blocks/materialicons/SHINY/pipeMedium.png | Bin 442 -> 429 bytes .../blocks/materialicons/SHINY/pipeSmall.png | Bin 429 -> 427 bytes .../textures/blocks/materialicons/WOOD/block1.png | Bin 684 -> 487 bytes .../textures/blocks/materialicons/WOOD/block2.png | Bin 620 -> 459 bytes .../textures/blocks/materialicons/WOOD/block3.png | Bin 642 -> 490 bytes .../textures/blocks/materialicons/WOOD/block4.png | Bin 655 -> 480 bytes .../textures/blocks/materialicons/WOOD/block5.png | Bin 427 -> 414 bytes .../textures/blocks/materialicons/WOOD/block6.png | Bin 504 -> 437 bytes .../textures/blocks/materialicons/WOOD/frameGt.png | Bin 441 -> 437 bytes .../textures/blocks/materialicons/WOOD/ore.png | Bin 527 -> 456 bytes .../assets/gregtech/textures/gui/1by1.png | Bin 3447 -> 822 bytes .../assets/gregtech/textures/gui/2by2.png | Bin 3453 -> 832 bytes .../assets/gregtech/textures/gui/3by3.png | Bin 3603 -> 843 bytes .../assets/gregtech/textures/gui/4by4.png | Bin 3659 -> 840 bytes .../textures/gui/AdvancedCraftingTable.png | Bin 4330 -> 1212 bytes .../assets/gregtech/textures/gui/BasicTank.png | Bin 3977 -> 954 bytes .../gregtech/textures/gui/BrickedBlastFurnace.png | Bin 2608 -> 1327 bytes .../gregtech/textures/gui/BronzeBlastFurnace.png | Bin 2345 -> 1290 bytes .../assets/gregtech/textures/gui/BronzeBoiler.png | Bin 4397 -> 1390 bytes .../gregtech/textures/gui/BronzeCraftingTable.png | Bin 2053 -> 1057 bytes .../assets/gregtech/textures/gui/ChestBuffer.png | Bin 4515 -> 1304 bytes .../gregtech/textures/gui/ComputerCubeRedstone.png | Bin 2877 -> 1232 bytes .../assets/gregtech/textures/gui/CropHarvestor.png | Bin 3943 -> 1090 bytes .../gregtech/textures/gui/DataAccess2by2.png | Bin 2120 -> 927 bytes .../gregtech/textures/gui/DataAccess4by4.png | Bin 2226 -> 957 bytes .../textures/gui/ElectricAutoWorkbench.png | Bin 5621 -> 1678 bytes .../gregtech/textures/gui/ElectricBufferSmall.png | Bin 3943 -> 1083 bytes .../gregtech/textures/gui/ElectricItemCleaner.png | Bin 3944 -> 1090 bytes .../gregtech/textures/gui/FakeAssemblyline.png | Bin 262931 -> 1061 bytes .../assets/gregtech/textures/gui/Filter.png | Bin 2712 -> 1274 bytes .../assets/gregtech/textures/gui/Implosion.png | Bin 4231 -> 1191 bytes .../gregtech/textures/gui/InventoryManager.png | Bin 6812 -> 2376 bytes .../gregtech/textures/gui/ItemDistributor.png | Bin 4084 -> 1070 bytes .../assets/gregtech/textures/gui/MagicAbsorber.png | Bin 5722 -> 2671 bytes .../assets/gregtech/textures/gui/Maintenance.png | Bin 3480 -> 875 bytes .../gregtech/textures/gui/RedstoneCircuitBlock.png | Bin 4700 -> 1460 bytes .../assets/gregtech/textures/gui/Regulator.png | Bin 1986 -> 1075 bytes .../assets/gregtech/textures/gui/Retriever.png | Bin 2395 -> 1036 bytes .../assets/gregtech/textures/gui/Safe.png | Bin 3531 -> 883 bytes .../assets/gregtech/textures/gui/SolarBoiler.png | Bin 2602 -> 1308 bytes .../assets/gregtech/textures/gui/Sonictron.png | Bin 3716 -> 842 bytes .../assets/gregtech/textures/gui/SteelBoiler.png | Bin 2366 -> 1411 bytes .../assets/gregtech/textures/gui/SuperBuffer.png | Bin 7635 -> 4778 bytes .../assets/gregtech/textures/gui/Teleporter.png | Bin 3909 -> 981 bytes .../gregtech/textures/gui/Tradeomat_Inventory.png | Bin 1831 -> 864 bytes .../gregtech/textures/gui/Tradeomat_Main.png | Bin 1746 -> 900 bytes .../gregtech/textures/gui/Tradeomat_Settings.png | Bin 2085 -> 895 bytes .../assets/gregtech/textures/gui/TypeFilter.png | Bin 2669 -> 1259 bytes .../gregtech/textures/gui/VolumetricFlask.png | Bin 663 -> 647 bytes .../assets/gregtech/textures/gui/armorgui3x3.png | Bin 3764 -> 2049 bytes .../assets/gregtech/textures/gui/armorgui3x4.png | Bin 4978 -> 2718 bytes .../textures/gui/basicmachines/AlloySmelter.png | Bin 3084 -> 1484 bytes .../textures/gui/basicmachines/Amplifabricator.png | Bin 2534 -> 1459 bytes .../textures/gui/basicmachines/ArcFurnace.png | Bin 2994 -> 1360 bytes .../textures/gui/basicmachines/Assembler.png | Bin 3124 -> 1383 bytes .../textures/gui/basicmachines/Assembler2.png | Bin 7966 -> 1453 bytes .../textures/gui/basicmachines/Autoclave.png | Bin 2508 -> 1439 bytes .../gregtech/textures/gui/basicmachines/Bender.png | Bin 3137 -> 1403 bytes .../gui/basicmachines/BronzeAlloySmelter.png | Bin 2541 -> 1578 bytes .../gui/basicmachines/BronzeCompressor.png | Bin 2416 -> 1489 bytes .../textures/gui/basicmachines/BronzeExtractor.png | Bin 2460 -> 1545 bytes .../textures/gui/basicmachines/BronzeFurnace.png | Bin 2482 -> 1537 bytes .../textures/gui/basicmachines/BronzeHammer.png | Bin 2394 -> 1464 bytes .../textures/gui/basicmachines/BronzeMacerator.png | Bin 2532 -> 1612 bytes .../gregtech/textures/gui/basicmachines/Canner.png | Bin 2507 -> 1453 bytes .../textures/gui/basicmachines/Centrifuge.png | Bin 2645 -> 1523 bytes .../textures/gui/basicmachines/ChemicalBath.png | Bin 2696 -> 1448 bytes .../textures/gui/basicmachines/ChemicalReactor.png | Bin 3687 -> 1721 bytes .../gui/basicmachines/CircuitAssembler.png | Bin 2773 -> 1548 bytes .../textures/gui/basicmachines/Compressor.png | Bin 2931 -> 1394 bytes .../gregtech/textures/gui/basicmachines/Cutter.png | Bin 3098 -> 1418 bytes .../textures/gui/basicmachines/Cutter2.png | Bin 5160 -> 1400 bytes .../textures/gui/basicmachines/Default.png | Bin 2631 -> 1186 bytes .../textures/gui/basicmachines/Disassembler.png | Bin 3204 -> 1452 bytes .../gui/basicmachines/DistillationTower.png | Bin 2788 -> 1572 bytes .../textures/gui/basicmachines/Distillery.png | Bin 2753 -> 1557 bytes .../textures/gui/basicmachines/E_Furnace.png | Bin 3042 -> 1451 bytes .../gregtech/textures/gui/basicmachines/E_Oven.png | Bin 3042 -> 1451 bytes .../textures/gui/basicmachines/Electrolyzer.png | Bin 2596 -> 1535 bytes .../gui/basicmachines/ElectromagneticSeparator.png | Bin 2626 -> 1473 bytes .../textures/gui/basicmachines/Extractor.png | Bin 3004 -> 1445 bytes .../textures/gui/basicmachines/Extruder.png | Bin 3153 -> 1612 bytes .../textures/gui/basicmachines/Fermenter.png | Bin 3051 -> 1384 bytes .../textures/gui/basicmachines/FluidCanner.png | Bin 3114 -> 1485 bytes .../textures/gui/basicmachines/FluidCannerNEI.png | Bin 3126 -> 1491 bytes .../textures/gui/basicmachines/FluidExtractor.png | Bin 3049 -> 1464 bytes .../textures/gui/basicmachines/FluidHeater.png | Bin 2721 -> 1526 bytes .../textures/gui/basicmachines/FluidSolidifier.png | Bin 2753 -> 2020 bytes .../textures/gui/basicmachines/FusionReactor.png | Bin 4782 -> 1216 bytes .../gregtech/textures/gui/basicmachines/Hammer.png | Bin 2338 -> 1344 bytes .../textures/gui/basicmachines/LaserEngraver.png | Bin 2771 -> 1772 bytes .../gregtech/textures/gui/basicmachines/Lathe.png | Bin 3070 -> 1455 bytes .../textures/gui/basicmachines/Macerator1.png | Bin 3226 -> 1501 bytes .../textures/gui/basicmachines/Macerator2.png | Bin 3287 -> 1528 bytes .../textures/gui/basicmachines/Macerator3.png | Bin 3286 -> 1531 bytes .../textures/gui/basicmachines/Macerator4.png | Bin 3473 -> 1590 bytes .../textures/gui/basicmachines/Massfabricator.png | Bin 3132 -> 1459 bytes .../gregtech/textures/gui/basicmachines/Miner.png | Bin 2391 -> 1374 bytes .../gregtech/textures/gui/basicmachines/Mixer.png | Bin 5663 -> 1644 bytes .../textures/gui/basicmachines/NineXNine.png | Bin 2631 -> 1186 bytes .../textures/gui/basicmachines/OilCracker.png | Bin 4782 -> 1216 bytes .../textures/gui/basicmachines/OreWasher.png | Bin 3462 -> 1616 bytes .../textures/gui/basicmachines/Packager.png | Bin 3021 -> 1452 bytes .../gui/basicmachines/PlasmaArcFurnace.png | Bin 2375 -> 1366 bytes .../textures/gui/basicmachines/Polarizer.png | Bin 2360 -> 1337 bytes .../textures/gui/basicmachines/PotionBrewer.png | Bin 3162 -> 1438 bytes .../gregtech/textures/gui/basicmachines/Press.png | Bin 2442 -> 1414 bytes .../textures/gui/basicmachines/Printer.png | Bin 3082 -> 1461 bytes .../textures/gui/basicmachines/Recycler.png | Bin 3122 -> 1483 bytes .../textures/gui/basicmachines/Replicator.png | Bin 3164 -> 1486 bytes .../textures/gui/basicmachines/RockBreaker.png | Bin 3225 -> 1494 bytes .../textures/gui/basicmachines/Scanner.png | Bin 3116 -> 1494 bytes .../gregtech/textures/gui/basicmachines/Sifter.png | Bin 2569 -> 1454 bytes .../gregtech/textures/gui/basicmachines/Slicer.png | Bin 3351 -> 1777 bytes .../gui/basicmachines/SteelAlloySmelter.png | Bin 2545 -> 1585 bytes .../textures/gui/basicmachines/SteelCompressor.png | Bin 2418 -> 1493 bytes .../textures/gui/basicmachines/SteelExtractor.png | Bin 2462 -> 1549 bytes .../textures/gui/basicmachines/SteelFurnace.png | Bin 2482 -> 1537 bytes .../textures/gui/basicmachines/SteelHammer.png | Bin 2404 -> 1469 bytes .../textures/gui/basicmachines/SteelMacerator.png | Bin 2534 -> 1617 bytes .../gui/basicmachines/ThermalCentrifuge.png | Bin 3209 -> 1517 bytes .../textures/gui/basicmachines/Unpackager.png | Bin 2992 -> 1421 bytes .../textures/gui/basicmachines/Wiremill.png | Bin 2971 -> 1401 bytes .../textures/gui/multimachines/Advanced_Miner2.png | Bin 4373 -> 873 bytes .../textures/gui/multimachines/AssemblyLine.png | Bin 2116 -> 934 bytes .../gui/multimachines/DistillationTower.png | Bin 4366 -> 864 bytes .../textures/gui/multimachines/DrillingRig.png | Bin 265621 -> 898 bytes .../gui/multimachines/ElectricBlastFurnace.png | Bin 2210 -> 964 bytes .../textures/gui/multimachines/FusionComputer.png | Bin 5280 -> 1729 bytes .../gui/multimachines/ImplosionCompressor.png | Bin 2116 -> 934 bytes .../textures/gui/multimachines/LargeBoiler.png | Bin 2258 -> 961 bytes .../gui/multimachines/LargeChemicalReactor.png | Bin 2129 -> 940 bytes .../gui/multimachines/LargeDieselEngine.png | Bin 1870 -> 952 bytes .../gui/multimachines/LargeHeatExchanger.png | Bin 4437 -> 912 bytes .../textures/gui/multimachines/LargeTurbine.png | Bin 4313 -> 867 bytes .../textures/gui/multimachines/MultiFurnace.png | Bin 2113 -> 944 bytes .../gui/multimachines/MultiblockDisplay.png | Bin 3644 -> 899 bytes .../textures/gui/multimachines/OilCrackingUnit.png | Bin 4379 -> 887 bytes .../gui/multimachines/OreDrillingPlant.png | Bin 4364 -> 873 bytes .../textures/gui/multimachines/ProcessingArray.png | Bin 2116 -> 934 bytes .../textures/gui/multimachines/PyrolyseOven.png | Bin 4426 -> 898 bytes .../textures/gui/multimachines/VacuumFreezer.png | Bin 2116 -> 934 bytes .../textures/items/gt.360k_NaK_Coolantcell.png | Bin 480 -> 453 bytes .../gregtech/textures/items/gt.Double_MNqCell.png | Bin 1147 -> 428 bytes .../textures/items/gt.Double_MNqCellDep.png | Bin 1147 -> 431 bytes .../textures/items/gt.Double_Naquadahcell.png | Bin 1147 -> 424 bytes .../textures/items/gt.Double_NaquadahcellDep.png | Bin 1147 -> 424 bytes .../assets/gregtech/textures/items/gt.MNqCell.png | Bin 1147 -> 402 bytes .../gregtech/textures/items/gt.MNqCellDep.png | Bin 1147 -> 411 bytes .../gregtech/textures/items/gt.Naquadahcell.png | Bin 1147 -> 399 bytes .../gregtech/textures/items/gt.NaquadahcellDep.png | Bin 1147 -> 399 bytes .../gregtech/textures/items/gt.Quad_MNqCell.png | Bin 1147 -> 501 bytes .../gregtech/textures/items/gt.Quad_MNqCellDep.png | Bin 1147 -> 504 bytes .../textures/items/gt.Quad_Naquadahcell.png | Bin 1147 -> 491 bytes .../textures/items/gt.Quad_NaquadahcellDep.png | Bin 1147 -> 491 bytes .../textures/items/gt.Quad_Thoriumcell.png | Bin 469 -> 442 bytes .../textures/items/gt.Quad_ThoriumcellDep.png | Bin 469 -> 442 bytes .../textures/items/gt.Volumetric_Flask.window.png | Bin 409 -> 360 bytes .../gregtech/textures/items/gt.metaitem.01/0.png | Bin 530 -> 486 bytes .../gregtech/textures/items/gt.metaitem.01/1.png | Bin 534 -> 486 bytes .../gregtech/textures/items/gt.metaitem.01/11.png | Bin 573 -> 524 bytes .../gregtech/textures/items/gt.metaitem.01/13.png | Bin 552 -> 514 bytes .../gregtech/textures/items/gt.metaitem.01/14.png | Bin 551 -> 509 bytes .../gregtech/textures/items/gt.metaitem.01/16.png | Bin 504 -> 501 bytes .../gregtech/textures/items/gt.metaitem.01/2.png | Bin 519 -> 486 bytes .../gregtech/textures/items/gt.metaitem.01/3.png | Bin 517 -> 476 bytes .../gregtech/textures/items/gt.metaitem.01/300.png | Bin 3024 -> 767 bytes .../gregtech/textures/items/gt.metaitem.01/318.png | Bin 3066 -> 720 bytes .../gregtech/textures/items/gt.metaitem.01/319.png | Bin 3060 -> 764 bytes .../gregtech/textures/items/gt.metaitem.01/320.png | Bin 3098 -> 819 bytes .../gregtech/textures/items/gt.metaitem.01/321.png | Bin 3112 -> 803 bytes .../gregtech/textures/items/gt.metaitem.01/322.png | Bin 3129 -> 815 bytes .../gregtech/textures/items/gt.metaitem.01/323.png | Bin 3034 -> 709 bytes .../gregtech/textures/items/gt.metaitem.01/324.png | Bin 3222 -> 896 bytes .../gregtech/textures/items/gt.metaitem.01/325.png | Bin 3143 -> 857 bytes .../gregtech/textures/items/gt.metaitem.01/374.png | Bin 3157 -> 693 bytes .../gregtech/textures/items/gt.metaitem.01/375.png | Bin 3090 -> 709 bytes .../gregtech/textures/items/gt.metaitem.01/376.png | Bin 3057 -> 654 bytes .../gregtech/textures/items/gt.metaitem.01/4.png | Bin 504 -> 476 bytes .../gregtech/textures/items/gt.metaitem.01/407.png | Bin 2975 -> 396 bytes .../gregtech/textures/items/gt.metaitem.01/408.png | Bin 2959 -> 386 bytes .../gregtech/textures/items/gt.metaitem.01/409.png | Bin 2932 -> 372 bytes .../gregtech/textures/items/gt.metaitem.01/410.png | Bin 2917 -> 364 bytes .../gregtech/textures/items/gt.metaitem.01/411.png | Bin 2955 -> 360 bytes .../gregtech/textures/items/gt.metaitem.01/412.png | Bin 2966 -> 396 bytes .../gregtech/textures/items/gt.metaitem.01/413.png | Bin 2941 -> 354 bytes .../gregtech/textures/items/gt.metaitem.01/462.png | Bin 528 -> 462 bytes .../gregtech/textures/items/gt.metaitem.01/463.png | Bin 537 -> 467 bytes .../gregtech/textures/items/gt.metaitem.01/464.png | Bin 526 -> 468 bytes .../gregtech/textures/items/gt.metaitem.01/482.png | Bin 509 -> 476 bytes .../gregtech/textures/items/gt.metaitem.01/483.png | Bin 593 -> 514 bytes .../gregtech/textures/items/gt.metaitem.01/484.png | Bin 538 -> 494 bytes .../gregtech/textures/items/gt.metaitem.01/5.png | Bin 502 -> 486 bytes .../textures/items/gt.metaitem.01/597/1.png | Bin 1147 -> 420 bytes .../textures/items/gt.metaitem.01/597/2.png | Bin 1147 -> 420 bytes .../textures/items/gt.metaitem.01/597/3.png | Bin 1147 -> 420 bytes .../textures/items/gt.metaitem.01/597/4.png | Bin 1147 -> 420 bytes .../textures/items/gt.metaitem.01/597/5.png | Bin 1147 -> 420 bytes .../textures/items/gt.metaitem.01/597/6.png | Bin 1147 -> 420 bytes .../textures/items/gt.metaitem.01/597/7.png | Bin 1147 -> 420 bytes .../textures/items/gt.metaitem.01/597/8.png | Bin 1147 -> 420 bytes .../gregtech/textures/items/gt.metaitem.01/6.png | Bin 500 -> 485 bytes .../textures/items/gt.metaitem.01/609/1.png | Bin 4235 -> 2156 bytes .../textures/items/gt.metaitem.01/609/2.png | Bin 4235 -> 2155 bytes .../textures/items/gt.metaitem.01/609/3.png | Bin 4235 -> 2154 bytes .../textures/items/gt.metaitem.01/609/4.png | Bin 4235 -> 2141 bytes .../textures/items/gt.metaitem.01/609/5.png | Bin 4235 -> 2132 bytes .../textures/items/gt.metaitem.01/609/6.png | Bin 4235 -> 2147 bytes .../textures/items/gt.metaitem.01/609/7.png | Bin 4235 -> 2154 bytes .../textures/items/gt.metaitem.01/609/8.png | Bin 4235 -> 2107 bytes .../gregtech/textures/items/gt.metaitem.01/660.png | Bin 3173 -> 752 bytes .../gregtech/textures/items/gt.metaitem.01/661.png | Bin 3209 -> 632 bytes .../gregtech/textures/items/gt.metaitem.01/662.png | Bin 3220 -> 637 bytes .../gregtech/textures/items/gt.metaitem.01/663.png | Bin 3201 -> 669 bytes .../gregtech/textures/items/gt.metaitem.01/664.png | Bin 3206 -> 678 bytes .../gregtech/textures/items/gt.metaitem.01/665.png | Bin 3236 -> 709 bytes .../gregtech/textures/items/gt.metaitem.01/666.png | Bin 3228 -> 710 bytes .../gregtech/textures/items/gt.metaitem.01/667.png | Bin 3221 -> 697 bytes .../gregtech/textures/items/gt.metaitem.01/669.png | Bin 2898 -> 371 bytes .../gregtech/textures/items/gt.metaitem.01/7.png | Bin 497 -> 485 bytes .../gregtech/textures/items/gt.metaitem.01/702.png | Bin 2992 -> 391 bytes .../gregtech/textures/items/gt.metaitem.01/722.png | Bin 476 -> 448 bytes .../gregtech/textures/items/gt.metaitem.01/723.png | Bin 518 -> 453 bytes .../gregtech/textures/items/gt.metaitem.01/750.png | Bin 3093 -> 537 bytes .../gregtech/textures/items/gt.metaitem.01/751.png | Bin 3137 -> 537 bytes .../gregtech/textures/items/gt.metaitem.01/752.png | Bin 3107 -> 534 bytes .../gregtech/textures/items/gt.metaitem.01/753.png | Bin 3121 -> 532 bytes .../gregtech/textures/items/gt.metaitem.01/754.png | Bin 3118 -> 534 bytes .../gregtech/textures/items/gt.metaitem.01/755.png | Bin 3122 -> 534 bytes .../gregtech/textures/items/gt.metaitem.01/756.png | Bin 3125 -> 537 bytes .../gregtech/textures/items/gt.metaitem.01/757.png | Bin 3123 -> 539 bytes .../gregtech/textures/items/gt.metaitem.01/758.png | Bin 3136 -> 527 bytes .../gregtech/textures/items/gt.metaitem.01/759.png | Bin 3104 -> 536 bytes .../gregtech/textures/items/gt.metaitem.01/763.png | Bin 1839 -> 1397 bytes .../gregtech/textures/items/gt.metaitem.02/202.png | Bin 682 -> 678 bytes .../gregtech/textures/items/gt.metaitem.02/214.png | Bin 487 -> 470 bytes .../gregtech/textures/items/gt.metaitem.02/220.png | Bin 618 -> 553 bytes .../gregtech/textures/items/gt.metaitem.02/221.png | Bin 659 -> 606 bytes .../gregtech/textures/items/gt.metaitem.02/222.png | Bin 677 -> 654 bytes .../gregtech/textures/items/gt.metaitem.02/223.png | Bin 645 -> 634 bytes .../gregtech/textures/items/gt.metaitem.02/224.png | Bin 688 -> 628 bytes .../gregtech/textures/items/gt.metaitem.02/230.png | Bin 565 -> 529 bytes .../gregtech/textures/items/gt.metaitem.02/233.png | Bin 635 -> 630 bytes .../gregtech/textures/items/gt.metaitem.02/240.png | Bin 601 -> 539 bytes .../gregtech/textures/items/gt.metaitem.02/241.png | Bin 628 -> 582 bytes .../gregtech/textures/items/gt.metaitem.02/242.png | Bin 654 -> 640 bytes .../gregtech/textures/items/gt.metaitem.02/243.png | Bin 689 -> 627 bytes .../gregtech/textures/items/gt.metaitem.02/419.png | Bin 485 -> 461 bytes .../gregtech/textures/items/gt.metaitem.02/425.png | Bin 618 -> 560 bytes .../gregtech/textures/items/gt.metaitem.02/426.png | Bin 586 -> 577 bytes .../gregtech/textures/items/gt.metaitem.02/427.png | Bin 594 -> 577 bytes .../gregtech/textures/items/gt.metaitem.02/470.png | Bin 521 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/471.png | Bin 511 -> 466 bytes .../gregtech/textures/items/gt.metaitem.02/472.png | Bin 521 -> 468 bytes .../gregtech/textures/items/gt.metaitem.02/473.png | Bin 547 -> 461 bytes .../gregtech/textures/items/gt.metaitem.02/474.png | Bin 499 -> 461 bytes .../gregtech/textures/items/gt.metaitem.02/476.png | Bin 489 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/477.png | Bin 514 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/478.png | Bin 520 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/479.png | Bin 522 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/480.png | Bin 520 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/481.png | Bin 473 -> 410 bytes .../gregtech/textures/items/gt.metaitem.02/482.png | Bin 519 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/483.png | Bin 501 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/484.png | Bin 509 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/485.png | Bin 428 -> 401 bytes .../gregtech/textures/items/gt.metaitem.02/486.png | Bin 488 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/487.png | Bin 449 -> 409 bytes .../gregtech/textures/items/gt.metaitem.02/488.png | Bin 539 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/489.png | Bin 504 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/490.png | Bin 509 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/491.png | Bin 533 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/492.png | Bin 505 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/493.png | Bin 504 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/494.png | Bin 519 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/495.png | Bin 490 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/496.png | Bin 516 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/497.png | Bin 519 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/498.png | Bin 519 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/499.png | Bin 536 -> 453 bytes .../gregtech/textures/items/gt.metaitem.02/524.png | Bin 725 -> 647 bytes .../gregtech/textures/items/gt.metaitem.02/526.png | Bin 604 -> 470 bytes .../gregtech/textures/items/gt.metaitem.02/533.png | Bin 616 -> 582 bytes .../gregtech/textures/items/gt.metaitem.02/535.png | Bin 2990 -> 378 bytes .../gregtech/textures/items/gt.metaitem.02/536.png | Bin 3064 -> 463 bytes .../gregtech/textures/items/gt.metaitem.02/554.png | Bin 640 -> 609 bytes .../gregtech/textures/items/gt.metaitem.02/561.png | Bin 551 -> 550 bytes .../gregtech/textures/items/gt.metaitem.02/562.png | Bin 653 -> 568 bytes .../gregtech/textures/items/gt.metaitem.02/563.png | Bin 553 -> 521 bytes .../gregtech/textures/items/gt.metaitem.02/564.png | Bin 628 -> 572 bytes .../gregtech/textures/items/gt.metaitem.02/565.png | Bin 542 -> 525 bytes .../gregtech/textures/items/gt.metaitem.02/566.png | Bin 566 -> 557 bytes .../gregtech/textures/items/gt.metaitem.02/567.png | Bin 629 -> 576 bytes .../gregtech/textures/items/gt.metaitem.02/766.png | Bin 3976 -> 1814 bytes .../gregtech/textures/items/gt.metaitem.03/100.png | Bin 3354 -> 1171 bytes .../gregtech/textures/items/gt.metaitem.03/101.png | Bin 3346 -> 1117 bytes .../gregtech/textures/items/gt.metaitem.03/102.png | Bin 3289 -> 1051 bytes .../gregtech/textures/items/gt.metaitem.03/103.png | Bin 3291 -> 1114 bytes .../gregtech/textures/items/gt.metaitem.03/104.png | Bin 3301 -> 1044 bytes .../gregtech/textures/items/gt.metaitem.03/105.png | Bin 3335 -> 1217 bytes .../gregtech/textures/items/gt.metaitem.03/106.png | Bin 3115 -> 629 bytes .../gregtech/textures/items/gt.metaitem.03/107.png | Bin 3209 -> 795 bytes .../gregtech/textures/items/gt.metaitem.03/110.png | Bin 3087 -> 591 bytes .../gregtech/textures/items/gt.metaitem.03/113.png | Bin 520 -> 508 bytes .../gregtech/textures/items/gt.metaitem.03/120.png | Bin 6682 -> 4162 bytes .../gregtech/textures/items/gt.metaitem.03/130.png | Bin 3118 -> 526 bytes .../gregtech/textures/items/gt.metaitem.03/131.png | Bin 3137 -> 536 bytes .../gregtech/textures/items/gt.metaitem.03/132.png | Bin 3123 -> 535 bytes .../gregtech/textures/items/gt.metaitem.03/140.png | Bin 2933 -> 381 bytes .../gregtech/textures/items/gt.metaitem.03/141.png | Bin 2926 -> 381 bytes .../gregtech/textures/items/gt.metaitem.03/142.png | Bin 2928 -> 381 bytes .../gregtech/textures/items/gt.metaitem.03/143.png | Bin 2953 -> 381 bytes .../gregtech/textures/items/gt.metaitem.03/144.png | Bin 2931 -> 381 bytes .../gregtech/textures/items/gt.metaitem.03/145.png | Bin 2923 -> 381 bytes .../gregtech/textures/items/gt.metaitem.03/146.png | Bin 2922 -> 381 bytes .../gregtech/textures/items/gt.metaitem.03/147.png | Bin 2904 -> 381 bytes .../gregtech/textures/items/gt.metaitem.03/148.png | Bin 2928 -> 381 bytes .../gregtech/textures/items/gt.metaitem.03/149.png | Bin 2927 -> 381 bytes .../gregtech/textures/items/gt.metaitem.03/150.png | Bin 3755 -> 1429 bytes .../gregtech/textures/items/gt.metaitem.03/151.png | Bin 3963 -> 1443 bytes .../gregtech/textures/items/gt.metaitem.03/152.png | Bin 3744 -> 1430 bytes .../gregtech/textures/items/gt.metaitem.03/153.png | Bin 3945 -> 1425 bytes .../gregtech/textures/items/gt.metaitem.03/160.png | Bin 4144 -> 1698 bytes .../gregtech/textures/items/gt.metaitem.03/161.png | Bin 3821 -> 1609 bytes .../gregtech/textures/items/gt.metaitem.03/162.png | Bin 4150 -> 1698 bytes .../gregtech/textures/items/gt.metaitem.03/163.png | Bin 3853 -> 1628 bytes .../gregtech/textures/items/gt.metaitem.03/164.png | Bin 4140 -> 1698 bytes .../gregtech/textures/items/gt.metaitem.03/165.png | Bin 3840 -> 1628 bytes .../gregtech/textures/items/gt.metaitem.03/21.png | Bin 3160 -> 667 bytes .../gregtech/textures/items/gt.metaitem.03/22.png | Bin 3033 -> 441 bytes .../gregtech/textures/items/gt.metaitem.03/23.png | Bin 3511 -> 1107 bytes .../gregtech/textures/items/gt.metaitem.03/36.png | Bin 3941 -> 1562 bytes .../gregtech/textures/items/gt.metaitem.03/37.png | Bin 3472 -> 1309 bytes .../gregtech/textures/items/gt.metaitem.03/38.png | Bin 3949 -> 1705 bytes .../gregtech/textures/items/gt.metaitem.03/39.png | Bin 3672 -> 1639 bytes .../gregtech/textures/items/gt.metaitem.03/40.png | Bin 3804 -> 1417 bytes .../gregtech/textures/items/gt.metaitem.03/41.png | Bin 3558 -> 1407 bytes .../gregtech/textures/items/gt.metaitem.03/42.png | Bin 3844 -> 1491 bytes .../gregtech/textures/items/gt.metaitem.03/43.png | Bin 3631 -> 1424 bytes .../gregtech/textures/items/gt.metaitem.03/44.png | Bin 3999 -> 1617 bytes .../gregtech/textures/items/gt.metaitem.03/45.png | Bin 3761 -> 1597 bytes .../gregtech/textures/items/gt.metaitem.03/46.png | Bin 4150 -> 1693 bytes .../gregtech/textures/items/gt.metaitem.03/47.png | Bin 3866 -> 1701 bytes .../gregtech/textures/items/gt.metaitem.03/48.png | Bin 3938 -> 1431 bytes .../gregtech/textures/items/gt.metaitem.03/49.png | Bin 3777 -> 1414 bytes .../gregtech/textures/items/gt.metaitem.03/50.png | Bin 4098 -> 1682 bytes .../gregtech/textures/items/gt.metaitem.03/51.png | Bin 3803 -> 1603 bytes .../gregtech/textures/items/gt.metaitem.03/52.png | Bin 4152 -> 1698 bytes .../gregtech/textures/items/gt.metaitem.03/53.png | Bin 3857 -> 1628 bytes .../gregtech/textures/items/gt.metaitem.03/54.png | Bin 4080 -> 1669 bytes .../gregtech/textures/items/gt.metaitem.03/55.png | Bin 3803 -> 1686 bytes .../gregtech/textures/items/gt.metaitem.03/56.png | Bin 4117 -> 1735 bytes .../gregtech/textures/items/gt.metaitem.03/57.png | Bin 3785 -> 1680 bytes .../gregtech/textures/items/gt.metaitem.03/58.png | Bin 4151 -> 1698 bytes .../gregtech/textures/items/gt.metaitem.03/59.png | Bin 3859 -> 1628 bytes .../gregtech/textures/items/gt.metaitem.03/60.png | Bin 4232 -> 1780 bytes .../gregtech/textures/items/gt.metaitem.03/61.png | Bin 3923 -> 1823 bytes .../gregtech/textures/items/gt.metaitem.03/62.png | Bin 4167 -> 1823 bytes .../gregtech/textures/items/gt.metaitem.03/63.png | Bin 3842 -> 1780 bytes .../gregtech/textures/items/gt.metaitem.03/64.png | Bin 4120 -> 1731 bytes .../gregtech/textures/items/gt.metaitem.03/65.png | Bin 3824 -> 1685 bytes .../gregtech/textures/items/gt.metaitem.03/68.png | Bin 2969 -> 388 bytes .../gregtech/textures/items/gt.metaitem.03/69.png | Bin 2908 -> 367 bytes .../gregtech/textures/items/gt.metaitem.03/70.png | Bin 2959 -> 388 bytes .../gregtech/textures/items/gt.metaitem.03/71.png | Bin 2933 -> 373 bytes .../gregtech/textures/items/gt.metaitem.03/74.png | Bin 2919 -> 376 bytes .../gregtech/textures/items/gt.metaitem.03/76.png | Bin 10545 -> 6670 bytes .../gregtech/textures/items/gt.metaitem.03/77.png | Bin 2910 -> 365 bytes .../gregtech/textures/items/gt.metaitem.03/78.png | Bin 2932 -> 366 bytes .../gregtech/textures/items/gt.metaitem.03/79.png | Bin 3016 -> 399 bytes .../gregtech/textures/items/gt.metaitem.03/8.png | Bin 3193 -> 872 bytes .../gregtech/textures/items/gt.metaitem.03/90.png | Bin 3262 -> 540 bytes .../gregtech/textures/items/gt.metaitem.03/96.png | Bin 3023 -> 405 bytes .../gregtech/textures/items/gt.metaitem.03/97.png | Bin 2984 -> 389 bytes .../gregtech/textures/items/gt.metaitem.03/98.png | Bin 3028 -> 408 bytes .../gregtech/textures/items/gt.metaitem.03/99.png | Bin 3732 -> 1104 bytes .../textures/items/gt.neutroniumHeatCapacitor.png | Bin 1147 -> 325 bytes .../textures/items/gt.reactorUraniumDual.png | Bin 574 -> 485 bytes .../textures/items/gt.reactorUraniumQuad.png | Bin 739 -> 577 bytes .../textures/items/gt.reactorUraniumSimple.png | Bin 528 -> 461 bytes .../gregtech/textures/items/gt.sensorcard.png | Bin 1446 -> 1180 bytes .../textures/items/iconsets/HANDLE_SOLDERING.png | Bin 1171 -> 330 bytes .../gregtech/textures/items/iconsets/TURBINE.png | Bin 1227 -> 382 bytes .../textures/items/iconsets/TURBINE_HUGE.png | Bin 1227 -> 382 bytes .../textures/items/iconsets/TURBINE_LARGE.png | Bin 1227 -> 382 bytes .../textures/items/iconsets/TURBINE_SMALL.png | Bin 1227 -> 382 bytes .../items/materialicons/DIAMOND/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../items/materialicons/DIAMOND/crushed.png | Bin 506 -> 441 bytes .../materialicons/DIAMOND/crushedPurified.png | Bin 603 -> 460 bytes .../materialicons/DIAMOND/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../items/materialicons/DIAMOND/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/DIAMOND/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/DIAMOND/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/DIAMOND/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/DIAMOND/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/DIAMOND/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/DULL/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/DULL/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/DULL/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/DULL/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/DULL/gem.png | Bin 451 -> 419 bytes .../items/materialicons/DULL/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/DULL/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/DULL/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/DULL/toolHeadMallet.png | Bin 2891 -> 340 bytes .../items/materialicons/DULL/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/DULL/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/EMERALD/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../items/materialicons/EMERALD/crushed.png | Bin 506 -> 441 bytes .../materialicons/EMERALD/crushedPurified.png | Bin 603 -> 460 bytes .../materialicons/EMERALD/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/EMERALD/gem.png | Bin 409 -> 408 bytes .../items/materialicons/EMERALD/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/EMERALD/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/EMERALD/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/EMERALD/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/EMERALD/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/EMERALD/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/FIERY/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/FIERY/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/FIERY/crushedPurified.png | Bin 603 -> 460 bytes .../textures/items/materialicons/FIERY/gem.png | Bin 451 -> 419 bytes .../items/materialicons/FIERY/handleMallet.png | Bin 2909 -> 356 bytes .../textures/items/materialicons/FIERY/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/FIERY/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/FIERY/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/FIERY/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/FINE/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/FINE/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/FINE/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/FINE/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/FINE/gem.png | Bin 451 -> 419 bytes .../items/materialicons/FINE/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/FINE/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/FINE/plate.png | Bin 517 -> 434 bytes .../textures/items/materialicons/FINE/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/FINE/toolHeadMallet.png | Bin 2891 -> 340 bytes .../items/materialicons/FINE/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/FINE/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/FLINT/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/FLINT/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/FLINT/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/FLINT/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../items/materialicons/FLINT/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/FLINT/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/FLINT/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/FLINT/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/FLINT/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/FLINT/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/FLUID/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/FLUID/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/FLUID/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/FLUID/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/FLUID/gem.png | Bin 451 -> 419 bytes .../items/materialicons/FLUID/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/FLUID/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/FLUID/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/FLUID/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/FLUID/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/FLUID/turbineBlade.png | Bin 1238 -> 395 bytes .../materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../items/materialicons/GEM_HORIZONTAL/crushed.png | Bin 506 -> 441 bytes .../GEM_HORIZONTAL/crushedPurified.png | Bin 603 -> 460 bytes .../GEM_HORIZONTAL/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../materialicons/GEM_HORIZONTAL/handleMallet.png | Bin 2909 -> 356 bytes .../materialicons/GEM_HORIZONTAL/lens_OVERLAY.png | Bin 567 -> 556 bytes .../items/materialicons/GEM_HORIZONTAL/rotor.png | Bin 452 -> 443 bytes .../GEM_HORIZONTAL/toolHeadMallet.png | Bin 2891 -> 340 bytes .../GEM_HORIZONTAL/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../materialicons/GEM_HORIZONTAL/turbineBlade.png | Bin 1238 -> 395 bytes .../materialicons/GEM_VERTICAL/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../items/materialicons/GEM_VERTICAL/crushed.png | Bin 506 -> 441 bytes .../materialicons/GEM_VERTICAL/crushedPurified.png | Bin 603 -> 460 bytes .../materialicons/GEM_VERTICAL/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../materialicons/GEM_VERTICAL/handleMallet.png | Bin 2909 -> 356 bytes .../materialicons/GEM_VERTICAL/lens_OVERLAY.png | Bin 567 -> 556 bytes .../items/materialicons/GEM_VERTICAL/rotor.png | Bin 452 -> 443 bytes .../materialicons/GEM_VERTICAL/toolHeadMallet.png | Bin 2891 -> 340 bytes .../GEM_VERTICAL/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../materialicons/GEM_VERTICAL/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/GLASS/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/GLASS/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/GLASS/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/GLASS/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/GLASS/gem.png | Bin 451 -> 419 bytes .../items/materialicons/GLASS/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/GLASS/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/GLASS/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/GLASS/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/GLASS/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/GLASS/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/LAPIS/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/LAPIS/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/LAPIS/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/LAPIS/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/LAPIS/gem.png | Bin 410 -> 387 bytes .../items/materialicons/LAPIS/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/LAPIS/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/LAPIS/plate.png | Bin 517 -> 434 bytes .../textures/items/materialicons/LAPIS/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/LAPIS/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/LAPIS/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/LAPIS/turbineBlade.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/LEAF/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/LEAF/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/LEAF/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/LEAF/gem.png | Bin 451 -> 419 bytes .../items/materialicons/LEAF/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/LEAF/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/LEAF/plate.png | Bin 676 -> 542 bytes .../textures/items/materialicons/LEAF/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/LEAF/toolHeadMallet.png | Bin 2891 -> 340 bytes .../items/materialicons/LEAF/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/LEAF/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/LIGNITE/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../items/materialicons/LIGNITE/crushed.png | Bin 506 -> 441 bytes .../materialicons/LIGNITE/crushedPurified.png | Bin 603 -> 460 bytes .../materialicons/LIGNITE/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../items/materialicons/LIGNITE/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/LIGNITE/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/LIGNITE/plate.png | Bin 517 -> 434 bytes .../textures/items/materialicons/LIGNITE/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/LIGNITE/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/LIGNITE/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/LIGNITE/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/MAGNETIC/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../items/materialicons/MAGNETIC/crushed.png | Bin 506 -> 441 bytes .../materialicons/MAGNETIC/crushedPurified.png | Bin 603 -> 460 bytes .../materialicons/MAGNETIC/crushed_OVERLAY.png | Bin 603 -> 577 bytes .../items/materialicons/MAGNETIC/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/MAGNETIC/rotor.png | Bin 452 -> 443 bytes .../materialicons/MAGNETIC/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/MAGNETIC/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/MAGNETIC/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/METALLIC/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../items/materialicons/METALLIC/crushed.png | Bin 506 -> 441 bytes .../materialicons/METALLIC/crushedPurified.png | Bin 603 -> 460 bytes .../materialicons/METALLIC/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../items/materialicons/METALLIC/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/METALLIC/lens_OVERLAY.png | Bin 567 -> 556 bytes .../items/materialicons/METALLIC/rotor.png | Bin 452 -> 443 bytes .../materialicons/METALLIC/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/METALLIC/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/METALLIC/turbineBlade.png | Bin 1238 -> 395 bytes .../materialicons/NETHERSTAR/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../items/materialicons/NETHERSTAR/crushed.png | Bin 506 -> 441 bytes .../materialicons/NETHERSTAR/crushedPurified.png | Bin 603 -> 460 bytes .../materialicons/NETHERSTAR/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../materialicons/NETHERSTAR/handleMallet.png | Bin 2909 -> 356 bytes .../materialicons/NETHERSTAR/lens_OVERLAY.png | Bin 567 -> 556 bytes .../items/materialicons/NETHERSTAR/rotor.png | Bin 452 -> 443 bytes .../materialicons/NETHERSTAR/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/NETHERSTAR/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../materialicons/NETHERSTAR/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/NONE/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/NONE/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/NONE/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/NONE/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/NONE/gem.png | Bin 451 -> 419 bytes .../items/materialicons/NONE/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/NONE/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/NONE/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/NONE/toolHeadMallet.png | Bin 2891 -> 340 bytes .../items/materialicons/NONE/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/NONE/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/OPAL/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/OPAL/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/OPAL/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/OPAL/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/OPAL/gem.png | Bin 451 -> 419 bytes .../items/materialicons/OPAL/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/OPAL/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/OPAL/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/OPAL/toolHeadMallet.png | Bin 2891 -> 340 bytes .../items/materialicons/OPAL/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/OPAL/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/PAPER/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/PAPER/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/PAPER/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/PAPER/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/PAPER/gem.png | Bin 451 -> 419 bytes .../items/materialicons/PAPER/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/PAPER/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/PAPER/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/PAPER/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/PAPER/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/PAPER/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/POWDER/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../items/materialicons/POWDER/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/POWDER/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/POWDER/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/POWDER/gem.png | Bin 451 -> 419 bytes .../items/materialicons/POWDER/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/POWDER/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/POWDER/plate.png | Bin 517 -> 434 bytes .../textures/items/materialicons/POWDER/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/POWDER/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/POWDER/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/POWDER/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/QUARTZ/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../items/materialicons/QUARTZ/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/QUARTZ/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/QUARTZ/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../items/materialicons/QUARTZ/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/QUARTZ/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/QUARTZ/plate.png | Bin 517 -> 434 bytes .../textures/items/materialicons/QUARTZ/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/QUARTZ/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/QUARTZ/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/QUARTZ/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/ROUGH/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/ROUGH/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/ROUGH/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/ROUGH/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/ROUGH/gem.png | Bin 451 -> 419 bytes .../items/materialicons/ROUGH/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/ROUGH/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/ROUGH/plate.png | Bin 517 -> 434 bytes .../textures/items/materialicons/ROUGH/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/ROUGH/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/ROUGH/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/ROUGH/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/RUBY/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/RUBY/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/RUBY/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/RUBY/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/RUBY/gem.png | Bin 451 -> 419 bytes .../items/materialicons/RUBY/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/RUBY/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/RUBY/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/RUBY/toolHeadMallet.png | Bin 2891 -> 340 bytes .../items/materialicons/RUBY/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/RUBY/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/SAND/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/SAND/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/SAND/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/SAND/crushed_OVERLAY.png | Bin 446 -> 427 bytes .../textures/items/materialicons/SAND/gem.png | Bin 451 -> 419 bytes .../items/materialicons/SAND/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/SAND/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/SAND/plate.png | Bin 517 -> 434 bytes .../textures/items/materialicons/SAND/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/SAND/toolHeadMallet.png | Bin 2891 -> 340 bytes .../items/materialicons/SAND/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/SAND/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/SHARDS/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../items/materialicons/SHARDS/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/SHARDS/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/SHARDS/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/SHARDS/gem.png | Bin 515 -> 457 bytes .../items/materialicons/SHARDS/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/SHARDS/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/SHARDS/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/SHARDS/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/SHARDS/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/SHARDS/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/SHINY/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/SHINY/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/SHINY/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/SHINY/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/SHINY/gem.png | Bin 451 -> 419 bytes .../items/materialicons/SHINY/handleMallet.png | Bin 2909 -> 356 bytes .../items/materialicons/SHINY/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/SHINY/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/SHINY/toolHeadMallet.png | Bin 2891 -> 340 bytes .../materialicons/SHINY/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/SHINY/turbineBlade.png | Bin 1238 -> 395 bytes .../items/materialicons/WOOD/TURBINE_BLADE.png | Bin 1238 -> 395 bytes .../textures/items/materialicons/WOOD/crushed.png | Bin 506 -> 441 bytes .../items/materialicons/WOOD/crushedPurified.png | Bin 603 -> 460 bytes .../items/materialicons/WOOD/crushed_OVERLAY.png | Bin 480 -> 448 bytes .../textures/items/materialicons/WOOD/gem.png | Bin 451 -> 419 bytes .../items/materialicons/WOOD/handleMallet.png | Bin 2909 -> 356 bytes .../textures/items/materialicons/WOOD/ingot.png | Bin 482 -> 431 bytes .../items/materialicons/WOOD/lens_OVERLAY.png | Bin 567 -> 556 bytes .../textures/items/materialicons/WOOD/rotor.png | Bin 452 -> 443 bytes .../items/materialicons/WOOD/toolHeadMallet.png | Bin 2891 -> 340 bytes .../items/materialicons/WOOD/toolHeadSoldering.png | Bin 1158 -> 314 bytes .../items/materialicons/WOOD/turbineBlade.png | Bin 1238 -> 395 bytes .../gregtech/textures/items/modulararmor_boots.png | Bin 518 -> 507 bytes .../textures/items/modulararmor_chestplate.png | Bin 504 -> 485 bytes .../textures/items/modularelectric1_boots.png | Bin 593 -> 567 bytes .../textures/items/modularelectric1_chestplate.png | Bin 544 -> 527 bytes .../textures/items/modularelectric1_leggings.png | Bin 482 -> 471 bytes .../textures/items/modularelectric2_boots.png | Bin 668 -> 587 bytes .../textures/items/modularelectric2_chestplate.png | Bin 596 -> 541 bytes .../textures/items/modularelectric2_leggings.png | Bin 542 -> 533 bytes .../textures/models/armor/basic_helmet_chest.png | Bin 1215 -> 954 bytes .../textures/models/armor/basic_leggings_boots.png | Bin 493 -> 453 bytes .../textures/models/armor/e1_helmet_chest.png | Bin 1528 -> 1136 bytes .../textures/models/armor/e1_leggings_boots.png | Bin 588 -> 483 bytes .../textures/models/armor/e2_helmet_chest.png | Bin 1792 -> 1211 bytes .../textures/models/armor/e2_leggings_boots.png | Bin 750 -> 548 bytes .../textures/blocks/crop/blockCrop.Argentia.3.png | Bin 523 -> 478 bytes .../textures/blocks/crop/blockCrop.Argentia.4.png | Bin 500 -> 495 bytes .../textures/blocks/crop/blockCrop.Bauxia.2.png | Bin 523 -> 478 bytes .../blocks/crop/blockCrop.Bobsyeruncleranks.1.png | Bin 2852 -> 345 bytes .../blocks/crop/blockCrop.Bobsyeruncleranks.2.png | Bin 2926 -> 367 bytes .../blocks/crop/blockCrop.Bobsyeruncleranks.3.png | Bin 3007 -> 386 bytes .../blocks/crop/blockCrop.Bobsyeruncleranks.4.png | Bin 3107 -> 421 bytes .../textures/blocks/crop/blockCrop.Chilly.3.png | Bin 523 -> 478 bytes .../textures/blocks/crop/blockCrop.Corium.3.png | Bin 523 -> 478 bytes .../textures/blocks/crop/blockCrop.Cucumber.3.png | Bin 523 -> 478 bytes .../textures/blocks/crop/blockCrop.Diareed.4.png | Bin 2920 -> 362 bytes .../textures/blocks/crop/blockCrop.Evil Ore.3.png | Bin 451 -> 409 bytes .../textures/blocks/crop/blockCrop.Evil Ore.4.png | Bin 454 -> 425 bytes .../textures/blocks/crop/blockCrop.Fertilia.3.png | Bin 465 -> 416 bytes .../ic2/textures/blocks/crop/blockCrop.Flax.1.png | Bin 3115 -> 616 bytes .../ic2/textures/blocks/crop/blockCrop.Flax.2.png | Bin 3171 -> 538 bytes .../ic2/textures/blocks/crop/blockCrop.Flax.3.png | Bin 3302 -> 624 bytes .../ic2/textures/blocks/crop/blockCrop.Flax.4.png | Bin 3479 -> 1105 bytes .../textures/blocks/crop/blockCrop.Galvania.2.png | Bin 523 -> 478 bytes .../textures/blocks/crop/blockCrop.Galvania.3.png | Bin 500 -> 495 bytes .../textures/blocks/crop/blockCrop.Glowheat.5.png | Bin 748 -> 740 bytes .../textures/blocks/crop/blockCrop.Glowheat.6.png | Bin 868 -> 846 bytes .../blocks/crop/blockCrop.God of Thunder.3.png | Bin 465 -> 416 bytes .../blocks/crop/blockCrop.God of Thunder.4.png | Bin 507 -> 446 bytes .../ic2/textures/blocks/crop/blockCrop.Grape.3.png | Bin 523 -> 478 bytes .../textures/blocks/crop/blockCrop.Indigo.3.png | Bin 3006 -> 443 bytes .../textures/blocks/crop/blockCrop.Indigo.4.png | Bin 3137 -> 485 bytes .../textures/blocks/crop/blockCrop.Lazulia.1.png | Bin 3115 -> 616 bytes .../textures/blocks/crop/blockCrop.Lazulia.2.png | Bin 3171 -> 538 bytes .../textures/blocks/crop/blockCrop.Lazulia.3.png | Bin 3302 -> 624 bytes .../textures/blocks/crop/blockCrop.Lazulia.4.png | Bin 3483 -> 985 bytes .../ic2/textures/blocks/crop/blockCrop.Lemon.3.png | Bin 523 -> 478 bytes .../textures/blocks/crop/blockCrop.Liveroots.1.png | Bin 2852 -> 345 bytes .../textures/blocks/crop/blockCrop.Liveroots.2.png | Bin 2926 -> 367 bytes .../textures/blocks/crop/blockCrop.Liveroots.3.png | Bin 3007 -> 386 bytes .../textures/blocks/crop/blockCrop.Liveroots.4.png | Bin 3248 -> 542 bytes .../textures/blocks/crop/blockCrop.Milkwart.3.png | Bin 493 -> 460 bytes .../blocks/crop/blockCrop.Nickelback.2.png | Bin 523 -> 478 bytes .../blocks/crop/blockCrop.Nickelback.3.png | Bin 500 -> 495 bytes .../blocks/crop/blockCrop.Oilberries.1.png | Bin 2875 -> 359 bytes .../blocks/crop/blockCrop.Oilberries.2.png | Bin 2919 -> 410 bytes .../blocks/crop/blockCrop.Oilberries.3.png | Bin 2970 -> 430 bytes .../blocks/crop/blockCrop.Oilberries.4.png | Bin 3022 -> 451 bytes .../textures/blocks/crop/blockCrop.Olivia.1.png | Bin 2852 -> 345 bytes .../textures/blocks/crop/blockCrop.Olivia.2.png | Bin 2926 -> 367 bytes .../textures/blocks/crop/blockCrop.Olivia.3.png | Bin 3007 -> 386 bytes .../textures/blocks/crop/blockCrop.Olivia.4.png | Bin 3107 -> 421 bytes .../ic2/textures/blocks/crop/blockCrop.Onion.3.png | Bin 523 -> 478 bytes .../textures/blocks/crop/blockCrop.Platina.3.png | Bin 523 -> 478 bytes .../textures/blocks/crop/blockCrop.Platina.4.png | Bin 500 -> 495 bytes .../textures/blocks/crop/blockCrop.Plumbilia.3.png | Bin 523 -> 478 bytes .../textures/blocks/crop/blockCrop.Plumbilia.4.png | Bin 503 -> 495 bytes .../blocks/crop/blockCrop.Pyrolusium.2.png | Bin 523 -> 478 bytes .../blocks/crop/blockCrop.Pyrolusium.3.png | Bin 500 -> 495 bytes .../textures/blocks/crop/blockCrop.Quantaria.3.png | Bin 456 -> 429 bytes .../textures/blocks/crop/blockCrop.Quantaria.4.png | Bin 519 -> 490 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.1.png | Bin 3115 -> 616 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.2.png | Bin 3171 -> 538 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.3.png | Bin 3302 -> 624 bytes .../textures/blocks/crop/blockCrop.Reactoria.3.png | Bin 532 -> 474 bytes .../textures/blocks/crop/blockCrop.Reactoria.4.png | Bin 570 -> 491 bytes .../textures/blocks/crop/blockCrop.Sapphirum.1.png | Bin 2852 -> 345 bytes .../textures/blocks/crop/blockCrop.Sapphirum.2.png | Bin 2926 -> 367 bytes .../textures/blocks/crop/blockCrop.Sapphirum.3.png | Bin 3007 -> 386 bytes .../textures/blocks/crop/blockCrop.Sapphirum.4.png | Bin 3133 -> 539 bytes .../blocks/crop/blockCrop.Scheelinium.2.png | Bin 523 -> 478 bytes .../blocks/crop/blockCrop.Scheelinium.3.png | Bin 500 -> 495 bytes .../blocks/crop/blockCrop.Slimeplant.3.png | Bin 576 -> 445 bytes .../blocks/crop/blockCrop.Slimeplant.4.png | Bin 623 -> 469 bytes .../blocks/crop/blockCrop.Stargatium.1.png | Bin 2859 -> 350 bytes .../blocks/crop/blockCrop.Stargatium.2.png | Bin 2947 -> 373 bytes .../blocks/crop/blockCrop.Stargatium.3.png | Bin 3024 -> 396 bytes .../blocks/crop/blockCrop.Stargatium.4.png | Bin 3071 -> 428 bytes .../textures/blocks/crop/blockCrop.Starwart.3.png | Bin 493 -> 460 bytes .../blocks/crop/blockCrop.Steeleafranks.1.png | Bin 2852 -> 345 bytes .../blocks/crop/blockCrop.Steeleafranks.2.png | Bin 2926 -> 367 bytes .../blocks/crop/blockCrop.Steeleafranks.3.png | Bin 3007 -> 386 bytes .../blocks/crop/blockCrop.Steeleafranks.4.png | Bin 3231 -> 565 bytes .../ic2/textures/blocks/crop/blockCrop.Tea.3.png | Bin 523 -> 478 bytes .../ic2/textures/blocks/crop/blockCrop.Tine.3.png | Bin 451 -> 409 bytes .../textures/blocks/crop/blockCrop.Titania.2.png | Bin 523 -> 478 bytes .../textures/blocks/crop/blockCrop.Tomato.3.png | Bin 523 -> 478 bytes .../blocks/crop/blockCrop.Transformium.1.png | Bin 2875 -> 359 bytes .../blocks/crop/blockCrop.Transformium.2.png | Bin 2919 -> 410 bytes .../blocks/crop/blockCrop.Transformium.3.png | Bin 2970 -> 430 bytes .../blocks/crop/blockCrop.Transformium.4.png | Bin 3248 -> 731 bytes .../blocks/crop/blockCrop.Trollplant.1.png | Bin 706 -> 561 bytes .../blocks/crop/blockCrop.Trollplant.2.png | Bin 2920 -> 362 bytes .../blocks/crop/blockCrop.Trollplant.5.png | Bin 478 -> 470 bytes .../textures/blocks/crop/blockCrop.Withereed.4.png | Bin 2937 -> 374 bytes .../models/armor/cloakingdevice_layer_1.png | Bin 1246 -> 1244 bytes .../textures/models/armor/lapotronpack_layer_1.png | Bin 1255 -> 1155 bytes .../models/armor/lithiumbatpack_layer_1.png | Bin 525 -> 480 bytes 1359 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/textures/BrainTechCape.png b/src/main/resources/assets/gregtech/textures/BrainTechCape.png index 7cc3fa64af..ee7462e401 100644 Binary files a/src/main/resources/assets/gregtech/textures/BrainTechCape.png and b/src/main/resources/assets/gregtech/textures/BrainTechCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/DevCape.png b/src/main/resources/assets/gregtech/textures/DevCape.png index 6486b57e12..80532e6223 100644 Binary files a/src/main/resources/assets/gregtech/textures/DevCape.png and b/src/main/resources/assets/gregtech/textures/DevCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/DonorCape.png b/src/main/resources/assets/gregtech/textures/DonorCape.png index fbfd7b72fb..0d7cad5304 100644 Binary files a/src/main/resources/assets/gregtech/textures/DonorCape.png and b/src/main/resources/assets/gregtech/textures/DonorCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/GregTechCape.png b/src/main/resources/assets/gregtech/textures/GregTechCape.png index e3c9f5a8a8..c02e05ab35 100644 Binary files a/src/main/resources/assets/gregtech/textures/GregTechCape.png and b/src/main/resources/assets/gregtech/textures/GregTechCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/GregoriusCape.png b/src/main/resources/assets/gregtech/textures/GregoriusCape.png index 5ae2d2fbfc..2d1f433a3d 100644 Binary files a/src/main/resources/assets/gregtech/textures/GregoriusCape.png and b/src/main/resources/assets/gregtech/textures/GregoriusCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/LogoGTI_Long.png b/src/main/resources/assets/gregtech/textures/LogoGTI_Long.png index 0f9598d050..7c1726a6b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/LogoGTI_Long.png and b/src/main/resources/assets/gregtech/textures/LogoGTI_Long.png differ diff --git a/src/main/resources/assets/gregtech/textures/MrBrainCape.png b/src/main/resources/assets/gregtech/textures/MrBrainCape.png index fb3e37480a..8ab24ae228 100644 Binary files a/src/main/resources/assets/gregtech/textures/MrBrainCape.png and b/src/main/resources/assets/gregtech/textures/MrBrainCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/TecCape.png b/src/main/resources/assets/gregtech/textures/TecCape.png index fff0cc22a7..cf620e8f91 100644 Binary files a/src/main/resources/assets/gregtech/textures/TecCape.png and b/src/main/resources/assets/gregtech/textures/TecCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/aspects/ELECTRUM.png b/src/main/resources/assets/gregtech/textures/aspects/ELECTRUM.png index ab07867611..0375beda52 100644 Binary files a/src/main/resources/assets/gregtech/textures/aspects/ELECTRUM.png and b/src/main/resources/assets/gregtech/textures/aspects/ELECTRUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/aspects/MAGNETO.png b/src/main/resources/assets/gregtech/textures/aspects/MAGNETO.png index 9e426b0eef..634d12b8de 100644 Binary files a/src/main/resources/assets/gregtech/textures/aspects/MAGNETO.png and b/src/main/resources/assets/gregtech/textures/aspects/MAGNETO.png differ diff --git a/src/main/resources/assets/gregtech/textures/aspects/NEBRISUM.png b/src/main/resources/assets/gregtech/textures/aspects/NEBRISUM.png index 91527e4dd6..f02a3677ec 100644 Binary files a/src/main/resources/assets/gregtech/textures/aspects/NEBRISUM.png and b/src/main/resources/assets/gregtech/textures/aspects/NEBRISUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/aspects/RADIO.png b/src/main/resources/assets/gregtech/textures/aspects/RADIO.png index d1bf607c82..22bc6c8b42 100644 Binary files a/src/main/resources/assets/gregtech/textures/aspects/RADIO.png and b/src/main/resources/assets/gregtech/textures/aspects/RADIO.png differ diff --git a/src/main/resources/assets/gregtech/textures/aspects/STRONTIO.png b/src/main/resources/assets/gregtech/textures/aspects/STRONTIO.png index be46651b1e..c5af77f73b 100644 Binary files a/src/main/resources/assets/gregtech/textures/aspects/STRONTIO.png and b/src/main/resources/assets/gregtech/textures/aspects/STRONTIO.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png index 91592aa072..dfce66ef70 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png index 0097e9de80..dfce66ef70 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png index eb67b722f4..44349c5407 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png index 784415fdb9..476344be81 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png index ee39a79a98..37f505db3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png index ee39a79a98..37f505db3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png index 7ed16c3ec9..bc95c20791 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png index 80d5c1365b..37f505db3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png index 86cd249126..c05a143730 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png index a164b8e76f..429871bd1d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png index 2f9afa2432..d675c27a45 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png index edc007c1a0..8716d81d81 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png index a164b8e76f..429871bd1d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png index dbd15d2ab5..fecac9a11b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png index 39d7f64a56..19b4a5da04 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png index ff75f08dde..8ce476542b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png index 5e80e0c473..cbb91e29da 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png index 054182792e..fe58536227 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png index ebe8d5499b..ea8081fa3b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png index 2b35769447..718b51b843 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png index 6247837ed4..15a3c98212 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png index ebf620d377..2bcd44b89e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png index feeed1a60e..dc9f51d2d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png index 5d326fcdfd..0936827c4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png index bfeb435f07..32ab14fca3 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png index 022d50d7e7..b72349b1bb 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png index 5668026b93..2da4ade13b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png index 9e1fc197cb..a0d93b4fce 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png index d1e2ec3052..63dacfe3b8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png index 489417804d..62e8035002 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png index c0a8a40048..b9fb43cf34 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png index 822f9b0dd6..6c5c39474b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png index 3cadcf533b..105545c15f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png index de1cf92fef..329b1ddd69 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png index 8ce2ce80a8..b04a62da93 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png index feeed1a60e..dc9f51d2d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png index 8ce2ce80a8..b04a62da93 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png index 39d7f64a56..19b4a5da04 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png index ef8b07e15a..6c0290c38b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png index 8ce2ce80a8..b04a62da93 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png index ef8b07e15a..6c0290c38b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png index feeed1a60e..dc9f51d2d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png index ef8b07e15a..6c0290c38b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png index bfeb435f07..32ab14fca3 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png index ef8b07e15a..6c0290c38b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_naphtha.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_naphtha.png index feeed1a60e..dc9f51d2d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_naphtha.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_naphtha.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sufluriclight_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sufluriclight_fuel.png index feeed1a60e..dc9f51d2d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sufluriclight_fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sufluriclight_fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricheavy_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricheavy_fuel.png index 8ce2ce80a8..b04a62da93 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricheavy_fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricheavy_fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricnaphtha.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricnaphtha.png index feeed1a60e..dc9f51d2d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricnaphtha.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricnaphtha.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_toluene.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_toluene.png index 39d7f64a56..19b4a5da04 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_toluene.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_toluene.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png index afff0ed587..e4a1b7a382 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lithium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lithium.png index 6247837ed4..15a3c98212 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lithium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lithium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lubricant.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lubricant.png index 8ce2ce80a8..b04a62da93 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lubricant.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lubricant.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mcguffium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mcguffium.png index 08cee527b4..24f0c693dc 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mcguffium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mcguffium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mercury.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mercury.png index 7cd41d965a..c4606b8fa0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mercury.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mercury.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.milk.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.milk.png index 6eb3879716..87b2e3d28e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.milk.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.milk.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.autogenerated.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.autogenerated.png index 9a4148f6b6..836a10809a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.autogenerated.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.autogenerated.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.blaze.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.blaze.png index 3f10e10c23..025b55c300 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.blaze.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.blaze.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png index 208a1792ea..f9357810f8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.glass.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.glass.png index f5b45197ef..e49660b0b0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.glass.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.glass.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.redstone.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.redstone.png index 51c6594d5e..959c213a6b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.redstone.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.redstone.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrocoalfuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrocoalfuel.png index 6ef50c4ed0..1175567fd7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrocoalfuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrocoalfuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel.png index c563ca0021..54ef62fe10 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogenplasma.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogenplasma.png index 4acabc510c..e069ebcd3a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogenplasma.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogenplasma.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oil.png index ef8b07e15a..6c0290c38b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.plasma.autogenerated.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.plasma.autogenerated.png index 4acabc510c..e069ebcd3a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.plasma.autogenerated.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.plasma.autogenerated.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potassium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potassium.png index 67084c8fb2..f5195a76c7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potassium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potassium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.alcopops.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.alcopops.png index 2bfc11ca51..3d865eb27f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.alcopops.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.alcopops.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.applejuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.applejuice.png index 36448eb5f3..ee93a431e6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.applejuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.applejuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.awkward.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.awkward.png index 0ec7857c86..f0cb578361 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.awkward.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.awkward.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.beer.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.beer.png index 2bfc11ca51..3d865eb27f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.beer.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.beer.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cafeaulait.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cafeaulait.png index a059fac7b8..9b4f827199 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cafeaulait.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cafeaulait.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cavejohnsonsgrenadejuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cavejohnsonsgrenadejuice.png index 2bfc11ca51..3d865eb27f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cavejohnsonsgrenadejuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cavejohnsonsgrenadejuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chillysauce.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chillysauce.png index 2a556a12b5..b2af7571d5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chillysauce.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chillysauce.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chocolatemilk.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chocolatemilk.png index 675c304bc6..5b3c0eb4d6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chocolatemilk.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chocolatemilk.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cider.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cider.png index dc18889791..adb8e58f07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cider.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cider.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.coffee.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.coffee.png index a059fac7b8..9b4f827199 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.coffee.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.coffee.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.png index 209282b18a..6bae5cabb9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.splash.png index e52cfcaaa8..6bae5cabb9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.png index 46ab9718bc..6bae5cabb9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.splash.png index 8910e9602f..6bae5cabb9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkbeer.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkbeer.png index c1e563c4ba..eec6c89a42 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkbeer.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkbeer.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcafeaulait.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcafeaulait.png index 675c304bc6..5b3c0eb4d6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcafeaulait.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcafeaulait.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkchocolatemilk.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkchocolatemilk.png index 675c304bc6..5b3c0eb4d6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkchocolatemilk.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkchocolatemilk.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcoffee.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcoffee.png index 675c304bc6..5b3c0eb4d6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcoffee.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcoffee.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.png index 2a556a12b5..b2af7571d5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.strong.png index 2a556a12b5..b2af7571d5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diabolosauce.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diabolosauce.png index 2a556a12b5..b2af7571d5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diabolosauce.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diabolosauce.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.dragonblood.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.dragonblood.png index 8160d8f84e..37df72e41a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.dragonblood.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.dragonblood.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.png index 4d800eb4d6..c59d563cf5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.splash.png index 9f24564614..c59d563cf5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.png index c1ca6a05b6..c59d563cf5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.splash.png index 1228367401..c59d563cf5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.glenmckenner.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.glenmckenner.png index 060e3faca0..b183ba9da8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.glenmckenner.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.glenmckenner.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldenapplejuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldenapplejuice.png index 8bd6c22405..60365ce5a1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldenapplejuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldenapplejuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldencider.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldencider.png index 8bd6c22405..60365ce5a1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldencider.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldencider.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.grapejuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.grapejuice.png index 5f17914c88..08b192777a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.grapejuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.grapejuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.png index 11fd4af746..8fb1510797 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.splash.png index 6a0a6328e1..8fb1510797 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.png index 1f270dc136..8fb1510797 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.splash.png index 7aff717077..8fb1510797 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hopsjuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hopsjuice.png index 5f17914c88..08b192777a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hopsjuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hopsjuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hotsauce.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hotsauce.png index 2a556a12b5..b2af7571d5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hotsauce.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hotsauce.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.icetea.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.icetea.png index 3c421c594f..e53cbee71b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.icetea.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.icetea.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.idunsapplejuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.idunsapplejuice.png index 8bd6c22405..60365ce5a1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.idunsapplejuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.idunsapplejuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.png index 0fae98b0f3..cf4d17992d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.splash.png index b931c088a9..cf4d17992d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.png index fff51b35c8..cf4d17992d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.splash.png index e4ce5baa06..cf4d17992d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.laitaucafe.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.laitaucafe.png index a059fac7b8..9b4f827199 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.laitaucafe.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.laitaucafe.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonade.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonade.png index 2bfc11ca51..3d865eb27f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonade.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonade.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonjuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonjuice.png index 2bfc11ca51..3d865eb27f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonjuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonjuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.leninade.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.leninade.png index 2bfc11ca51..3d865eb27f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.leninade.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.leninade.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.limoncello.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.limoncello.png index 2bfc11ca51..3d865eb27f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.limoncello.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.limoncello.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mineralwater.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mineralwater.png index 6b485369d7..eaa902682d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mineralwater.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mineralwater.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mundane.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mundane.png index 0ec7857c86..f0cb578361 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mundane.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mundane.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.png index 8e964defb5..5b3d36a968 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.splash.png index 1d609bc1fd..5b3d36a968 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.png index d2e5f93218..5b3d36a968 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.splash.png index c4c881a06c..5b3d36a968 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.notchesbrew.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.notchesbrew.png index 8bd6c22405..60365ce5a1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.notchesbrew.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.notchesbrew.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.piratebrew.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.piratebrew.png index 698a9be51b..7ad2bc6be3 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.piratebrew.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.piratebrew.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.png index 1ee518fbff..bcf889f840 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.splash.png index 0cff352524..bcf889f840 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.png index 67a4a6beb7..bcf889f840 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.splash.png index 23cd34ed3f..bcf889f840 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.png index 4bc97fdf1a..bcf889f840 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.splash.png index 1d480f0555..bcf889f840 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.potatojuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.potatojuice.png index 2bfc11ca51..3d865eb27f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.potatojuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.potatojuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.purpledrink.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.purpledrink.png index 81de671d38..231cef62d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.purpledrink.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.purpledrink.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.reedwater.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.reedwater.png index 0ec7857c86..f0cb578361 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.reedwater.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.reedwater.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.png index a96d000b38..231cef62d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.splash.png index a96d000b38..231cef62d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.png index a96d000b38..231cef62d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.splash.png index a96d000b38..231cef62d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.png index a96d000b38..231cef62d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.splash.png index a96d000b38..231cef62d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.rum.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.rum.png index a4e053ccf9..c487ed4fd8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.rum.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.rum.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.saltywater.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.saltywater.png index 0ec7857c86..f0cb578361 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.saltywater.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.saltywater.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.scotch.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.scotch.png index 36448eb5f3..ee93a431e6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.scotch.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.scotch.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.png index 0fae98b0f3..cf4d17992d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.splash.png index b931c088a9..cf4d17992d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.png index fff51b35c8..cf4d17992d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.splash.png index e4ce5baa06..cf4d17992d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.png index 5648ecfeb6..eb3c8bfa85 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.splash.png index 25683191c2..eb3c8bfa85 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.png index be6e2493e6..eb3c8bfa85 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.splash.png index fe831985ca..eb3c8bfa85 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.png index 140e447e33..eb3c8bfa85 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.splash.png index 2205124e36..eb3c8bfa85 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.png index 9cb2acadf6..98f87d6387 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.splash.png index d6722f891e..98f87d6387 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.png index f223667c4e..98f87d6387 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.splash.png index c9aa68ba96..98f87d6387 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.png index 4aa08738ef..98f87d6387 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.splash.png index a560fc7de0..98f87d6387 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweettea.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweettea.png index 0ac5c138d1..3bf7d3e86d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweettea.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweettea.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.tea.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.tea.png index 0ac5c138d1..3bf7d3e86d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.tea.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.tea.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.thick.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.thick.png index 0ec7857c86..f0cb578361 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.thick.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.thick.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vinegar.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vinegar.png index 1cf2bb9861..f9a0b6f154 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vinegar.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vinegar.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vodka.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vodka.png index 794ed73301..576101e5c4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vodka.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vodka.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.png index c0622021c0..1d13b10aac 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.splash.png index e5e2bb84de..1d13b10aac 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.png index 773957eb2d..1d13b10aac 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.splash.png index 10d1a90133..1d13b10aac 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.png index 0fae98b0f3..cf4d17992d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.splash.png index b931c088a9..cf4d17992d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.png index fff51b35c8..cf4d17992d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.splash.png index e4ce5baa06..cf4d17992d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyhopsjuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyhopsjuice.png index dc18889791..adb8e58f07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyhopsjuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyhopsjuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyjuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyjuice.png index 2bfc11ca51..3d865eb27f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyjuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyjuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wine.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wine.png index 2a556a12b5..b2af7571d5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wine.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wine.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png index 93c937e777..6937fe1e21 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.seedoil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.seedoil.png index f75bfb67b0..c26ffca7bd 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.seedoil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.seedoil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.silicon.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.silicon.png index 65e1aa72b9..ee54d8fdda 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.silicon.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.silicon.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodium.png index 0ec7857c86..f0cb578361 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodiumpersulfate.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodiumpersulfate.png index 3de580dbe4..28517db38f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodiumpersulfate.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodiumpersulfate.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.squidink.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.squidink.png index ef8b07e15a..6c0290c38b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.squidink.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.squidink.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.steam.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.steam.png index c0345ac54b..b80acb3df2 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.steam.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.steam.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.titaniumtetrachloride.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.titaniumtetrachloride.png index 67084c8fb2..f5195a76c7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.titaniumtetrachloride.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.titaniumtetrachloride.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.uuamplifier.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.uuamplifier.png index a96d000b38..231cef62d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.uuamplifier.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.uuamplifier.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png index 27d3a0e43c..429cd51f7d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wolframium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wolframium.png index 86b084ea73..cda3ae78bd 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wolframium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wolframium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS.png index e6e2e57f35..7d4e5734d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CHISELED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CHISELED.png index 6d6c1ddfc8..7c32af0ddb 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CHISELED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CHISELED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CRACKED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CRACKED.png index ced32822a8..634881a50e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CRACKED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CRACKED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_MOSSY.png index 302581d859..aacdcd3b87 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE.png index c3127ba6e7..66646dc63f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE_MOSSY.png index 2503cf2801..9a13b6abb1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.png index 71a675010a..49dcdf14d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DILITHIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DILITHIUM.png index 53b1f3a88e..0c84f0bc5a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DILITHIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DILITHIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCICIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCICIUM.png index 1adf9d3587..75674ccb75 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCICIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCICIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCILLIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCILLIUM.png index 1adf9d3587..75674ccb75 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCILLIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCILLIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ICHORIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ICHORIUM.png index 20f5c78db1..7774b9264f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ICHORIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ICHORIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png index a4828d2439..a796ba54ec 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NETHERSTAR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NETHERSTAR.png index 53b1f3a88e..0c84f0bc5a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NETHERSTAR.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NETHERSTAR.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png index 42a2d3dbe3..a34cc25ab7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ORDOCRYSTAL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ORDOCRYSTAL.png index 53b1f3a88e..0c84f0bc5a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ORDOCRYSTAL.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ORDOCRYSTAL.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PERDITIOCRYSTAL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PERDITIOCRYSTAL.png index dbee00baf4..8d571951c6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PERDITIOCRYSTAL.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PERDITIOCRYSTAL.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PLASCRETE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PLASCRETE.png index ff3054dca1..092cf05057 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PLASCRETE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PLASCRETE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELEAF.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELEAF.png index 4148a5eae9..f8be2f79da 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELEAF.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELEAF.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png index f2359665cd..fba7456790 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png index 1db84e04c8..37b52eddb5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TRINIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TRINIUM.png index 91ca406767..853f1e751d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TRINIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TRINIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TUNGSTENSTEEL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TUNGSTENSTEEL.png index bceec10ed1..9d7df62325 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TUNGSTENSTEEL.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TUNGSTENSTEEL.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CFOAM_HARDENED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CFOAM_HARDENED.png index ff3054dca1..092cf05057 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CFOAM_HARDENED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CFOAM_HARDENED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CHISELED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CHISELED.png index d62e67e243..86958feb32 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CHISELED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CHISELED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CRACKED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CRACKED.png index f3ea72ba63..b10608eb18 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CRACKED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CRACKED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_MOSSY.png index d11626dbfc..5ff5faff88 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE.png index fdfc5b19e6..e74216f285 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE_MOSSY.png index 88b57641a9..ad4aa968e4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS.png index bc2f73369c..9ff43ff2ea 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CHISELED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CHISELED.png index 2dda5f9b7c..b32e1a5acf 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CHISELED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CHISELED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CRACKED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CRACKED.png index aec8846da6..8d33383217 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CRACKED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CRACKED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_MOSSY.png index a47c360364..73f66f2aea 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE.png index 95a83a3257..457eadea28 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE_MOSSY.png index 631c754b42..2c8a07f4d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/COVER_WOOD_PLATE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/COVER_WOOD_PLATE.png index 9b4ac17f0a..a2fca2fe7e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/COVER_WOOD_PLATE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/COVER_WOOD_PLATE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_CRACKED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_CRACKED.png index eef200bd83..cfcc52dc3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_CRACKED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_CRACKED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_MOSSY.png index c2561733bb..ec3725001a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE.png index abea572c6c..512d5ac618 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE_MOSSY.png index 731ad790b8..88b0168b74 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS.png index b93b175a38..724ef5abd8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CHISELED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CHISELED.png index 09a72cd7ad..8210ca7e43 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CHISELED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CHISELED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CRACKED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CRACKED.png index 5e8e5d30d5..517ab9982e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CRACKED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CRACKED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_MOSSY.png index 684b09c85f..5c2cc3bb70 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE.png index 17712b6250..a2ee4b9b23 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE_MOSSY.png index 397b092845..c8da8aa8fb 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_SMOOTH.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_SMOOTH.png index 8dd88ff603..596f65f3ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_SMOOTH.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_SMOOTH.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_STONE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_STONE.png index 3b7a0c32c4..919fa794fe 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_STONE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_STONE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png index 7f896a09f0..c1b2be1924 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png index 666d51b82f..3d0789f019 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png index f863ec49e6..6573e17380 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png index 4f7704cee8..42c0a50871 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png index b438ec172d..82772a1a3a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png index 7559ff7e09..70783988ac 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png index 199fe6264c..0fa7d36b73 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png index 5ca1b2694f..9f63457796 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png index f863ec49e6..6573e17380 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png index f863ec49e6..6573e17380 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png index 27e88f3851..6373c0b97c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK.png index 50323cb7b3..f455724d5b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_0.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_0.png index eeb9b81523..750bdb0949 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_0.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_0.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_1.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_1.png index ff5be69bea..4553218967 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_1.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_10.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_10.png index a2985d0e80..3fac5c3635 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_10.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_10.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_11.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_11.png index 9f464a2f27..82e465f66d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_11.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_11.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_12.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_12.png index 5c904887a6..e140992b32 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_12.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_12.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_13.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_13.png index c2ed891b3a..c2700caaaa 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_13.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_13.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_14.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_14.png index 3dbb4aef90..71810e5b19 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_14.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_14.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_15.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_15.png index 391fe46643..06e480f3fd 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_15.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_15.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_2.png index 818f4aac27..636d3f0814 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_2.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_3.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_3.png index 95d50988b7..c24715f9ce 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_3.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_4.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_4.png index 95d50988b7..c24715f9ce 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_4.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_5.png index 7fbfaed6f9..2f8dea6274 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_5.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_6.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_6.png index ad4201a26a..0a88de15f5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_6.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_7.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_7.png index 3350bd2b1a..372a56e73b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_7.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_7.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_8.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_8.png index 3350bd2b1a..372a56e73b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_8.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_8.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_9.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_9.png index 61b2f419c0..b41007308f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_9.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_9.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_AWAKENEDDRACONIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_AWAKENEDDRACONIUM.png index c512e7a49a..a127301092 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_AWAKENEDDRACONIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_AWAKENEDDRACONIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ELECTRUMFLUX.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ELECTRUMFLUX.png index bd67a96008..cbc73237b8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ELECTRUMFLUX.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ELECTRUMFLUX.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_BOTTOM.png index af2b3b2037..921e0280de 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_SIDE.png index af2b3b2037..921e0280de 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_TOP.png index af2b3b2037..921e0280de 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_BOTTOM.png index cf7b890a15..5d54205d67 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_SIDE.png index b6194762d8..5d54205d67 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_TOP.png index 1eda91e544..5d54205d67 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_BOTTOM.png index ad519ab78d..4d6c5c4feb 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_SIDE.png index ad519ab78d..4d6c5c4feb 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_TOP.png index ad519ab78d..4d6c5c4feb 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png index f8b164b50e..6373c0b97c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_BOTTOM.png index 27a092adf4..dac4ea4b28 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_SIDE.png index 27a092adf4..dac4ea4b28 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_TOP.png index 27a092adf4..dac4ea4b28 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_BOTTOM.png index a2d780dc32..7225d38ce1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_SIDE.png index a2d780dc32..7225d38ce1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_TOP.png index a2d780dc32..7225d38ce1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_BOTTOM.png index a401c3900d..eafa7a9a2d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_SIDE.png index a401c3900d..eafa7a9a2d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_TOP.png index a401c3900d..eafa7a9a2d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_BOTTOM.png index a3564826ac..d0b9fa5a20 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_SIDE.png index a3564826ac..d0b9fa5a20 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_TOP.png index a3564826ac..d0b9fa5a20 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS.png index 5fc418d2d4..6062a15b70 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CHISELED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CHISELED.png index d47b0b51ea..6aad608f4c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CHISELED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CHISELED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CRACKED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CRACKED.png index fb2a493618..a116864b60 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CRACKED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CRACKED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_MOSSY.png index 42a57e755e..b07112c08e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE.png index cfd27b4fe0..2600aea71d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE_MOSSY.png index a7c74f987a..f82b76f050 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE.png index 0174dd645a..7779e4f773 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE_IDLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE_IDLE.png index 62895be74a..308bb6f8d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE_IDLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE_IDLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png index 02393fe829..4d2137a0b9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png index 399b32696d..bbfe389070 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ROCK_BREAKER_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ROCK_BREAKER_ACTIVE.png index 872154d256..10661df44a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ROCK_BREAKER_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ROCK_BREAKER_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png index 9f3de110d1..a4f1723327 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png index 4473aab984..c78a44f6d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png index 9f3de110d1..a4f1723327 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER.png index 2b97474b4f..d92c07a0fa 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png index de39763401..98c7a2dc44 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_SIDES.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_SIDES.png index cfe73788f4..7ed8076762 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_SIDES.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_SIDES.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_STEAM_MACERATOR_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_STEAM_MACERATOR_ACTIVE.png index ee39a79a98..37f505db3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_STEAM_MACERATOR_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_STEAM_MACERATOR_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block1.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block1.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block1.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block1.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block1.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/ore.png index 101c04c698..46ede5268c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/ore.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/ore.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block1.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block1.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block1.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block1.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block1.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block1.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block1.png index 78695fb493..7bd6f6f1fd 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/ore.png index 101c04c698..46ede5268c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/ore.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/ore.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block1.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/ore.png index 101c04c698..46ede5268c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/ore.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/ore.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block1.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block1.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block1.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block1.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block1.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block1.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block1.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block1.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/ore.png index 101c04c698..46ede5268c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/ore.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/ore.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block1.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block1.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block1.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/ore.png index 101c04c698..46ede5268c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/ore.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/ore.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block1.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block1.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeLarge.png index 65529e2772..a3303a32d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeMedium.png index 06b3e0d189..ab160124d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeSmall.png index b5e620f045..07697a3104 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block1.png index 78695fb493..7bd6f6f1fd 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block2.png index a56a62ad1b..acc0ffba07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block3.png index 6de77b309b..ef14045e3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block4.png index e5f7b5e76f..2421b3880e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block5.png index 4bb49067ed..9ec4cbcf63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block6.png index b58ded215f..605905b0ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/frameGt.png index d93c52c24c..1be3d77ac9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/ore.png index 101c04c698..46ede5268c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/ore.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/ore.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/1by1.png b/src/main/resources/assets/gregtech/textures/gui/1by1.png index 816e27a66b..88a9dd37ab 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/1by1.png and b/src/main/resources/assets/gregtech/textures/gui/1by1.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/2by2.png b/src/main/resources/assets/gregtech/textures/gui/2by2.png index b484485b28..7d9c5ba51b 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/2by2.png and b/src/main/resources/assets/gregtech/textures/gui/2by2.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/3by3.png b/src/main/resources/assets/gregtech/textures/gui/3by3.png index 1e5520d8c6..cb1185fd05 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/3by3.png and b/src/main/resources/assets/gregtech/textures/gui/3by3.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/4by4.png b/src/main/resources/assets/gregtech/textures/gui/4by4.png index b01d9b444f..dff1fcb579 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/4by4.png and b/src/main/resources/assets/gregtech/textures/gui/4by4.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/AdvancedCraftingTable.png b/src/main/resources/assets/gregtech/textures/gui/AdvancedCraftingTable.png index 3d5cc1591e..6ebfdda2a3 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/AdvancedCraftingTable.png and b/src/main/resources/assets/gregtech/textures/gui/AdvancedCraftingTable.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/BasicTank.png b/src/main/resources/assets/gregtech/textures/gui/BasicTank.png index f70f06294d..1ab07410b0 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/BasicTank.png and b/src/main/resources/assets/gregtech/textures/gui/BasicTank.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png b/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png index 558db61062..f1dc26e1cd 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png b/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png index 9642624d6e..cd6d834d13 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/BronzeBoiler.png b/src/main/resources/assets/gregtech/textures/gui/BronzeBoiler.png index 12a7d92d27..011207c770 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/BronzeBoiler.png and b/src/main/resources/assets/gregtech/textures/gui/BronzeBoiler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/BronzeCraftingTable.png b/src/main/resources/assets/gregtech/textures/gui/BronzeCraftingTable.png index fa432b2805..1839823f07 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/BronzeCraftingTable.png and b/src/main/resources/assets/gregtech/textures/gui/BronzeCraftingTable.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/ChestBuffer.png b/src/main/resources/assets/gregtech/textures/gui/ChestBuffer.png index 448f09f4b7..8901e60a4f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/ChestBuffer.png and b/src/main/resources/assets/gregtech/textures/gui/ChestBuffer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/ComputerCubeRedstone.png b/src/main/resources/assets/gregtech/textures/gui/ComputerCubeRedstone.png index cd287a0a2e..3fb234f8af 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/ComputerCubeRedstone.png and b/src/main/resources/assets/gregtech/textures/gui/ComputerCubeRedstone.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/CropHarvestor.png b/src/main/resources/assets/gregtech/textures/gui/CropHarvestor.png index 12ce68e790..2b0508d23a 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/CropHarvestor.png and b/src/main/resources/assets/gregtech/textures/gui/CropHarvestor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/DataAccess2by2.png b/src/main/resources/assets/gregtech/textures/gui/DataAccess2by2.png index 99cf426016..77f2d6df7b 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/DataAccess2by2.png and b/src/main/resources/assets/gregtech/textures/gui/DataAccess2by2.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/DataAccess4by4.png b/src/main/resources/assets/gregtech/textures/gui/DataAccess4by4.png index 8755bacc85..fd6450bb24 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/DataAccess4by4.png and b/src/main/resources/assets/gregtech/textures/gui/DataAccess4by4.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/ElectricAutoWorkbench.png b/src/main/resources/assets/gregtech/textures/gui/ElectricAutoWorkbench.png index 74b2edbb82..880dc58461 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/ElectricAutoWorkbench.png and b/src/main/resources/assets/gregtech/textures/gui/ElectricAutoWorkbench.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/ElectricBufferSmall.png b/src/main/resources/assets/gregtech/textures/gui/ElectricBufferSmall.png index 9417d6e5d8..0028d88412 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/ElectricBufferSmall.png and b/src/main/resources/assets/gregtech/textures/gui/ElectricBufferSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/ElectricItemCleaner.png b/src/main/resources/assets/gregtech/textures/gui/ElectricItemCleaner.png index 4b046535d0..1fdfdb9366 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/ElectricItemCleaner.png and b/src/main/resources/assets/gregtech/textures/gui/ElectricItemCleaner.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png b/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png index e56d1e686e..4f1264a6da 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png and b/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Filter.png b/src/main/resources/assets/gregtech/textures/gui/Filter.png index c8dbeaffcd..a06d32dfb7 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Filter.png and b/src/main/resources/assets/gregtech/textures/gui/Filter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Implosion.png b/src/main/resources/assets/gregtech/textures/gui/Implosion.png index 7e855b192a..20faf5060f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Implosion.png and b/src/main/resources/assets/gregtech/textures/gui/Implosion.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/InventoryManager.png b/src/main/resources/assets/gregtech/textures/gui/InventoryManager.png index dfebd41ab3..fd60362015 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/InventoryManager.png and b/src/main/resources/assets/gregtech/textures/gui/InventoryManager.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/ItemDistributor.png b/src/main/resources/assets/gregtech/textures/gui/ItemDistributor.png index bb66203449..6b238d6d4c 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/ItemDistributor.png and b/src/main/resources/assets/gregtech/textures/gui/ItemDistributor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/MagicAbsorber.png b/src/main/resources/assets/gregtech/textures/gui/MagicAbsorber.png index cb6915fc80..6c642cbb0c 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/MagicAbsorber.png and b/src/main/resources/assets/gregtech/textures/gui/MagicAbsorber.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Maintenance.png b/src/main/resources/assets/gregtech/textures/gui/Maintenance.png index dc28806114..7aa0815cf5 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Maintenance.png and b/src/main/resources/assets/gregtech/textures/gui/Maintenance.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/RedstoneCircuitBlock.png b/src/main/resources/assets/gregtech/textures/gui/RedstoneCircuitBlock.png index 0df259c657..91adc35d51 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/RedstoneCircuitBlock.png and b/src/main/resources/assets/gregtech/textures/gui/RedstoneCircuitBlock.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Regulator.png b/src/main/resources/assets/gregtech/textures/gui/Regulator.png index ecc62186e0..653819a7e7 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Regulator.png and b/src/main/resources/assets/gregtech/textures/gui/Regulator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Retriever.png b/src/main/resources/assets/gregtech/textures/gui/Retriever.png index ca704ab131..5e4273f451 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Retriever.png and b/src/main/resources/assets/gregtech/textures/gui/Retriever.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Safe.png b/src/main/resources/assets/gregtech/textures/gui/Safe.png index 7a56266b88..504b3b96f9 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Safe.png and b/src/main/resources/assets/gregtech/textures/gui/Safe.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/SolarBoiler.png b/src/main/resources/assets/gregtech/textures/gui/SolarBoiler.png index 266b060dae..c8ee4febe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/SolarBoiler.png and b/src/main/resources/assets/gregtech/textures/gui/SolarBoiler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Sonictron.png b/src/main/resources/assets/gregtech/textures/gui/Sonictron.png index ca259f6e92..be0bb0aee5 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Sonictron.png and b/src/main/resources/assets/gregtech/textures/gui/Sonictron.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/SteelBoiler.png b/src/main/resources/assets/gregtech/textures/gui/SteelBoiler.png index 3d702e5e26..b5c611cb54 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/SteelBoiler.png and b/src/main/resources/assets/gregtech/textures/gui/SteelBoiler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/SuperBuffer.png b/src/main/resources/assets/gregtech/textures/gui/SuperBuffer.png index d6bcef70b6..c4d69770b6 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/SuperBuffer.png and b/src/main/resources/assets/gregtech/textures/gui/SuperBuffer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Teleporter.png b/src/main/resources/assets/gregtech/textures/gui/Teleporter.png index 84d064d3dd..7c55244052 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Teleporter.png and b/src/main/resources/assets/gregtech/textures/gui/Teleporter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Inventory.png b/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Inventory.png index ba6cc37a2e..04035b63c8 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Inventory.png and b/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Inventory.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Main.png b/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Main.png index ac80150143..942b64dae2 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Main.png and b/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Main.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Settings.png b/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Settings.png index d6e9228961..1fce53c657 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Settings.png and b/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Settings.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/TypeFilter.png b/src/main/resources/assets/gregtech/textures/gui/TypeFilter.png index 78695e82e5..cd0fc3b1c4 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/TypeFilter.png and b/src/main/resources/assets/gregtech/textures/gui/TypeFilter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png b/src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png index 59004127eb..1dbaec1d3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png and b/src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/armorgui3x3.png b/src/main/resources/assets/gregtech/textures/gui/armorgui3x3.png index 1f1859a733..a41d3354f5 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/armorgui3x3.png and b/src/main/resources/assets/gregtech/textures/gui/armorgui3x3.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/armorgui3x4.png b/src/main/resources/assets/gregtech/textures/gui/armorgui3x4.png index a0d052a344..0f40d89028 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/armorgui3x4.png and b/src/main/resources/assets/gregtech/textures/gui/armorgui3x4.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/AlloySmelter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/AlloySmelter.png index c6e692c8f1..895e1b036d 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/AlloySmelter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/AlloySmelter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Amplifabricator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Amplifabricator.png index 428aadf1d9..36701b0ede 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Amplifabricator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Amplifabricator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ArcFurnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ArcFurnace.png index ea08d17ff6..ca03fc27ab 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ArcFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ArcFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png index 7ab09c5f2e..674c968d7b 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png index a52fee09ba..b6c69403fa 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png index b619826025..9fa088f033 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Bender.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Bender.png index aa29df83d4..98a9226759 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Bender.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Bender.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png index 54e112e67b..1b6fa4e9e1 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png index d34569c5f3..29317bc001 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png index decb60232f..872079e18e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png index 6bbe2eb904..479a0c7c75 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png index dc9bbc559d..b679e8a7b8 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png index 38af0ee224..62b8ed9e79 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Canner.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Canner.png index 7a49b19be0..9232ff01ce 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Canner.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Canner.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Centrifuge.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Centrifuge.png index 44626e8d27..fc806eb224 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Centrifuge.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Centrifuge.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png index 9a2e4ff2ab..c80a688fec 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png index 6e3fbbea62..77a57268f6 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.png index 003c21061f..ce4d3faac7 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Compressor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Compressor.png index 8e5c86fe28..5ccf8f46f8 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Compressor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Compressor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter.png index 808c818e6c..85861c3353 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png index 57d556dc77..5fb7c3fe73 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Default.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Default.png index 628d86f05f..179e9471cf 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Default.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Default.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Disassembler.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Disassembler.png index a53690a20f..87273ae994 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Disassembler.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Disassembler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png index 0fb00229d7..f70cfacbce 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Distillery.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Distillery.png index 48d0d8773e..5624165ccf 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Distillery.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Distillery.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Furnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Furnace.png index 0ca33f7564..a393639e92 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Furnace.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Furnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Oven.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Oven.png index 0ca33f7564..a393639e92 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Oven.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Oven.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Electrolyzer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Electrolyzer.png index a55c3e375c..97e034b5d3 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Electrolyzer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Electrolyzer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ElectromagneticSeparator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ElectromagneticSeparator.png index fc559a016b..65fdc6afa2 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ElectromagneticSeparator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ElectromagneticSeparator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extractor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extractor.png index da2b5ad0cd..385ad036bc 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extractor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extractor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extruder.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extruder.png index 1e5ea466df..1d21e295a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extruder.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extruder.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Fermenter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Fermenter.png index 059fbb66e3..e26442429a 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Fermenter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Fermenter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCanner.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCanner.png index 69e6543cb7..8ea4355400 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCanner.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCanner.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCannerNEI.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCannerNEI.png index 2ca461306c..3c5dbf83d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCannerNEI.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCannerNEI.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidExtractor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidExtractor.png index f49591b300..64205f6774 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidExtractor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidExtractor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidHeater.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidHeater.png index 67d62b987f..caf99a648e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidHeater.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidHeater.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidSolidifier.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidSolidifier.png index 4d2de6d58f..7769f708ff 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidSolidifier.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidSolidifier.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionReactor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionReactor.png index f72b37ac2f..ea4b4c542e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionReactor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionReactor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Hammer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Hammer.png index 8640de0b3c..05720e21d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Hammer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Hammer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/LaserEngraver.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/LaserEngraver.png index 7a94619dad..1c48550537 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/LaserEngraver.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/LaserEngraver.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Lathe.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Lathe.png index cb099355c5..2357790895 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Lathe.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Lathe.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator1.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator1.png index 4ed79cedae..6304367df2 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator1.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator1.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator2.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator2.png index 78f8b3cc00..2a1f3f9032 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator2.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator2.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator3.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator3.png index 66cf9ade79..b807ce3f0d 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator3.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator3.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator4.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator4.png index 9754f2cd94..373199800d 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator4.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator4.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Massfabricator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Massfabricator.png index 23c940fad0..08ee9fc94d 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Massfabricator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Massfabricator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Miner.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Miner.png index a9d7978b69..813ede2e54 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Miner.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Miner.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer.png index 592eb6e307..0e1bdd6cfb 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png index 628d86f05f..179e9471cf 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png index f72b37ac2f..ea4b4c542e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/OreWasher.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/OreWasher.png index 52c1e18717..f73814729a 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/OreWasher.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/OreWasher.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Packager.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Packager.png index 2e0690d656..2eb18ac721 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Packager.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Packager.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaArcFurnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaArcFurnace.png index 9fa8401648..7d72bbbe9e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaArcFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaArcFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Polarizer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Polarizer.png index a60bb4a3bc..0000e46d4c 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Polarizer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Polarizer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/PotionBrewer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/PotionBrewer.png index 8d543ccced..288661f70f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/PotionBrewer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/PotionBrewer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Press.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Press.png index e4efb0cc12..6fa42f25de 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Press.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Press.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Printer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Printer.png index 8dc7155bb9..554f246ce6 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Printer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Printer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Recycler.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Recycler.png index b4a99d7005..18c01099fc 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Recycler.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Recycler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Replicator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Replicator.png index f671c60c15..fc4d7cc332 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Replicator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Replicator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/RockBreaker.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/RockBreaker.png index fe0ef260f3..d0f574a6ec 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/RockBreaker.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/RockBreaker.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Scanner.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Scanner.png index 515cdb43f3..9238fcb73b 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Scanner.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Scanner.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Sifter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Sifter.png index d967ed46d6..c664b92257 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Sifter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Sifter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Slicer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Slicer.png index 31a86e37f9..a4172d49a3 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Slicer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Slicer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png index 862c785606..48b7397bd2 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png index cca9978663..928fc91d23 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png index 700944727f..057c3d22be 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png index 0250f22b31..6f719db331 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png index f379f8c000..03b111376d 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png index 141879d5b6..85099c362f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ThermalCentrifuge.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ThermalCentrifuge.png index 859f6e507a..1a09c456ce 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ThermalCentrifuge.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ThermalCentrifuge.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Unpackager.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Unpackager.png index 6fbe611400..105024c8ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Unpackager.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Unpackager.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Wiremill.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Wiremill.png index 47904bea1e..d4eae8f968 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Wiremill.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Wiremill.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/Advanced_Miner2.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/Advanced_Miner2.png index 7c9bbc058a..0a09ba62d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/Advanced_Miner2.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/Advanced_Miner2.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/AssemblyLine.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/AssemblyLine.png index 3998db0137..36105ebc2e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/AssemblyLine.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/AssemblyLine.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png index 65e6ac3197..3889b80a9e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.png index f05441593d..ed7c1c9752 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/ElectricBlastFurnace.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/ElectricBlastFurnace.png index 2ad960beb0..b05fb723e0 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/ElectricBlastFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/ElectricBlastFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/FusionComputer.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/FusionComputer.png index bf6a2f87c3..0782e40a97 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/FusionComputer.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/FusionComputer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/ImplosionCompressor.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/ImplosionCompressor.png index 3998db0137..36105ebc2e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/ImplosionCompressor.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/ImplosionCompressor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeBoiler.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeBoiler.png index ba06f705b8..396ccf40aa 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeBoiler.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeBoiler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png index 2d7771a4ef..0880731c5b 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png index b9271e2140..be4710fd0d 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeHeatExchanger.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeHeatExchanger.png index 9f0f9d59b2..f81f62032c 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeHeatExchanger.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeHeatExchanger.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.png index 296d75f9dd..fc820c8dfa 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiFurnace.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiFurnace.png index 52fdd6a5c5..48fd886a08 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiblockDisplay.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiblockDisplay.png index f2def4b3f0..0f6fb0936b 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiblockDisplay.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiblockDisplay.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.png index 57e92ac9db..0bb2a5b47f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png index 7b60ec4de7..3dbf7e4efa 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/ProcessingArray.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/ProcessingArray.png index 3998db0137..36105ebc2e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/ProcessingArray.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/ProcessingArray.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png index d3bc30c7bd..6d139ba830 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/VacuumFreezer.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/VacuumFreezer.png index 3998db0137..36105ebc2e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/VacuumFreezer.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/VacuumFreezer.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.360k_NaK_Coolantcell.png b/src/main/resources/assets/gregtech/textures/items/gt.360k_NaK_Coolantcell.png index 8f5958a099..e0de765db3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.360k_NaK_Coolantcell.png and b/src/main/resources/assets/gregtech/textures/items/gt.360k_NaK_Coolantcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCell.png b/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCell.png index 295686fa5d..1ec51c9e3f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCell.png and b/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCellDep.png index 4e51faddc2..4a2be79c54 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png b/src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png index a15cef8e90..c52420770a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png and b/src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png index 56735e5646..593a167a60 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.MNqCell.png b/src/main/resources/assets/gregtech/textures/items/gt.MNqCell.png index b81e9b6e3a..ddfa6d5fe2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.MNqCell.png and b/src/main/resources/assets/gregtech/textures/items/gt.MNqCell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.MNqCellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.MNqCellDep.png index 40eb4a6256..fb0f36fdf6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.MNqCellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.MNqCellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png b/src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png index f9a1d03de5..c876a5043d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png and b/src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png index 72d635ac50..04b7102011 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCell.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCell.png index a1d34540f7..497b67456a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCell.png and b/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCellDep.png index 100dbe5da1..86635d2eeb 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png index 8209d57b72..b8d0086e2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png and b/src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png index f812d369eb..32028fde1d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_Thoriumcell.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_Thoriumcell.png index fa65528d47..79ad4bcedf 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Quad_Thoriumcell.png and b/src/main/resources/assets/gregtech/textures/items/gt.Quad_Thoriumcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_ThoriumcellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_ThoriumcellDep.png index fa65528d47..79ad4bcedf 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Quad_ThoriumcellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.Quad_ThoriumcellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png index 567eccb544..c6f58f31da 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png and b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/0.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/0.png index a1b0d09dc3..00cbd2ffe8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/0.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/0.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/1.png index b74ffa65ab..20f3cc68b4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/1.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/11.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/11.png index 6d3655a1fe..f2f82eccb9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/11.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/11.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/13.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/13.png index bfb8e56d0b..837f19ae17 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/13.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/13.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/14.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/14.png index 2228b9297e..f8345b4f0e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/14.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/14.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/16.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/16.png index 874c4077fc..07ed984368 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/16.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/16.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/2.png index f09fc0259c..b2c7782dba 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/2.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/3.png index ff87bf6f79..317ad0ef3b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/3.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png index 855dbae37d..1edb7a15de 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png index 7f04b405b4..f6b5b5f9b6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png index f2f2fca912..47e8a16089 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png index 9fcb969478..de34f33840 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png index 8577b6dc61..df3378f7dc 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png index 2347de612c..117f3c8b68 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png index 2bddc5f15d..6469277455 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png index d2420b624d..5f1c81c0a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/325.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/325.png index 0ba7b70c02..db2df22f33 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/325.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/325.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png index 47545b369a..4d7815f860 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/375.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/375.png index 356a6711aa..59ca3515a7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/375.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/375.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/376.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/376.png index b582d4f07f..a169f426c7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/376.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/376.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/4.png index 7747e58e7c..5e44f19076 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/4.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png index 6d2a21cf93..00611b5e01 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png index 86ae8dd7e2..77768bae23 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png index 3131758123..c7b89790c6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png index 0a9d1f880d..148815872c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png index 61f7255c52..3f59110864 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png index 5cba994104..88359590f2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png index 80cd9711cd..86edea02fa 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/462.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/462.png index 44407a7a10..2004533fcd 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/462.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/462.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/463.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/463.png index 713c2f5350..f4c1775ccf 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/463.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/463.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/464.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/464.png index bce9843201..043bd4a44b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/464.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/464.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/482.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/482.png index 6cd6dfdea4..3fc54f7220 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/482.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/482.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/483.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/483.png index 84cd6f024d..0f8d981f60 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/483.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/483.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/484.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/484.png index bc4b420950..61672e8a54 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/484.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/484.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/5.png index 540554a37f..0150b44f92 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/5.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png index 2f465760da..d2a3daa888 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png index fd3942cad6..c618f9b615 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png index ed27c58baf..24a51a0800 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png index ae3bcc1789..98e8deb8ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png index 2ce8b2bca5..bd447a7bb7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png index 024f812e55..e9d3a4f72f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png index 64076bd7d4..a12707c367 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png index d9ca638485..da60c6f964 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/6.png index e296a0b48f..021b28b1b6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/6.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/1.png index 5b01e1f1a2..716d8e150e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/1.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/2.png index c8c2259ec7..22f91d7823 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/2.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/3.png index 8278e8a66a..d63443e360 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/3.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/4.png index 4f8af6fbaa..6092bc12eb 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/4.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/5.png index 2bcd2f7e98..6c4b604625 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/5.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/6.png index 68f76dba01..8666340761 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/6.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/7.png index de3ce2451b..113fe9c6c9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/7.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/8.png index a9f16893b2..8b4916eef9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/8.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/8.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png index a09eb16257..cf430d6f1f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png index 31e316ba9b..8b43335e27 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png index bfa4437a85..47425937d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png index 22af0f52b1..2431f37bb9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png index 8281767ef1..b8c02d7ca8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/665.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/665.png index 14f335dbbd..32c6aa37ce 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/665.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/665.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png index 025faa6a97..9e3e6da8ef 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png index 72648106ec..056d2e0865 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/669.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/669.png index dc7a207ee0..444de8ed2b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/669.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/669.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/7.png index 6056701582..d27053acea 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/7.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png index 0084f55bf6..f0b57bed57 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/722.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/722.png index 8507f96101..8163bebda5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/722.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/722.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/723.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/723.png index f956068e7a..665ca11b09 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/723.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/723.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png index e14156d0f9..dea697ac99 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png index 7fc79276ee..2be57fcf4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png index edf04adc3d..3fff541b06 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png index d181c017ed..b1661302c4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png index 190c30550b..143d772de3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png index 7bd3b543a4..ac4a34d0eb 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png index f7187595f1..634aef28e0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png index 93c9ca2bf3..cf6836a613 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png index 52df2bd8a2..1e104010f3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png index abf9e56ba7..f3c9520ef8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/763.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/763.png index 7a77ff965e..56fa1f0974 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/763.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/763.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/202.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/202.png index 65ecfe6b40..cd9dfabdf8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/202.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/202.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/214.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/214.png index 0ed1a61146..1768010582 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/214.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/214.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/220.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/220.png index 1cddc93f83..eac9b08f9f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/220.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/220.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/221.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/221.png index d832abf23a..47bc372116 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/221.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/221.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/222.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/222.png index a2411f6a1a..618632b305 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/222.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/222.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/223.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/223.png index 9b2acc43e1..dec24c7c6e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/223.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/223.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/224.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/224.png index 1a2eb80c80..7be214bead 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/224.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/224.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/230.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/230.png index c693d33d6d..701103838d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/230.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/230.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/233.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/233.png index 18d69da397..2d7e2df62d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/233.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/233.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/240.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/240.png index 5592fb8aec..0f6c8ab694 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/240.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/240.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/241.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/241.png index bbc35833a6..ab0a274903 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/241.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/241.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/242.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/242.png index 8131ae5399..fb95a84da1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/242.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/242.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/243.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/243.png index c175c92c50..9e9ff2355d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/243.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/243.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/419.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/419.png index d5f6394f54..111ba51fc3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/419.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/419.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/425.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/425.png index e482a1864a..e3ae86619c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/425.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/425.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/426.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/426.png index cc67c6d8f0..ff6d34692a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/426.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/426.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/427.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/427.png index 95582c7d76..96ae060697 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/427.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/427.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/470.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/470.png index 52e1759a65..10708790fe 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/470.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/470.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/471.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/471.png index 700dec8dc8..42b359d392 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/471.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/471.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/472.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/472.png index 609f84f36d..8b731f2aad 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/472.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/472.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/473.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/473.png index 19945c8e0b..a640b2ce99 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/473.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/473.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/474.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/474.png index 8841306818..795eac6bde 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/474.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/474.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/476.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/476.png index 8c270784b7..330962b506 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/476.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/476.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/477.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/477.png index 639665674b..e93218897f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/477.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/477.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/478.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/478.png index 4cb3bbe7c9..fca75800b3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/478.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/478.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/479.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/479.png index 0684120551..611bbe1916 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/479.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/479.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/480.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/480.png index 7c8bb86d56..3839beca71 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/480.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/480.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/481.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/481.png index 80ee0bab16..1c473029b9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/481.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/481.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/482.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/482.png index e74835b4c0..334ccc4a27 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/482.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/482.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/483.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/483.png index 7584edcdee..cd25e7c835 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/483.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/483.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/484.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/484.png index 15aec92695..096db0b683 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/484.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/484.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/485.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/485.png index ac3faa8362..d6805ab256 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/485.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/485.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/486.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/486.png index 67af7d7ffc..83c0a15e81 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/486.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/486.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/487.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/487.png index d77a95d487..3ee7908e6d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/487.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/487.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/488.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/488.png index 27e06815d9..3704130e94 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/488.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/488.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/489.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/489.png index 0822046e1b..e170735e1e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/489.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/489.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/490.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/490.png index 32cbdfa1db..1e10046a9c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/490.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/490.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/491.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/491.png index d3bf2a70e2..3dc323a042 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/491.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/491.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/492.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/492.png index 8ed07becee..3f084cd211 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/492.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/492.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/493.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/493.png index cbbf68ca69..8b70e48fb7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/493.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/493.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/494.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/494.png index f60760fd67..4f76e4a8ec 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/494.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/494.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/495.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/495.png index f75e597255..1fea1f9725 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/495.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/495.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/496.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/496.png index 5e4a043581..928a593551 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/496.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/496.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/497.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/497.png index 59e57b63e4..529f9e0001 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/497.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/497.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/498.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/498.png index 1788d4f28e..a717799278 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/498.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/498.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/499.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/499.png index 3e2c35c590..538817e8b1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/499.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/499.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png index 9c58ab1034..023eb86b7b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png index b69ea5397c..248120ef47 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png index f95801e345..38729236c2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png index a526f69e1c..7f8b764373 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/536.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/536.png index 872dbc43d3..5980b55b71 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/536.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/536.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/554.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/554.png index f864178bcf..dd1f3c7f64 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/554.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/554.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/561.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/561.png index 1db601e63d..184ce23443 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/561.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/561.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/562.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/562.png index 0c39994c6f..53841cbb0c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/562.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/562.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/563.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/563.png index 8b2b6e2bee..a5639aae4f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/563.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/563.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/564.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/564.png index 67be3aca89..4642684c99 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/564.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/564.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/565.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/565.png index f3ff9a0798..c295ab8a61 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/565.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/565.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/566.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/566.png index 48ba281619..274ea366c2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/566.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/566.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/567.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/567.png index db940173b0..cb43c472cc 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/567.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/567.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/766.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/766.png index ae86249085..33564435da 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/766.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/766.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png index 5930084b4c..e962e047eb 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/101.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/101.png index c971bfa81d..1fe9dbb2fa 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/101.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/101.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png index 7108a9fbe6..beab9d991e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/103.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/103.png index 9a4f886c0a..0c33332bc2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/103.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/103.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/104.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/104.png index 577d9a49ab..6957744766 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/104.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/104.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/105.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/105.png index 80d15f4d36..e44d2b4658 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/105.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/105.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/106.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/106.png index d8bef2fda0..4cf963bb73 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/106.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/106.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png index 05825a9675..ff639d75fc 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/110.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/110.png index 96c17d8452..4e6024d33d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/110.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/110.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/113.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/113.png index 6f8d8bdde5..a1388c3ac0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/113.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/113.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png index f91bcd2f26..4882f87b5c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png index fe039142e0..35c7e76946 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png index 2fad5c9386..027b3329ba 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png index 08ff840ea5..6bcd8ca8c8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/140.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/140.png index 693a70b544..7db71da61e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/140.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/140.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/141.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/141.png index 931c7fb4af..d9ed8c2396 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/141.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/141.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/142.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/142.png index 70cea830a2..957efc46ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/142.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/142.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/143.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/143.png index cfa3474e6a..29da3e2cf9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/143.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/143.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/144.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/144.png index 2b48fc9d20..f733e63f38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/144.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/144.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/145.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/145.png index f213f83db0..98f13cabd7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/145.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/145.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/146.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/146.png index 37b064afcf..f25cd66c4a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/146.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/146.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/147.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/147.png index 96483e97b1..9c8f8b7b58 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/147.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/147.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/148.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/148.png index 85b5d912ef..a236483f5c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/148.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/148.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png index f030991aee..a8bb5a2c26 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/150.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/150.png index 4ef851a476..479c5bcb1f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/150.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/150.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/151.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/151.png index 0d5a574cd5..5df11a8bf3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/151.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/151.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/152.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/152.png index 316c03a760..933b75c6a3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/152.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/152.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/153.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/153.png index 272ced3b3c..5a71ca7fcd 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/153.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/153.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/160.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/160.png index 420c8c9b32..def01f87fb 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/160.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/160.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/161.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/161.png index 15ec128741..d25f895696 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/161.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/161.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/162.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/162.png index 14ca7821d5..1cd3a66aaf 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/162.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/162.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/163.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/163.png index 45d2111075..80a68f82ac 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/163.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/163.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/164.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/164.png index 42732207da..52c31518ca 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/164.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/164.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/165.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/165.png index 4080403ff2..24b0cf5fd1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/165.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/165.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/21.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/21.png index de8fc0a1ba..ce444b0a66 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/21.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/21.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/22.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/22.png index 4b151f9be8..deaece40e4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/22.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/22.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png index 28beb6060d..c5011409f5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.png index 8bb87a16ac..8f68a1beda 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.png index 060fc649e6..df79269cc7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.png index ab8b59a35e..968614667b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.png index 3fdb6b464a..1dce1924ef 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/40.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/40.png index 4829840d76..954fc6a77f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/40.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/40.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.png index 5cb8856559..0d145e8fc3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.png index 62d3eb8d1a..7659c78ea0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.png index 9c7f70c81b..0fabd6a617 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.png index da74fea285..b392a4f770 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.png index 83321ca27d..abf46b2384 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.png index 9db8e44875..d66d5845dd 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.png index 0b94958981..64d3327ecf 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.png index 79751f715a..e23c7dcc68 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.png index d2923827fc..5d748aba58 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png index df4434d72e..abafc6cace 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png index 967943a273..6af14558f8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png index 776233d003..a56d5c7ac3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png index 95fe208307..1fc596902e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png index d9791e2687..2758dc618f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.png index 2cc9dafcad..8157302e10 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.png index 7f4722c8cb..91f557d694 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.png index 910070bd5a..ad7eb930d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png index 91414817f8..d5d599bb81 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png index f8e9fa8b59..b7a790f313 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png index 57185d40bf..dc64f01208 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/61.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/61.png index 216e6de4f6..3b25755c65 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/61.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/61.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.png index 0ccd45871b..5ffb009604 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/63.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/63.png index 8a91f91e74..e3baf8b827 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/63.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/63.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.png index cf0360a77c..3483666f90 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.png index 4d146a95c5..86fdf014a9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png index e505f31be8..cef3fe6a8f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/69.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/69.png index 36543fd45f..7b699162ea 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/69.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/69.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.png index eebf76ff51..d3e6f46d2e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.png index cd3f90822d..5e61e241b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.png index 8e7cdee46e..42777d18af 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png index 8748b6dae4..fb8b2743e0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png index d7c74e8f19..cf0a35a5f6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/78.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/78.png index a495c4461c..b38b7ebe9d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/78.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/78.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png index 6ae0c3cb8b..4cce3fbff4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png index 570cf27d9a..3ba19aba7b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png index 4cae7f4118..cecbe9edfe 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png index 3f366301b9..f71a18590e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png index be9e07ae7a..c742f1d2d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png index f53e236793..2cd5861e2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png index 467fc0c666..ba5d0712ff 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.neutroniumHeatCapacitor.png b/src/main/resources/assets/gregtech/textures/items/gt.neutroniumHeatCapacitor.png index 141c8a578e..9c46e064d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.neutroniumHeatCapacitor.png and b/src/main/resources/assets/gregtech/textures/items/gt.neutroniumHeatCapacitor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumDual.png b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumDual.png index 80fe3da0e3..5f3a7eeb75 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumDual.png and b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumDual.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumQuad.png b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumQuad.png index 1a58dad322..2021a70e88 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumQuad.png and b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumQuad.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumSimple.png b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumSimple.png index b2a9614b62..539be70765 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumSimple.png and b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumSimple.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.sensorcard.png b/src/main/resources/assets/gregtech/textures/items/gt.sensorcard.png index 151bdf722c..03053ba1c3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.sensorcard.png and b/src/main/resources/assets/gregtech/textures/items/gt.sensorcard.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/iconsets/HANDLE_SOLDERING.png b/src/main/resources/assets/gregtech/textures/items/iconsets/HANDLE_SOLDERING.png index 3b66136453..8dfc40c15b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/iconsets/HANDLE_SOLDERING.png and b/src/main/resources/assets/gregtech/textures/items/iconsets/HANDLE_SOLDERING.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE.png b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE.png index 7be4cc29d3..8441488c2f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE.png and b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE.png b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE.png index 7be4cc29d3..8441488c2f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE.png and b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE.png b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE.png index 7be4cc29d3..8441488c2f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE.png and b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL.png b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL.png index 7be4cc29d3..8441488c2f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL.png and b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/gem.png index dd20d74f2c..c2697bbeee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/gem.png index 182ba96343..d4c4c8cdd1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/gem.png index dd20d74f2c..c2697bbeee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/gem.png index dd20d74f2c..c2697bbeee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/plate.png index 7d04a95123..e27ed68bf0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/gem.png index dd20d74f2c..c2697bbeee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/gem.png index dd20d74f2c..c2697bbeee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/gem.png index 45b050e482..b46f499ddb 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/plate.png index 7d04a95123..e27ed68bf0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/gem.png index dd20d74f2c..c2697bbeee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/plate.png index f4d4b8a6af..b414603a30 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/plate.png index 7d04a95123..e27ed68bf0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed_OVERLAY.png index 607653bd4d..6e4b78a905 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE.png index a4a6bd742d..9aae5e683b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed.png index a763f6b0df..26086a026b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushedPurified.png index b2d4e2a476..c362080eb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed_OVERLAY.png index a1600cad7c..3108c1a1a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/gem.png index dd20d74f2c..c2697bbeee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/handleMallet.png index c7bb0e6631..aad341cf2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/lens_OVERLAY.png index 51cb4b73a0..8cb60c4832 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/rotor.png index 6c6a16bfe5..1d58fd8c89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadMallet.png index 58a7522b4b..4b740dc7b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadSoldering.png index 41545c8b38..39b9d8163a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed.png index a763f6b0df..86905a2424 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushedPurified.png index b2d4e2a476..a8b71e2a60 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed_OVERLAY.png index a1600cad7c..b23d7ca7e2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/gem.png index dd20d74f2c..5b6b746841 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/handleMallet.png index c7bb0e6631..36654323a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/lens_OVERLAY.png index 51cb4b73a0..873f4b8e59 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/rotor.png index 6c6a16bfe5..db2ad859b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadMallet.png index 58a7522b4b..9c59203251 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadSoldering.png index 41545c8b38..439aba4d33 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed.png index a763f6b0df..86905a2424 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushedPurified.png index b2d4e2a476..a8b71e2a60 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed_OVERLAY.png index a1600cad7c..b23d7ca7e2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/gem.png index dd20d74f2c..5b6b746841 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/handleMallet.png index c7bb0e6631..36654323a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/lens_OVERLAY.png index 51cb4b73a0..873f4b8e59 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/rotor.png index 6c6a16bfe5..db2ad859b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadMallet.png index 58a7522b4b..9c59203251 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadSoldering.png index 41545c8b38..439aba4d33 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed.png index a763f6b0df..86905a2424 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushedPurified.png index b2d4e2a476..a8b71e2a60 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed_OVERLAY.png index a1600cad7c..b23d7ca7e2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/gem.png index dd20d74f2c..5b6b746841 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/handleMallet.png index c7bb0e6631..36654323a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/lens_OVERLAY.png index 51cb4b73a0..873f4b8e59 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/plate.png index 7d04a95123..5e8d61ab07 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/rotor.png index 6c6a16bfe5..db2ad859b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadMallet.png index 58a7522b4b..9c59203251 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadSoldering.png index 41545c8b38..439aba4d33 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed.png index a763f6b0df..86905a2424 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushedPurified.png index b2d4e2a476..a8b71e2a60 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed_OVERLAY.png index a1600cad7c..b23d7ca7e2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/handleMallet.png index c7bb0e6631..36654323a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/lens_OVERLAY.png index 51cb4b73a0..873f4b8e59 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/plate.png index 7d04a95123..5e8d61ab07 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/rotor.png index 6c6a16bfe5..db2ad859b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadMallet.png index 58a7522b4b..9c59203251 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadSoldering.png index 41545c8b38..439aba4d33 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed.png index a763f6b0df..86905a2424 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushedPurified.png index b2d4e2a476..a8b71e2a60 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed_OVERLAY.png index a1600cad7c..b23d7ca7e2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/gem.png index dd20d74f2c..5b6b746841 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/handleMallet.png index c7bb0e6631..36654323a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/lens_OVERLAY.png index 51cb4b73a0..873f4b8e59 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/plate.png index 7d04a95123..5e8d61ab07 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/rotor.png index 6c6a16bfe5..db2ad859b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadMallet.png index 58a7522b4b..9c59203251 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadSoldering.png index 41545c8b38..439aba4d33 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed.png index a763f6b0df..86905a2424 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushedPurified.png index b2d4e2a476..a8b71e2a60 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed_OVERLAY.png index a1600cad7c..b23d7ca7e2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/gem.png index dd20d74f2c..5b6b746841 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/handleMallet.png index c7bb0e6631..36654323a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/lens_OVERLAY.png index 51cb4b73a0..873f4b8e59 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/rotor.png index 6c6a16bfe5..db2ad859b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadMallet.png index 58a7522b4b..9c59203251 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadSoldering.png index 41545c8b38..439aba4d33 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed.png index a5c4a1e355..86905a2424 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushedPurified.png index b2d4e2a476..a8b71e2a60 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed_OVERLAY.png index 3d2114ff84..9823450a43 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/gem.png index dd20d74f2c..5b6b746841 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/handleMallet.png index c7bb0e6631..36654323a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/lens_OVERLAY.png index 51cb4b73a0..873f4b8e59 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/plate.png index 7d04a95123..5e8d61ab07 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/rotor.png index 6c6a16bfe5..db2ad859b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadMallet.png index 58a7522b4b..9c59203251 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadSoldering.png index 41545c8b38..439aba4d33 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed.png index a763f6b0df..86905a2424 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushedPurified.png index b2d4e2a476..a8b71e2a60 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed_OVERLAY.png index a1600cad7c..b23d7ca7e2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/gem.png index 151fc3302a..e2f9a68637 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/handleMallet.png index c7bb0e6631..36654323a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/lens_OVERLAY.png index 51cb4b73a0..873f4b8e59 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/rotor.png index 6c6a16bfe5..db2ad859b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadMallet.png index 58a7522b4b..9c59203251 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadSoldering.png index 41545c8b38..439aba4d33 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed.png index a763f6b0df..86905a2424 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushedPurified.png index b2d4e2a476..a8b71e2a60 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed_OVERLAY.png index a1600cad7c..b23d7ca7e2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/gem.png index dd20d74f2c..5b6b746841 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/handleMallet.png index c7bb0e6631..36654323a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/lens_OVERLAY.png index 51cb4b73a0..873f4b8e59 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/rotor.png index 6c6a16bfe5..db2ad859b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadMallet.png index 58a7522b4b..9c59203251 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadSoldering.png index 41545c8b38..439aba4d33 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed.png index a763f6b0df..86905a2424 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushedPurified.png index b2d4e2a476..a8b71e2a60 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed_OVERLAY.png index a1600cad7c..b23d7ca7e2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/gem.png index dd20d74f2c..5b6b746841 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/handleMallet.png index c7bb0e6631..36654323a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingot.png index 8525223c5e..f894ebe14c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingot.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingot.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/lens_OVERLAY.png index 51cb4b73a0..873f4b8e59 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/rotor.png index 6c6a16bfe5..db2ad859b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadMallet.png index 58a7522b4b..9c59203251 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadSoldering.png index 41545c8b38..439aba4d33 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade.png index a4a6bd742d..2cbf99c535 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png b/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png index 7b52d92dec..092a1db909 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png and b/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png b/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png index 13f6818a37..ba55be99b6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png and b/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png index 2ab5d64cd7..9dc788e8a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png and b/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png index 25f89678d6..a232fe77a9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png and b/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png index de6df23dff..a0234ff9cf 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png and b/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png index 4dc9d4cc11..afd2952bb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png and b/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png index ac560c1841..879a51e83e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png and b/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png index 6cdda7024f..1f5eeaed56 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png and b/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png b/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png index 6048db9ddb..b205f487cb 100644 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png and b/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png b/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png index 841a7cbba6..7112bd28ee 100644 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png and b/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png b/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png index 287b037fff..91f2950c30 100644 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png and b/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png b/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png index 83333001b7..c5ed20bdb4 100644 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png and b/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png b/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png index b03c26c716..92aa1ec09d 100644 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png and b/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png b/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png index 8c37fe80c2..d0addeda89 100644 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png and b/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.3.png index 85f00bed5d..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.4.png index 266112faa5..8c7aea3001 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bauxia.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bauxia.2.png index 3280ff2d94..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bauxia.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bauxia.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.1.png index 5f00e80bb8..b9a997e219 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.2.png index cb4bb4d17b..4689dd67b3 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.3.png index 96c6a64acf..540ae5e297 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.4.png index eaa8da6432..15eacefcfe 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png index 3280ff2d94..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png index 3280ff2d94..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png index 3280ff2d94..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Diareed.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Diareed.4.png index 3582f9be78..ba7ec45b14 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Diareed.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Diareed.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.3.png index 8a4786d37a..698cf83ef3 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.4.png index b22fa2d779..4c2f4737db 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Fertilia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Fertilia.3.png index 26da0cceb7..f155504354 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Fertilia.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Fertilia.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.1.png index 131fd33c02..78969a1966 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.2.png index f54e4f31dd..aabcf09383 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.3.png index e9216ac272..bd75452424 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.4.png index 664d516f55..4538630798 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.2.png index 85f00bed5d..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.3.png index 266112faa5..8c7aea3001 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.5.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.5.png index 125a90aa29..72c6f1da64 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.5.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.5.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.6.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.6.png index 30761a3cce..8f4efd1e2b 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.6.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.6.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.3.png index 26da0cceb7..f155504354 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.4.png index 6dc0654031..ee0be53f55 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png index 3280ff2d94..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.3.png index 818ad8561f..c5437ae8bf 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.4.png index da460f6e6d..68e1818ad1 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.1.png index 131fd33c02..78969a1966 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.2.png index f54e4f31dd..aabcf09383 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.3.png index e9216ac272..bd75452424 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.4.png index cb7327069f..738c9882ad 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png index 3280ff2d94..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.1.png index 5f00e80bb8..b9a997e219 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.2.png index cb4bb4d17b..4689dd67b3 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.3.png index 96c6a64acf..540ae5e297 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.4.png index bd7dc62e44..ee0cb00401 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Milkwart.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Milkwart.3.png index e127c56d28..29ae12c5fd 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Milkwart.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Milkwart.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.2.png index 85f00bed5d..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.3.png index 266112faa5..8c7aea3001 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.1.png index a04b4d9da7..be4dda5125 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.2.png index f2b9e03431..b67f3c4116 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.3.png index 1c6947c937..035808183b 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.4.png index 3b471a55a1..025a64c75c 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.1.png index 5f00e80bb8..b9a997e219 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.2.png index cb4bb4d17b..4689dd67b3 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.3.png index 96c6a64acf..540ae5e297 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.4.png index eaa8da6432..15eacefcfe 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png index 3280ff2d94..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.3.png index 85f00bed5d..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.4.png index 266112faa5..8c7aea3001 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.3.png index 3280ff2d94..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.4.png index 8e77350686..dd05620a95 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.2.png index 85f00bed5d..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.3.png index 266112faa5..8c7aea3001 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.3.png index b2c0bc35e2..fb7772fd2a 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.4.png index e2a8214493..c171136394 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png index 131fd33c02..78969a1966 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png index f54e4f31dd..aabcf09383 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png index e9216ac272..bd75452424 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.3.png index a9d1a67e77..43ac650087 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.4.png index b7a10dbc1b..a5c7e23848 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.1.png index 5f00e80bb8..b9a997e219 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.2.png index cb4bb4d17b..4689dd67b3 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.3.png index 96c6a64acf..540ae5e297 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.4.png index c966bf4f14..75679369b1 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.2.png index 85f00bed5d..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.3.png index 266112faa5..8c7aea3001 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.3.png index 4367864a3a..988f477185 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.4.png index b57f14ee6e..b6df5bb258 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.1.png index 3f7fd9b070..9dccc70d1d 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.2.png index e3445eabbb..919d5070a4 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.3.png index 61d498303e..7771401d23 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.4.png index 70f0aeceeb..a7975c3828 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Starwart.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Starwart.3.png index e127c56d28..29ae12c5fd 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Starwart.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Starwart.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.1.png index 5f00e80bb8..b9a997e219 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.2.png index cb4bb4d17b..4689dd67b3 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.3.png index 96c6a64acf..540ae5e297 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.4.png index 953f83859b..f7018d2757 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png index 3280ff2d94..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tine.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tine.3.png index 8a4786d37a..698cf83ef3 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tine.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tine.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Titania.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Titania.2.png index 3280ff2d94..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Titania.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Titania.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png index 3280ff2d94..785e360927 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.1.png index a04b4d9da7..be4dda5125 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.2.png index f2b9e03431..b67f3c4116 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.3.png index 1c6947c937..035808183b 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.4.png index d4b0fa390f..10dc544a97 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.1.png index 19f2013815..d813125bf4 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.2.png index 3582f9be78..ba7ec45b14 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.5.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.5.png index f973b02919..04614d06de 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.5.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.5.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Withereed.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Withereed.4.png index 2794684fb9..1b4ccf9e36 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Withereed.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Withereed.4.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/cloakingdevice_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/cloakingdevice_layer_1.png index 8a988d8c0f..179f239b92 100644 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/cloakingdevice_layer_1.png and b/src/main/resources/assets/minecraft/textures/models/armor/cloakingdevice_layer_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/lapotronpack_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/lapotronpack_layer_1.png index d74d183d70..4eceaf83d3 100644 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/lapotronpack_layer_1.png and b/src/main/resources/assets/minecraft/textures/models/armor/lapotronpack_layer_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack_layer_1.png index 6a3a7cae3c..fbf0f6abcd 100644 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack_layer_1.png and b/src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack_layer_1.png differ -- cgit From 9093a7a2e10a2443de86fc9ae4b7678f97c085e8 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Fri, 24 May 2019 09:54:04 +0200 Subject: Added HP Solar Steam Boiler +added recipe +removed unnessecary ", new Object[0]" for vargars methodes Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> --- src/main/java/gregtech/api/enums/ItemList.java | 1 + .../boilers/GT_MetaTileEntity_Boiler_Solar.java | 38 +- .../GT_MetaTileEntity_Boiler_Solar_Steel.java | 79 ++ .../boilers/GT_MetaTileEntity_Boiler_Steel.java | 9 - .../gregtech/loaders/misc/GT_Achievements.java | 180 ++-- .../preload/GT_Loader_MetaTileEntities.java | 926 ++++++++++----------- .../assets/gregtech/textures/gui/SolarHPBoiler.png | Bin 0 -> 2243 bytes 7 files changed, 656 insertions(+), 577 deletions(-) create mode 100644 src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java create mode 100644 src/main/resources/assets/gregtech/textures/gui/SolarHPBoiler.png (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 40b5fed57e..82a826c390 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -538,6 +538,7 @@ public enum ItemList implements IItemContainer { //Generator_Naquadah_Mark_VI, Machine_Bronze_Boiler, Machine_Bronze_Boiler_Solar, + Machine_HP_Solar, Machine_Bronze_CraftingTable, Machine_Bronze_Furnace, Machine_Bronze_Macerator, diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java index f5b6b229a0..8f8fa352a8 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java @@ -19,11 +19,7 @@ import net.minecraftforge.fluids.IFluidHandler; public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { public GT_MetaTileEntity_Boiler_Solar(int aID, String aName, String aNameRegional) { - super(aID, aName, aNameRegional, new String[]{ - "Steam Power by the Sun", - "Produces 120L of Steam per second", - "Calcifies over time, reducing Steam output to 40L/s", - "Break and replace to decalcify"}); + super(aID, aName, aNameRegional, new String[0]); } public GT_MetaTileEntity_Boiler_Solar(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { @@ -34,6 +30,16 @@ public class GT_MetaTileEntity_Boiler_Solar super(aName, aTier, aDescription, aTextures); } + @Override + public String[] getDescription() { + return new String[]{ + "Steam Power by the Sun", + "Produces 120L of Steam per second", + "Calcifies over time, reducing Steam output to 40L/s", + "Break and replace to decalcify"}; + } + + public ITexture[][][] getTextureSet(ITexture[] aTextures) { ITexture[][][] rTextures = new ITexture[4][17][]; for (byte i = -1; i < 16; i = (byte) (i + 1)) { @@ -83,6 +89,10 @@ public class GT_MetaTileEntity_Boiler_Solar this.mRunTime = aNBT.getInteger("mRunTime"); } + protected int basicOutput = 150; + protected int basicMaxOuput = 50; + protected int basicTemperatureMod = 1; + public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) { if (this.mTemperature <= 20) { @@ -90,7 +100,7 @@ public class GT_MetaTileEntity_Boiler_Solar this.mLossTimer = 0; } if (++this.mLossTimer > 45) { - this.mTemperature -= 1; + this.mTemperature -= basicTemperatureMod; this.mLossTimer = 0; } if (this.mSteam != null) { @@ -116,11 +126,11 @@ public class GT_MetaTileEntity_Boiler_Solar aBaseMetaTileEntity.doExplosion(2048L); return; } - this.mFluid.amount -= 1; + this.mFluid.amount -= basicTemperatureMod; mRunTime += 1; - int tOutput = 150; + int tOutput = basicOutput; if (mRunTime > 10000) { - tOutput = Math.max(50, 150 - ((mRunTime - 10000) / 100)); + tOutput = Math.max(basicMaxOuput, basicOutput - ((mRunTime - 10000) / 100)); } if (this.mSteam == null) { this.mSteam = GT_ModHandler.getSteam(tOutput); @@ -135,17 +145,17 @@ public class GT_MetaTileEntity_Boiler_Solar } } if ((this.mSteam != null) && - (this.mSteam.amount > 16000)) { + (this.mSteam.amount > this.getCapacity())) { sendSound((byte) 1); - this.mSteam.amount = 12000; + this.mSteam.amount = 3*(this.getCapacity()/4); } if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (aTick % 256L == 0L) && (!aBaseMetaTileEntity.getWorld().isThundering())) { boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() && aBaseMetaTileEntity.getBiome().rainfall > 0.0F; - mProcessingEnergy += bRain && aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4 || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0 : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1; + mProcessingEnergy += bRain && aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4 || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0 : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8*basicTemperatureMod : basicTemperatureMod; } if ((this.mTemperature < 500) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) { - this.mProcessingEnergy -= 1; - this.mTemperature += 1; + this.mProcessingEnergy -= basicTemperatureMod; + this.mTemperature += basicTemperatureMod; } aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0); } diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java new file mode 100644 index 0000000000..d1b2e571b1 --- /dev/null +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java @@ -0,0 +1,79 @@ +package gregtech.common.tileentities.boilers; + +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.objects.GT_RenderedTexture; +import gregtech.common.gui.GT_Container_Boiler; +import gregtech.common.gui.GT_GUIContainer_Boiler; +import net.minecraft.entity.player.InventoryPlayer; + +public class GT_MetaTileEntity_Boiler_Solar_Steel extends GT_MetaTileEntity_Boiler_Solar { + public GT_MetaTileEntity_Boiler_Solar_Steel(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional); + basicOutput = 300; + basicMaxOuput = 100; + basicTemperatureMod = 3; + } + + public GT_MetaTileEntity_Boiler_Solar_Steel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + basicOutput = 300; + basicMaxOuput = 100; + basicTemperatureMod = 3; + } + + public GT_MetaTileEntity_Boiler_Solar_Steel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, aDescription, aTextures); + basicOutput = 300; + basicMaxOuput = 100; + basicTemperatureMod = 3; + } + + public ITexture[][][] getTextureSet(ITexture[] aTextures) { + ITexture[][][] rTextures = new ITexture[4][17][]; + for (byte i = -1; i < 16; i = (byte) (i + 1)) { + ITexture[] tmp0 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))}; + rTextures[0][(i + 1)] = tmp0; + ITexture[] tmp1 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR)}; + rTextures[1][(i + 1)] = tmp1; + ITexture[] tmp2 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa))}; + rTextures[2][(i + 1)] = tmp2; + ITexture[] tmp3 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)}; + rTextures[3][(i + 1)] = tmp3; + } + return rTextures; + } + + public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 32000); + } + + public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { + return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SolarHPBoiler.png", 32000); + } + + @Override + public String[] getDescription() { + return new String[]{ + "Steam Power by the Sun", + "Produces 360L of Steam per second", + "Calcifies over time, reducing Steam output to 120L/s", + "Break and replace to decalcify"}; + } + + public int getCapacity() { + return 32000; + } + + public int maxProgresstime() { + return 1500; + } + + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_Boiler_Solar_Steel(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + } + +} diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java index 09de6124d5..703887435a 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java @@ -1,23 +1,14 @@ package gregtech.common.tileentities.boilers; import gregtech.api.enums.Dyes; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.GT_Pollution; import gregtech.common.gui.GT_Container_Boiler; import gregtech.common.gui.GT_GUIContainer_Boiler; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; public class GT_MetaTileEntity_Boiler_Steel extends GT_MetaTileEntity_Boiler_Bronze {//TODO CHECK POLLUTION VALUES AND DESCRIPTIONS FOR POLLUTION SPOILERS diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 3e2751a430..1431688496 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -83,137 +83,137 @@ public class GT_Achievements { registerAchievement("flintpick", 0, 0, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null), "", false); registerAchievement("crops", -4, 0, GT_ModHandler.getIC2Item("crop", 1L), "flintpick", false); - registerAchievement("havestlead", -4, 2, ItemList.Crop_Drop_Plumbilia.get(1, new Object[]{}), "crops", false); - registerAchievement("havestcopper", -2, 1, ItemList.Crop_Drop_Coppon.get(1, new Object[]{}), "crops", false); - registerAchievement("havesttin", -2, -1, ItemList.Crop_Drop_Tine.get(1, new Object[]{}), "crops", false); - registerAchievement("havestoil", -4, -4, ItemList.Crop_Drop_OilBerry.get(1, new Object[]{}), "crops", false); - registerAchievement("havestiron", -2, -3, ItemList.Crop_Drop_Ferru.get(1, new Object[]{}), "crops", false); - registerAchievement("havestgold", -2, -6, ItemList.Crop_Drop_Aurelia.get(1, new Object[]{}), "havestiron", false); - registerAchievement("havestsilver", -4, -5, ItemList.Crop_Drop_Argentia.get(1, new Object[]{}), "havestiron", false); - registerAchievement("havestemeralds", -2, -8, ItemList.Crop_Drop_BobsYerUncleRanks.get(1, new Object[]{}), "havestgold", false); + registerAchievement("havestlead", -4, 2, ItemList.Crop_Drop_Plumbilia.get(1), "crops", false); + registerAchievement("havestcopper", -2, 1, ItemList.Crop_Drop_Coppon.get(1), "crops", false); + registerAchievement("havesttin", -2, -1, ItemList.Crop_Drop_Tine.get(1), "crops", false); + registerAchievement("havestoil", -4, -4, ItemList.Crop_Drop_OilBerry.get(1), "crops", false); + registerAchievement("havestiron", -2, -3, ItemList.Crop_Drop_Ferru.get(1), "crops", false); + registerAchievement("havestgold", -2, -6, ItemList.Crop_Drop_Aurelia.get(1), "havestiron", false); + registerAchievement("havestsilver", -4, -5, ItemList.Crop_Drop_Argentia.get(1), "havestiron", false); + registerAchievement("havestemeralds", -2, -8, ItemList.Crop_Drop_BobsYerUncleRanks.get(1), "havestgold", false); registerAchievement("tools", 0, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, Materials.Iron, Materials.Wood, null), "flintpick", false); registerAchievement("driltime", 2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.DRILL_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null), "tools", false); registerAchievement("brrrr", 2, 6, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.CHAINSAW_LV, 1, Materials.BlueSteel, Materials.StainlessSteel, null), "driltime", false); registerAchievement("highpowerdrill", 3, 5, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.DRILL_HV, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), "driltime", false); registerAchievement("hammertime", 3, 7, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.JACKHAMMER, 1, Materials.TungstenSteel, Materials.TungstenSteel, null), "highpowerdrill", false); - registerAchievement("repair", 4, 5, ItemList.Machine_HV_Disassembler.get(1, new Object[]{}), "highpowerdrill", false); + registerAchievement("repair", 4, 5, ItemList.Machine_HV_Disassembler.get(1), "highpowerdrill", false); registerAchievement("unitool", -2, 4, GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.UNIVERSALSPADE, 1, Materials.Steel, Materials.Iron, null), "tools", false); - registerAchievement("recycling", -4, 4, ItemList.Machine_LV_ArcFurnace.get(1, new Object[]{}), "unitool", false); + registerAchievement("recycling", -4, 4, ItemList.Machine_LV_ArcFurnace.get(1), "unitool", false); registerAchievement("crushed", 0, 6, GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Tin, 1L), "tools", false); registerAchievement("cleandust", 0, 10, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), "crushed", false); registerAchievement("washing", -2, 6, GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Iron, 1L), "crushed", false); registerAchievement("spinit", -4, 6, GT_OreDictUnificator.get(OrePrefixes.crushedCentrifuged, Materials.Redstone, 1L), "crushed", false); if(!GregTech_API.mIC2Classic){ - registerAchievement("newfuel", -4, 8, ItemList.ThoriumCell_4.get(1, new Object[]{}), "spinit", false); + registerAchievement("newfuel", -4, 8, ItemList.ThoriumCell_4.get(1), "spinit", false); registerAchievement("newmetal", -4, 10, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L), "newfuel", false); - registerAchievement("reflect", -2, 9, ItemList.Neutron_Reflector.get(1, new Object[]{}), "newfuel", false); + registerAchievement("reflect", -2, 9, ItemList.Neutron_Reflector.get(1), "newfuel", false); } registerAchievement("bronze", 2, 0, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 1L), "flintpick", false); - registerAchievement("simplyeco", 2, 2, ItemList.Machine_Bronze_Boiler_Solar.get(1, new Object[]{}), "bronze", false); - registerAchievement("firststeam", 2, -2, ItemList.Machine_Bronze_Boiler.get(1, new Object[]{}), "bronze", false); - registerAchievement("alloysmelter", 2, -4, ItemList.Machine_Bronze_AlloySmelter.get(1, new Object[]{}), "firststeam", false); - registerAchievement("macerator", 0, -2, ItemList.Machine_Bronze_Macerator.get(1, new Object[]{}), "firststeam", false); - registerAchievement("extract", 0, -4, ItemList.Machine_Bronze_Extractor.get(1, new Object[]{}), "alloysmelter", false); + registerAchievement("simplyeco", 2, 2, ItemList.Machine_Bronze_Boiler_Solar.get(1, ItemList.Machine_HP_Solar.get(1L)), "bronze", false); + registerAchievement("firststeam", 2, -2, ItemList.Machine_Bronze_Boiler.get(1), "bronze", false); + registerAchievement("alloysmelter", 2, -4, ItemList.Machine_Bronze_AlloySmelter.get(1), "firststeam", false); + registerAchievement("macerator", 0, -2, ItemList.Machine_Bronze_Macerator.get(1), "firststeam", false); + registerAchievement("extract", 0, -4, ItemList.Machine_Bronze_Extractor.get(1), "alloysmelter", false); - registerAchievement("smallparts", 0, -5, ItemList.Circuit_Primitive.get(1, new Object[]{}), "alloysmelter", false); + registerAchievement("smallparts", 0, -5, ItemList.Circuit_Primitive.get(1), "alloysmelter", false); registerAchievement("gtbasiccircuit", 0, -8, Ic2Items.electronicCircuit.copy(), "smallparts", false); - registerAchievement("bettercircuits", 0, -9, ItemList.Circuit_Good.get(1, new Object[]{}), "gtbasiccircuit", false); + registerAchievement("bettercircuits", 0, -9, ItemList.Circuit_Good.get(1), "gtbasiccircuit", false); registerAchievement("stepforward", -2, -9, Ic2Items.advancedCircuit.copy(), "bettercircuits", false); - registerAchievement("gtmonosilicon", -5, -10, ItemList.Circuit_Silicon_Ingot.get(1, new Object[]{}), "stepforward", false); - registerAchievement("gtlogicwafer", -7, -10, ItemList.Circuit_Wafer_ILC.get(1, new Object[]{}), "gtmonosilicon", false); - registerAchievement("gtlogiccircuit", -9, -10, ItemList.Circuit_Basic.get(1, new Object[]{}), "gtlogicwafer", false); - registerAchievement("gtcleanroom", -11, -10, ItemList.Machine_Multi_Cleanroom.get(1, new Object[]{}), "gtlogiccircuit", false); - registerAchievement("energyflow", -13, -10, ItemList.Circuit_Nanoprocessor.get(1, new Object[]{}), "gtcleanroom", false); - registerAchievement("gtquantumprocessor", -13, -12, ItemList.Circuit_Quantumprocessor.get(1, new Object[]{}), "energyflow", false); - registerAchievement("gtcrystalprocessor", -11, -12, ItemList.Circuit_Crystalprocessor.get(1, new Object[]{}), "gtquantumprocessor", false); - registerAchievement("gtwetware", -9, -12, ItemList.Circuit_Neuroprocessor.get(1, new Object[]{}), "gtcrystalprocessor", false); - registerAchievement("gtwetmain", -7, -12, ItemList.Circuit_Wetwaremainframe.get(1, new Object[]{}), "gtwetware", false); + registerAchievement("gtmonosilicon", -5, -10, ItemList.Circuit_Silicon_Ingot.get(1), "stepforward", false); + registerAchievement("gtlogicwafer", -7, -10, ItemList.Circuit_Wafer_ILC.get(1), "gtmonosilicon", false); + registerAchievement("gtlogiccircuit", -9, -10, ItemList.Circuit_Basic.get(1), "gtlogicwafer", false); + registerAchievement("gtcleanroom", -11, -10, ItemList.Machine_Multi_Cleanroom.get(1), "gtlogiccircuit", false); + registerAchievement("energyflow", -13, -10, ItemList.Circuit_Nanoprocessor.get(1), "gtcleanroom", false); + registerAchievement("gtquantumprocessor", -13, -12, ItemList.Circuit_Quantumprocessor.get(1), "energyflow", false); + registerAchievement("gtcrystalprocessor", -11, -12, ItemList.Circuit_Crystalprocessor.get(1), "gtquantumprocessor", false); + registerAchievement("gtwetware", -9, -12, ItemList.Circuit_Neuroprocessor.get(1), "gtcrystalprocessor", false); + registerAchievement("gtwetmain", -7, -12, ItemList.Circuit_Wetwaremainframe.get(1), "gtwetware", false); - registerAchievement("orbs", -10, -14, ItemList.Energy_LapotronicOrb.get(1, new Object[]{}), "energyflow", false); - registerAchievement("thatspower", -8, -14, ItemList.Energy_LapotronicOrb2.get(1, new Object[]{}), "orbs", false); - registerAchievement("datasaving", -2, -12, ItemList.Tool_DataOrb.get(1, new Object[]{}), "stepforward", false); - registerAchievement("superbuffer", 0, -12, ItemList.Automation_SuperBuffer_LV.get(1, new Object[]{}), "datasaving", false); - registerAchievement("newstorage", -2, -14, ItemList.Quantum_Chest_HV.get(1, new Object[]{}), "superbuffer", false); - registerAchievement("whereistheocean", 2, -14, ItemList.Quantum_Tank_IV.get(1, new Object[]{}), "superbuffer", false); - registerAchievement("luck", 2, -6, ItemList.ZPM.get(1, new Object[]{}), "", false); + registerAchievement("orbs", -10, -14, ItemList.Energy_LapotronicOrb.get(1), "energyflow", false); + registerAchievement("thatspower", -8, -14, ItemList.Energy_LapotronicOrb2.get(1), "orbs", false); + registerAchievement("datasaving", -2, -12, ItemList.Tool_DataOrb.get(1), "stepforward", false); + registerAchievement("superbuffer", 0, -12, ItemList.Automation_SuperBuffer_LV.get(1), "datasaving", false); + registerAchievement("newstorage", -2, -14, ItemList.Quantum_Chest_HV.get(1), "superbuffer", false); + registerAchievement("whereistheocean", 2, -14, ItemList.Quantum_Tank_IV.get(1), "superbuffer", false); + registerAchievement("luck", 2, -6, ItemList.ZPM.get(1), "", false); registerAchievement("steel", 4, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L), "bronze", false); - registerAchievement("highpressure", 4, 2, ItemList.Machine_Steel_Boiler.get(1, new Object[]{}), "steel", false); - registerAchievement("extremepressure", 4, 4, ItemList.Machine_Multi_LargeBoiler_Steel.get(1, new Object[]{}), "highpressure", false); - registerAchievement("cheapermac", 6, 1, ItemList.Machine_LV_Hammer.get(1, new Object[]{}), "steel", false); + registerAchievement("highpressure", 4, 2, ItemList.Machine_Steel_Boiler.get(1), "steel", false); + registerAchievement("extremepressure", 4, 4, ItemList.Machine_Multi_LargeBoiler_Steel.get(1), "highpressure", false); + registerAchievement("cheapermac", 6, 1, ItemList.Machine_LV_Hammer.get(1), "steel", false); registerAchievement("complexalloys", 6, 3, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.BlueSteel, 1L), "cheapermac", false); registerAchievement("magneticiron", 4, -2, GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), "steel", false); - registerAchievement("lvmotor", 4, -6, ItemList.Electric_Motor_LV.get(1, new Object[]{}), "magneticiron", false); - registerAchievement("pumpcover", 2, -8, ItemList.Electric_Pump_LV.get(1, new Object[]{}), "lvmotor", false); - registerAchievement("closeit", 2, -10, ItemList.Cover_Shutter.get(1, new Object[]{}), "pumpcover", false); - registerAchievement("slurp", 2, -12, ItemList.Pump_HV.get(1, new Object[]{}), "closeit", false); - registerAchievement("transport", 4, -10, ItemList.Conveyor_Module_LV.get(1, new Object[]{}), "lvmotor", false); - registerAchievement("manipulation", 4, -12, ItemList.Cover_Controller.get(1, new Object[]{}), "transport", false); - registerAchievement("buffer", 4, -14, ItemList.Automation_ChestBuffer_LV.get(1, new Object[]{}), "manipulation", false); - registerAchievement("complexmachines", 6, -9, ItemList.Robot_Arm_LV.get(1, new Object[]{}), "lvmotor", false); - registerAchievement("avengers", 8, -11, ItemList.Machine_LV_Assembler.get(1, new Object[]{}), "complexmachines", false); - registerAchievement("filterregulate", 10, -11, ItemList.Component_Filter.get(1, new Object[]{}), "avengers", false); - - registerAchievement("steampower", 6, -6, ItemList.Generator_Steam_Turbine_LV.get(1, new Object[]{}), "lvmotor", false); - registerAchievement("batterys", 6, -4, ItemList.Battery_Buffer_2by2_MV.get(1, new Object[]{}), "steampower", false); - registerAchievement("badweather", 6, -8, ItemList.Casing_FireHazard.get(1, new Object[]{}), "steampower", false); - registerAchievement("electricproblems", 7, -7, ItemList.Casing_ExplosionHazard.get(1, new Object[]{}), "steampower", false); - registerAchievement("ebf", 8, -6, ItemList.Machine_Multi_BlastFurnace.get(1, new Object[]{}), "steampower", false); - registerAchievement("energyhatch", 12, -6, ItemList.Hatch_Energy_LV.get(1, new Object[]{}), "ebf", false); + registerAchievement("lvmotor", 4, -6, ItemList.Electric_Motor_LV.get(1), "magneticiron", false); + registerAchievement("pumpcover", 2, -8, ItemList.Electric_Pump_LV.get(1), "lvmotor", false); + registerAchievement("closeit", 2, -10, ItemList.Cover_Shutter.get(1), "pumpcover", false); + registerAchievement("slurp", 2, -12, ItemList.Pump_HV.get(1), "closeit", false); + registerAchievement("transport", 4, -10, ItemList.Conveyor_Module_LV.get(1), "lvmotor", false); + registerAchievement("manipulation", 4, -12, ItemList.Cover_Controller.get(1), "transport", false); + registerAchievement("buffer", 4, -14, ItemList.Automation_ChestBuffer_LV.get(1), "manipulation", false); + registerAchievement("complexmachines", 6, -9, ItemList.Robot_Arm_LV.get(1), "lvmotor", false); + registerAchievement("avengers", 8, -11, ItemList.Machine_LV_Assembler.get(1), "complexmachines", false); + registerAchievement("filterregulate", 10, -11, ItemList.Component_Filter.get(1), "avengers", false); + + registerAchievement("steampower", 6, -6, ItemList.Generator_Steam_Turbine_LV.get(1), "lvmotor", false); + registerAchievement("batterys", 6, -4, ItemList.Battery_Buffer_2by2_MV.get(1), "steampower", false); + registerAchievement("badweather", 6, -8, ItemList.Casing_FireHazard.get(1), "steampower", false); + registerAchievement("electricproblems", 7, -7, ItemList.Casing_ExplosionHazard.get(1), "steampower", false); + registerAchievement("ebf", 8, -6, ItemList.Machine_Multi_BlastFurnace.get(1), "steampower", false); + registerAchievement("energyhatch", 12, -6, ItemList.Hatch_Energy_LV.get(1), "ebf", false); registerAchievement("gtaluminium", 8, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Aluminium, 1L), "steel", false); - registerAchievement("highpowersmelt", 8, 2, ItemList.Machine_Multi_Furnace.get(1, new Object[]{}), "gtaluminium", false); - registerAchievement("oilplant", 8, 4, ItemList.Distillation_Tower.get(1, new Object[]{}), "highpowersmelt", false); - registerAchievement("factory", 8, 6, ItemList.Processing_Array.get(1, new Object[]{}), "oilplant", false); - registerAchievement("upgradeebf", 8, -2, ItemList.Hatch_Energy_MV.get(1, new Object[]{}), "gtaluminium", false); - registerAchievement("maintainance", 10, -2, ItemList.Hatch_Maintenance.get(1, new Object[]{}), "upgradeebf", false); + registerAchievement("highpowersmelt", 8, 2, ItemList.Machine_Multi_Furnace.get(1), "gtaluminium", false); + registerAchievement("oilplant", 8, 4, ItemList.Distillation_Tower.get(1), "highpowersmelt", false); + registerAchievement("factory", 8, 6, ItemList.Processing_Array.get(1), "oilplant", false); + registerAchievement("upgradeebf", 8, -2, ItemList.Hatch_Energy_MV.get(1), "gtaluminium", false); + registerAchievement("maintainance", 10, -2, ItemList.Hatch_Maintenance.get(1), "upgradeebf", false); - registerAchievement("upgrade", 10, 0, ItemList.Casing_Coil_Kanthal.get(1, new Object[]{}), "gtaluminium", false); + registerAchievement("upgrade", 10, 0, ItemList.Casing_Coil_Kanthal.get(1), "gtaluminium", false); registerAchievement("titan", 14, 0, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titanium, 1L), "upgrade", false); - registerAchievement("magic", 14, 3, ItemList.MagicEnergyConverter_LV.get(1, new Object[]{}), "titan", false); - registerAchievement("highmage", 10, 3, ItemList.MagicEnergyAbsorber_HV.get(1, new Object[]{}), "magic", false); - registerAchievement("artificaldia", 12, 2, ItemList.IC2_Industrial_Diamond.get(1, new Object[]{}), "titan", false); - registerAchievement("muchsteam", 13, 1, ItemList.LargeSteamTurbine.get(1, new Object[]{}), "titan", false); - registerAchievement("efficientsteam", 11, 1, ItemList.LargeSteamTurbine.get(1, new Object[]{}), "muchsteam", false); + registerAchievement("magic", 14, 3, ItemList.MagicEnergyConverter_LV.get(1), "titan", false); + registerAchievement("highmage", 10, 3, ItemList.MagicEnergyAbsorber_HV.get(1), "magic", false); + registerAchievement("artificaldia", 12, 2, ItemList.IC2_Industrial_Diamond.get(1), "titan", false); + registerAchievement("muchsteam", 13, 1, ItemList.LargeSteamTurbine.get(1), "titan", false); + registerAchievement("efficientsteam", 11, 1, ItemList.LargeSteamTurbine.get(1), "muchsteam", false); - registerAchievement("upgrade2", 16, 0, ItemList.Casing_Coil_Nichrome.get(1, new Object[]{}), "titan", false); + registerAchievement("upgrade2", 16, 0, ItemList.Casing_Coil_Nichrome.get(1), "titan", false); registerAchievement("tungsten", 16, 2, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Tungsten, 1L), "upgrade2", false); registerAchievement("osmium", 16, -2, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Osmium, 1L), "upgrade2", false); - registerAchievement("hightech", 15, -3, ItemList.Field_Generator_LV.get(1, new Object[]{}), "osmium", false); - registerAchievement("amplifier", 16, -5, ItemList.Machine_LV_Amplifab.get(1, new Object[]{}), "hightech", false); - registerAchievement("scanning", 13, -3, ItemList.Machine_HV_Scanner.get(1, new Object[]{}), "hightech", false); - registerAchievement("alienpower", 14, -5, ItemList.Generator_Naquadah_Mark_I.get(1, new Object[]{}), "hightech", false); - registerAchievement("universal", 15, -6, ItemList.Machine_LV_Massfab.get(1, new Object[]{}), "hightech", false); - registerAchievement("replication", 17, -6, ItemList.Machine_LV_Replicator.get(1, new Object[]{}), "universal", false); + registerAchievement("hightech", 15, -3, ItemList.Field_Generator_LV.get(1), "osmium", false); + registerAchievement("amplifier", 16, -5, ItemList.Machine_LV_Amplifab.get(1), "hightech", false); + registerAchievement("scanning", 13, -3, ItemList.Machine_HV_Scanner.get(1), "hightech", false); + registerAchievement("alienpower", 14, -5, ItemList.Generator_Naquadah_Mark_I.get(1), "hightech", false); + registerAchievement("universal", 15, -6, ItemList.Machine_LV_Massfab.get(1), "hightech", false); + registerAchievement("replication", 17, -6, ItemList.Machine_LV_Replicator.get(1), "universal", false); registerAchievement("tungstensteel", 16, 4, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1L), "tungsten", false); - registerAchievement("upgrade3", 15, 5, ItemList.Casing_Coil_TungstenSteel.get(1, new Object[]{}), "tungstensteel", false); + registerAchievement("upgrade3", 15, 5, ItemList.Casing_Coil_TungstenSteel.get(1), "tungstensteel", false); registerAchievement("hssg", 13, 5, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 1L), "upgrade3", false); - registerAchievement("upgrade4", 11, 5, ItemList.Casing_Coil_HSSG.get(1, new Object[]{}), "hssg", false); + registerAchievement("upgrade4", 11, 5, ItemList.Casing_Coil_HSSG.get(1), "hssg", false); registerAchievement("stargatematerial", 11, 7, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1L), "upgrade4", false); - registerAchievement("conducting", 14, 6, ItemList.Casing_Coil_Superconductor.get(1, new Object[]{}), "upgrade3", false); - registerAchievement("fusion", 15, 7, ItemList.FusionComputer_LuV.get(1, new Object[]{}), "tungstensteel", false); - registerAchievement("higherefficency", 15, 9, ItemList.Generator_Plasma_IV.get(1, new Object[]{}), "fusion", false); - registerAchievement("advancing", 13, 7, ItemList.FusionComputer_ZPMV.get(1, new Object[]{}), "fusion", false); - - registerAchievement("stargateliquid", 11, 9, ItemList.Generator_Plasma_LuV.get(1, new Object[]{}), "advancing", false); - registerAchievement("tothelimit", 13, 9, ItemList.Generator_Plasma_LuV.get(1, new Object[]{}), "advancing", false); - registerAchievement("fullefficiency", 12, 10, ItemList.Generator_Plasma_ZPMV.get(1, new Object[]{}), "tothelimit", false); - registerAchievement("upgrade5", 9, 9, ItemList.Casing_Coil_Naquadah.get(1, new Object[]{}), "stargateliquid", false); + registerAchievement("conducting", 14, 6, ItemList.Casing_Coil_Superconductor.get(1), "upgrade3", false); + registerAchievement("fusion", 15, 7, ItemList.FusionComputer_LuV.get(1), "tungstensteel", false); + registerAchievement("higherefficency", 15, 9, ItemList.Generator_Plasma_IV.get(1), "fusion", false); + registerAchievement("advancing", 13, 7, ItemList.FusionComputer_ZPMV.get(1), "fusion", false); + + registerAchievement("stargateliquid", 11, 9, ItemList.Generator_Plasma_LuV.get(1), "advancing", false); + registerAchievement("tothelimit", 13, 9, ItemList.Generator_Plasma_LuV.get(1), "advancing", false); + registerAchievement("fullefficiency", 12, 10, ItemList.Generator_Plasma_ZPMV.get(1), "tothelimit", false); + registerAchievement("upgrade5", 9, 9, ItemList.Casing_Coil_Naquadah.get(1), "stargateliquid", false); registerAchievement("alienmetallurgy", 9, 7, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.NaquadahAlloy, 1L), "upgrade5", false); - registerAchievement("over9000", 7, 7, ItemList.Casing_Coil_NaquadahAlloy.get(1, new Object[]{}), "alienmetallurgy", false); + registerAchievement("over9000", 7, 7, ItemList.Casing_Coil_NaquadahAlloy.get(1), "alienmetallurgy", false); registerAchievement("finalpreparations", 7, 9, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadria, 1L), "over9000", false); - registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1, new Object[]{}), "finalpreparations", false); + registerAchievement("denseaspossible", 6, 10, ItemList.FusionComputer_UV.get(1), "finalpreparations", false); if(GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false)) { - registerAchievement("zpmage", 8, 10, ItemList.Energy_Module.get(1, new Object[]{}), "denseaspossible", false); - registerAchievement("uvage", 10, 10, ItemList.Energy_Cluster.get(1, new Object[]{}), "zpmage", false); - registerAchievement("whatnow", 12, 10, ItemList.ZPM2.get(1, new Object[]{}), "uvage", false); + registerAchievement("zpmage", 8, 10, ItemList.Energy_Module.get(1), "denseaspossible", false); + registerAchievement("uvage", 10, 10, ItemList.Energy_Cluster.get(1), "zpmage", false); + registerAchievement("whatnow", 12, 10, ItemList.ZPM2.get(1), "uvage", false); }else { - registerAchievement("whatnow", 8, 10, ItemList.ZPM2.get(1, new Object[]{}), "denseaspossible", false); + registerAchievement("whatnow", 8, 10, ItemList.ZPM2.get(1), "denseaspossible", false); } // if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){ diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index be8320375c..7328137486 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -9,10 +9,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.metatileentity.implementations.*; import gregtech.api.util.*; import gregtech.common.tileentities.automation.*; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Bronze; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Lava; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Solar; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Steel; +import gregtech.common.tileentities.boilers.*; import gregtech.common.tileentities.generators.*; import gregtech.common.tileentities.machines.GT_MetaTileEntity_BasicHull_Bronze; import gregtech.common.tileentities.machines.GT_MetaTileEntity_BasicHull_BronzeBricks; @@ -41,90 +38,90 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI private final static Boolean isNEILoaded = Loader.isModLoaded("NotEnoughItems"); private static void run1() { - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Polytetrafluoroethylene.get(1L, new Object[0]), bits, new Object[]{"PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Polytetrafluoroethylene), 'F', OrePrefixes.frameGt.get(Materials.Polytetrafluoroethylene), 'I', OrePrefixes.pipeMedium.get(Materials.Polytetrafluoroethylene)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_ULV.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.WroughtIron)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_LV.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_MV.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Aluminium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_HV.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.StainlessSteel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_EV.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Titanium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_IV.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.TungstenSteel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_LuV.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Chrome)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_ZPM.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Iridium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_UV.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Osmium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_MAX.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Neutronium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_BronzePlatedBricks.get(1L, new Object[0]), bits, new Object[]{"PhP", "PBP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Bronze), 'B', new ItemStack(Blocks.brick_block, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_SolidSteel.get(1L, new Object[0]), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_StableTitanium.get(1L, new Object[0]), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', OrePrefixes.frameGt.get(Materials.Titanium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_HeatProof.get(1L, new Object[0]), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Invar), 'F', OrePrefixes.frameGt.get(Materials.Invar)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_FrostProof.get(1L, new Object[0]), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Aluminium), 'F', OrePrefixes.frameGt.get(Materials.Aluminium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_CleanStainlessSteel.get(1L, new Object[0]), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'F', OrePrefixes.frameGt.get(Materials.StainlessSteel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_RobustTungstenSteel.get(1L, new Object[0]), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_MiningOsmiridium.get(1L, new Object[0]), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Osmiridium), 'F', OrePrefixes.frameGt.get(Materials.Osmiridium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine.get(1L, new Object[0]), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Magnalium), 'F', OrePrefixes.frameGt.get(Materials.BlueSteel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine1.get(1L, new Object[0]), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'F', ItemList.Casing_Turbine}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine2.get(1L, new Object[0]), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', ItemList.Casing_Turbine}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine3.get(1L, new Object[0]), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', ItemList.Casing_Turbine}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Bronze.get(1L, new Object[0]), bits, new Object[]{"PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', OrePrefixes.frameGt.get(Materials.Bronze), 'I', OrePrefixes.pipeMedium.get(Materials.Bronze)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Steel.get(1L, new Object[0]), bits, new Object[]{"PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'I', OrePrefixes.pipeMedium.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Titanium.get(1L, new Object[0]), bits, new Object[]{"PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', OrePrefixes.frameGt.get(Materials.Titanium), 'I', OrePrefixes.pipeMedium.get(Materials.Titanium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_TungstenSteel.get(1L, new Object[0]), bits, new Object[]{"PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'I', OrePrefixes.pipeMedium.get(Materials.TungstenSteel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_Bronze.get(1L, new Object[0]), bits, new Object[]{"PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', OrePrefixes.frameGt.get(Materials.Bronze), 'G', OrePrefixes.gearGt.get(Materials.Bronze)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_Steel.get(1L, new Object[0]), bits, new Object[]{"PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'G', OrePrefixes.gearGt.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_Titanium.get(1L, new Object[0]), bits, new Object[]{"PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.Titanium), 'G', OrePrefixes.gearGt.get(Materials.Titanium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_TungstenSteel.get(1L, new Object[0]), bits, new Object[]{"PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'G', ItemList.Robot_Arm_IV}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Grate.get(1L, new Object[0]), bits, new Object[]{"PVP", "PFP", aTextPlateMotor, 'P', new ItemStack(Blocks.iron_bars,1), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'M', ItemList.Electric_Motor_MV, 'V', OrePrefixes.rotor.get(Materials.Steel)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Vent.get(1L, new Object[0]), bits, new Object[]{"PPP", "SSS", "MFV", 'P', new ItemStack(Blocks.iron_bars,1), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'M', ItemList.Electric_Motor_MV, 'V', OrePrefixes.rotor.get(Materials.Steel),'S',ItemList.Component_Filter});//TODO dream - this is added recipe for vent casing - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Assembler.get(1L, new Object[0]), bits, new Object[]{"PVP", "PFP", aTextPlateMotor, 'P', OrePrefixes.circuit.get(Materials.Ultimate), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'V', OrePrefixes.circuit.get(Materials.Master)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_Bronze.get(1L, new Object[0]), bits, new Object[]{"PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', OrePrefixes.frameGt.get(Materials.Bronze), 'S', OrePrefixes.stick.get(Materials.Bronze)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_Steel.get(1L, new Object[0]), bits, new Object[]{"PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'S', OrePrefixes.stick.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_Titanium.get(1L, new Object[0]), bits, new Object[]{"PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', OrePrefixes.frameGt.get(Materials.Titanium), 'S', OrePrefixes.stick.get(Materials.Titanium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_TungstenSteel.get(1L, new Object[0]), bits, new Object[]{"PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'S', OrePrefixes.stick.get(Materials.TungstenSteel)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_Cupronickel.get(1L, new Object[0]), bits, new Object[]{"SCS", "MMM", "PPP", 'M', OrePrefixes.wireGt04.get(Materials.Cupronickel), 'P', OrePrefixes.dust.get(Materials.Mica)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_Kanthal.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.Kanthal)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_Nichrome.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.Nichrome)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_TungstenSteel.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.TungstenSteel)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_HSSG.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.HSSG)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_Naquadah.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.Naquadah)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_NaquadahAlloy.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.NaquadahAlloy)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_Superconductor.get(1L, new Object[0]), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.Superconductor)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Stripes_A.get(1L, new Object[0]), bits, new Object[]{"Y ", " M ", " B", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Stripes_B.get(1L, new Object[0]), bits, new Object[]{" Y", " M ", "B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_RadioactiveHazard.get(1L, new Object[0]), bits, new Object[]{" YB", " M ", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_BioHazard.get(1L, new Object[0]), bits, new Object[]{" Y ", " MB", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_ExplosionHazard.get(1L, new Object[0]), bits, new Object[]{" Y ", " M ", " B", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_FireHazard.get(1L, new Object[0]), bits, new Object[]{" Y ", " M ", " B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_AcidHazard.get(1L, new Object[0]), bits, new Object[]{" Y ", " M ", "B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_MagicHazard.get(1L, new Object[0]), bits, new Object[]{" Y ", "BM ", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_FrostHazard.get(1L, new Object[0]), bits, new Object[]{"BY ", " M ", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_NoiseHazard.get(1L, new Object[0]), bits, new Object[]{" ", " M ", "BY ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); - - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L, new Object[0]), bits, new Object[]{ItemList.Casing_Stripes_A}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L, new Object[0]), bits, new Object[]{ItemList.Casing_Stripes_B}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L, new Object[0]), bits, new Object[]{ItemList.Casing_RadioactiveHazard}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L, new Object[0]), bits, new Object[]{ItemList.Casing_BioHazard}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L, new Object[0]), bits, new Object[]{ItemList.Casing_ExplosionHazard}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L, new Object[0]), bits, new Object[]{ItemList.Casing_FireHazard}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L, new Object[0]), bits, new Object[]{ItemList.Casing_AcidHazard}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L, new Object[0]), bits, new Object[]{ItemList.Casing_MagicHazard}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L, new Object[0]), bits, new Object[]{ItemList.Casing_FrostHazard}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L, new Object[0]), bits, new Object[]{ItemList.Casing_NoiseHazard}); - - //GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_Coil_Cupronickel.get(1L, new Object[0]), bits, new Object[] {ItemList.Casing_Coil_Cupronickel_Deprecated}); - //GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_Coil_Kanthal.get(1L, new Object[0]), bits, new Object[] {ItemList.Casing_Coil_Kanthal_Deprecated}); - //GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_Coil_Nichrome.get(1L, new Object[0]), bits, new Object[] {ItemList.Casing_Coil_Nichrome_Deprecated}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Polytetrafluoroethylene.get(1L), bits, new Object[]{"PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Polytetrafluoroethylene), 'F', OrePrefixes.frameGt.get(Materials.Polytetrafluoroethylene), 'I', OrePrefixes.pipeMedium.get(Materials.Polytetrafluoroethylene)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_ULV.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.WroughtIron)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_LV.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_MV.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Aluminium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_HV.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.StainlessSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_EV.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Titanium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_IV.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.TungstenSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_LuV.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Chrome)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_ZPM.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Iridium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_UV.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Osmium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_MAX.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, aTextPlate, 'P', OrePrefixes.plate.get(Materials.Neutronium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_BronzePlatedBricks.get(1L), bits, new Object[]{"PhP", "PBP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Bronze), 'B', new ItemStack(Blocks.brick_block, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_SolidSteel.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_StableTitanium.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', OrePrefixes.frameGt.get(Materials.Titanium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_HeatProof.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Invar), 'F', OrePrefixes.frameGt.get(Materials.Invar)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_FrostProof.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Aluminium), 'F', OrePrefixes.frameGt.get(Materials.Aluminium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_CleanStainlessSteel.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'F', OrePrefixes.frameGt.get(Materials.StainlessSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_RobustTungstenSteel.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_MiningOsmiridium.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Osmiridium), 'F', OrePrefixes.frameGt.get(Materials.Osmiridium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Magnalium), 'F', OrePrefixes.frameGt.get(Materials.BlueSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine1.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'F', ItemList.Casing_Turbine}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine2.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', ItemList.Casing_Turbine}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine3.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', ItemList.Casing_Turbine}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Bronze.get(1L), bits, new Object[]{"PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', OrePrefixes.frameGt.get(Materials.Bronze), 'I', OrePrefixes.pipeMedium.get(Materials.Bronze)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Steel.get(1L), bits, new Object[]{"PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'I', OrePrefixes.pipeMedium.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_Titanium.get(1L), bits, new Object[]{"PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', OrePrefixes.frameGt.get(Materials.Titanium), 'I', OrePrefixes.pipeMedium.get(Materials.Titanium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Pipe_TungstenSteel.get(1L), bits, new Object[]{"PIP", "IFI", "PIP", 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'I', OrePrefixes.pipeMedium.get(Materials.TungstenSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_Bronze.get(1L), bits, new Object[]{"PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', OrePrefixes.frameGt.get(Materials.Bronze), 'G', OrePrefixes.gearGt.get(Materials.Bronze)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_Steel.get(1L), bits, new Object[]{"PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'G', OrePrefixes.gearGt.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_Titanium.get(1L), bits, new Object[]{"PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.Titanium), 'G', OrePrefixes.gearGt.get(Materials.Titanium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Gearbox_TungstenSteel.get(1L), bits, new Object[]{"PhP", "GFG", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'G', ItemList.Robot_Arm_IV}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Grate.get(1L), bits, new Object[]{"PVP", "PFP", aTextPlateMotor, 'P', new ItemStack(Blocks.iron_bars,1), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'M', ItemList.Electric_Motor_MV, 'V', OrePrefixes.rotor.get(Materials.Steel)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Vent.get(1L), bits, new Object[]{"PPP", "SSS", "MFV", 'P', new ItemStack(Blocks.iron_bars,1), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'M', ItemList.Electric_Motor_MV, 'V', OrePrefixes.rotor.get(Materials.Steel),'S',ItemList.Component_Filter});//TODO dream - this is added recipe for vent casing + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Assembler.get(1L), bits, new Object[]{"PVP", "PFP", aTextPlateMotor, 'P', OrePrefixes.circuit.get(Materials.Ultimate), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'V', OrePrefixes.circuit.get(Materials.Master)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_Bronze.get(1L), bits, new Object[]{"PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', OrePrefixes.frameGt.get(Materials.Bronze), 'S', OrePrefixes.stick.get(Materials.Bronze)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_Steel.get(1L), bits, new Object[]{"PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Steel), 'F', OrePrefixes.frameGt.get(Materials.Steel), 'S', OrePrefixes.stick.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_Titanium.get(1L), bits, new Object[]{"PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', OrePrefixes.frameGt.get(Materials.Titanium), 'S', OrePrefixes.stick.get(Materials.Titanium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Firebox_TungstenSteel.get(1L), bits, new Object[]{"PSP", "SFS", "PSP", 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'S', OrePrefixes.stick.get(Materials.TungstenSteel)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_Cupronickel.get(1L), bits, new Object[]{"SCS", "MMM", "PPP", 'M', OrePrefixes.wireGt04.get(Materials.Cupronickel), 'P', OrePrefixes.dust.get(Materials.Mica)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_Kanthal.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.Kanthal)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_Nichrome.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.Nichrome)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_TungstenSteel.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.TungstenSteel)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_HSSG.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.HSSG)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_Naquadah.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.Naquadah)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_NaquadahAlloy.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.NaquadahAlloy)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Coil_Superconductor.get(1L), bits, new Object[]{aTextPlate, aTextPlateWrench, "PwP", 'P', OrePrefixes.wireGt02.get(Materials.Superconductor)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Stripes_A.get(1L), bits, new Object[]{"Y ", " M ", " B", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Stripes_B.get(1L), bits, new Object[]{" Y", " M ", "B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_RadioactiveHazard.get(1L), bits, new Object[]{" YB", " M ", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_BioHazard.get(1L), bits, new Object[]{" Y ", " MB", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_ExplosionHazard.get(1L), bits, new Object[]{" Y ", " M ", " B", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_FireHazard.get(1L), bits, new Object[]{" Y ", " M ", " B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_AcidHazard.get(1L), bits, new Object[]{" Y ", " M ", "B ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_MagicHazard.get(1L), bits, new Object[]{" Y ", "BM ", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_FrostHazard.get(1L), bits, new Object[]{"BY ", " M ", " ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_NoiseHazard.get(1L), bits, new Object[]{" ", " M ", "BY ", 'M', ItemList.Casing_SolidSteel, 'Y', Dyes.dyeYellow, 'B', Dyes.dyeBlack}); + + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L), bits, new Object[]{ItemList.Casing_Stripes_A}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L), bits, new Object[]{ItemList.Casing_Stripes_B}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L), bits, new Object[]{ItemList.Casing_RadioactiveHazard}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L), bits, new Object[]{ItemList.Casing_BioHazard}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L), bits, new Object[]{ItemList.Casing_ExplosionHazard}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L), bits, new Object[]{ItemList.Casing_FireHazard}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L), bits, new Object[]{ItemList.Casing_AcidHazard}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L), bits, new Object[]{ItemList.Casing_MagicHazard}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L), bits, new Object[]{ItemList.Casing_FrostHazard}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_SolidSteel.get(1L), bits, new Object[]{ItemList.Casing_NoiseHazard}); + + //GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_Coil_Cupronickel.get(1L), bits, new Object[] {ItemList.Casing_Coil_Cupronickel_Deprecated}); + //GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_Coil_Kanthal.get(1L), bits, new Object[] {ItemList.Casing_Coil_Kanthal_Deprecated}); + //GT_ModHandler.addShapelessCraftingRecipe(ItemList.Casing_Coil_Nichrome.get(1L), bits, new Object[] {ItemList.Casing_Coil_Nichrome_Deprecated}); ItemList.Machine_Bricked_BlastFurnace.set(new GT_MetaTileEntity_BrickedBlastFurnace(140, "multimachine.brickedblastfurnace", "Bricked Blast Furnace").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bricked_BlastFurnace.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"BFB", "FwF", "BFB", 'B', ItemList.Casing_Firebricks, 'F', OreDictNames.craftingIronFurnace}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bricked_BlastFurnace.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"BFB", "FwF", "BFB", 'B', ItemList.Casing_Firebricks, 'F', OreDictNames.craftingIronFurnace}); ItemList.Hull_Bronze.set(new GT_MetaTileEntity_BasicHull_Bronze(1, "hull.bronze", "Bronze Hull", 0, "For your first Steam Machines").getStackForm(1L)); ItemList.Hull_Bronze_Bricks.set(new GT_MetaTileEntity_BasicHull_BronzeBricks(2, "hull.bronze_bricked", "Bricked Bronze Hull", 0, "For your first Steam Machines").getStackForm(1L)); ItemList.Hull_HP.set(new GT_MetaTileEntity_BasicHull_Steel(3, "hull.steel", "Steel Hull", 0, "For improved Steam Machines").getStackForm(1L)); ItemList.Hull_HP_Bricks.set(new GT_MetaTileEntity_BasicHull_SteelBricks(4, "hull.steel_bricked", "Bricked Wrought Iron Hull", 0, "For improved Steam Machines").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_Bronze.get(1L, new Object[0]), bits, new Object[]{aTextPlate, "PhP", aTextPlate, 'P', OrePrefixes.plate.get(Materials.Bronze)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_Bronze_Bricks.get(1L, new Object[0]), bits, new Object[]{aTextPlate, "PhP", "BBB", 'P', OrePrefixes.plate.get(Materials.Bronze), 'B', new ItemStack(Blocks.brick_block, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_HP.get(1L, new Object[0]), bits, new Object[]{aTextPlate, "PhP", aTextPlate, 'P', OrePrefixes.plate.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_HP_Bricks.get(1L, new Object[0]), bits, new Object[]{aTextPlate, "PhP", "BBB", 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'B', new ItemStack(Blocks.brick_block, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_Bronze.get(1L), bits, new Object[]{aTextPlate, "PhP", aTextPlate, 'P', OrePrefixes.plate.get(Materials.Bronze)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_Bronze_Bricks.get(1L), bits, new Object[]{aTextPlate, "PhP", "BBB", 'P', OrePrefixes.plate.get(Materials.Bronze), 'B', new ItemStack(Blocks.brick_block, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_HP.get(1L), bits, new Object[]{aTextPlate, "PhP", aTextPlate, 'P', OrePrefixes.plate.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_HP_Bricks.get(1L), bits, new Object[]{aTextPlate, "PhP", "BBB", 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'B', new ItemStack(Blocks.brick_block, 1)}); ItemList.Hull_ULV.set(new GT_MetaTileEntity_BasicHull(10, "hull.tier.00", "ULV Machine Hull", 0, imagination, new ITexture[0]).getStackForm(1L)); ItemList.Hull_LV.set(new GT_MetaTileEntity_BasicHull(11, "hull.tier.01", "LV Machine Hull", 1, imagination, new ITexture[0]).getStackForm(1L)); @@ -137,50 +134,50 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Hull_UV.set(new GT_MetaTileEntity_BasicHull(18, "hull.tier.08", "UV Machine Hull", 8, imagination, new ITexture[0]).getStackForm(1L)); ItemList.Hull_MAX.set(new GT_MetaTileEntity_BasicHull(19, "hull.tier.09", "UHV Machine Hull", 9, imagination, new ITexture[0]).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead), 'H', OrePrefixes.plate.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.Wood)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'H', OrePrefixes.plate.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.WroughtIron)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_MV, 'C', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'H', OrePrefixes.plate.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.WroughtIron)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_HV, 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'H', OrePrefixes.plate.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.Plastic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_EV, 'C', OrePrefixes.cableGt01.get(Materials.Aluminium), 'H', OrePrefixes.plate.get(Materials.Titanium), 'P', OrePrefixes.plate.get(Materials.Plastic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_IV, 'C', OrePrefixes.cableGt01.get(Materials.Tungsten), 'H', OrePrefixes.plate.get(Materials.TungstenSteel), 'P', OrePrefixes.plate.get(Materials.Polytetrafluoroethylene)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_LuV, 'C', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'H', OrePrefixes.plate.get(Materials.Chrome), 'P', OrePrefixes.plate.get(Materials.Polytetrafluoroethylene)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_ZPM, 'C', OrePrefixes.cableGt02.get(Materials.Naquadah), 'H', OrePrefixes.plate.get(Materials.Iridium), 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_UV, 'C', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 'H', OrePrefixes.plate.get(Materials.Osmium), 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_MAX, 'C', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), 'H', OrePrefixes.plate.get(Materials.Neutronium), 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole)}); - - GT_ModHandler.removeRecipeByOutput(ItemList.Hull_ULV.get(1L, new Object[0])); - GT_ModHandler.removeRecipeByOutput(ItemList.Hull_LV.get(1L, new Object[0])); - GT_ModHandler.removeRecipeByOutput(ItemList.Hull_MV.get(1L, new Object[0])); - GT_ModHandler.removeRecipeByOutput(ItemList.Hull_HV.get(1L, new Object[0])); - GT_ModHandler.removeRecipeByOutput(ItemList.Hull_EV.get(1L, new Object[0])); - GT_ModHandler.removeRecipeByOutput(ItemList.Hull_IV.get(1L, new Object[0])); - GT_ModHandler.removeRecipeByOutput(ItemList.Hull_LuV.get(1L, new Object[0])); - GT_ModHandler.removeRecipeByOutput(ItemList.Hull_ZPM.get(1L, new Object[0])); - GT_ModHandler.removeRecipeByOutput(ItemList.Hull_UV.get(1L, new Object[0])); - GT_ModHandler.removeRecipeByOutput(ItemList.Hull_MAX.get(1L, new Object[0])); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_ULV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead), 'H', OrePrefixes.plate.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.Wood)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_LV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'H', OrePrefixes.plate.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.WroughtIron)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_MV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_MV, 'C', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'H', OrePrefixes.plate.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.WroughtIron)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_HV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_HV, 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'H', OrePrefixes.plate.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.Plastic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_EV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_EV, 'C', OrePrefixes.cableGt01.get(Materials.Aluminium), 'H', OrePrefixes.plate.get(Materials.Titanium), 'P', OrePrefixes.plate.get(Materials.Plastic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_IV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_IV, 'C', OrePrefixes.cableGt01.get(Materials.Tungsten), 'H', OrePrefixes.plate.get(Materials.TungstenSteel), 'P', OrePrefixes.plate.get(Materials.Polytetrafluoroethylene)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_LuV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_LuV, 'C', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'H', OrePrefixes.plate.get(Materials.Chrome), 'P', OrePrefixes.plate.get(Materials.Polytetrafluoroethylene)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_ZPM.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_ZPM, 'C', OrePrefixes.cableGt02.get(Materials.Naquadah), 'H', OrePrefixes.plate.get(Materials.Iridium), 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_UV.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_UV, 'C', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 'H', OrePrefixes.plate.get(Materials.Osmium), 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_MAX.get(1L), GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{aTextCableHull, 'M', ItemList.Casing_MAX, 'C', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), 'H', OrePrefixes.plate.get(Materials.Neutronium), 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole)}); + + GT_ModHandler.removeRecipeByOutput(ItemList.Hull_ULV.get(1L)); + GT_ModHandler.removeRecipeByOutput(ItemList.Hull_LV.get(1L)); + GT_ModHandler.removeRecipeByOutput(ItemList.Hull_MV.get(1L)); + GT_ModHandler.removeRecipeByOutput(ItemList.Hull_HV.get(1L)); + GT_ModHandler.removeRecipeByOutput(ItemList.Hull_EV.get(1L)); + GT_ModHandler.removeRecipeByOutput(ItemList.Hull_IV.get(1L)); + GT_ModHandler.removeRecipeByOutput(ItemList.Hull_LuV.get(1L)); + GT_ModHandler.removeRecipeByOutput(ItemList.Hull_ZPM.get(1L)); + GT_ModHandler.removeRecipeByOutput(ItemList.Hull_UV.get(1L)); + GT_ModHandler.removeRecipeByOutput(ItemList.Hull_MAX.get(1L)); if (GT_Mod.gregtechproxy.mHardMachineCasings) { - GT_ModHandler.addCraftingRecipe(ItemList.Hull_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead), 'H', OrePrefixes.plate.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.Wood)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'H', OrePrefixes.plate.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.WroughtIron)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_MV, 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'H', OrePrefixes.plate.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.WroughtIron)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_HV, 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'H', OrePrefixes.plate.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.Plastic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_EV, 'C', OrePrefixes.cableGt01.get(Materials.Aluminium), 'H', OrePrefixes.plate.get(Materials.Titanium), 'P', OrePrefixes.plate.get(Materials.Plastic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_IV, 'C', OrePrefixes.cableGt01.get(Materials.Tungsten), 'H', OrePrefixes.plate.get(Materials.TungstenSteel), 'P', OrePrefixes.plate.get(Materials.Polytetrafluoroethylene)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_LuV, 'C', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'H', OrePrefixes.plate.get(Materials.Chrome), 'P', OrePrefixes.plate.get(Materials.Polytetrafluoroethylene)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_ZPM, 'C', OrePrefixes.cableGt01.get(Materials.Naquadah), 'H', OrePrefixes.plate.get(Materials.Iridium), 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_UV, 'C', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'H', OrePrefixes.plate.get(Materials.Osmium), 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_MAX, 'C', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), 'H', OrePrefixes.plate.get(Materials.Neutronium), 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_ULV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead), 'H', OrePrefixes.plate.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.Wood)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_LV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'H', OrePrefixes.plate.get(Materials.Steel), 'P', OrePrefixes.plate.get(Materials.WroughtIron)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_MV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_MV, 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'H', OrePrefixes.plate.get(Materials.Aluminium), 'P', OrePrefixes.plate.get(Materials.WroughtIron)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_HV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_HV, 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'H', OrePrefixes.plate.get(Materials.StainlessSteel), 'P', OrePrefixes.plate.get(Materials.Plastic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_EV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_EV, 'C', OrePrefixes.cableGt01.get(Materials.Aluminium), 'H', OrePrefixes.plate.get(Materials.Titanium), 'P', OrePrefixes.plate.get(Materials.Plastic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_IV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_IV, 'C', OrePrefixes.cableGt01.get(Materials.Tungsten), 'H', OrePrefixes.plate.get(Materials.TungstenSteel), 'P', OrePrefixes.plate.get(Materials.Polytetrafluoroethylene)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_LuV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_LuV, 'C', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'H', OrePrefixes.plate.get(Materials.Chrome), 'P', OrePrefixes.plate.get(Materials.Polytetrafluoroethylene)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_ZPM.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_ZPM, 'C', OrePrefixes.cableGt01.get(Materials.Naquadah), 'H', OrePrefixes.plate.get(Materials.Iridium), 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_UV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_UV, 'C', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'H', OrePrefixes.plate.get(Materials.Osmium), 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_MAX.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"PHP", aTextCableHull, 'M', ItemList.Casing_MAX, 'C', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), 'H', OrePrefixes.plate.get(Materials.Neutronium), 'P', OrePrefixes.plate.get(Materials.Polybenzimidazole)}); } else { - GT_ModHandler.addCraftingRecipe(ItemList.Hull_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_MV, 'C', OrePrefixes.cableGt01.get(Materials.Copper)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_HV, 'C', OrePrefixes.cableGt01.get(Materials.Gold)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_EV, 'C', OrePrefixes.cableGt01.get(Materials.Aluminium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_IV, 'C', OrePrefixes.cableGt01.get(Materials.Tungsten)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_LuV, 'C', OrePrefixes.cableGt01.get(Materials.VanadiumGallium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_ZPM, 'C', OrePrefixes.cableGt01.get(Materials.Naquadah)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_UV, 'C', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hull_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_MAX, 'C', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_ULV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_LV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_MV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_MV, 'C', OrePrefixes.cableGt01.get(Materials.Copper)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_HV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_HV, 'C', OrePrefixes.cableGt01.get(Materials.Gold)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_EV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_EV, 'C', OrePrefixes.cableGt01.get(Materials.Aluminium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_IV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_IV, 'C', OrePrefixes.cableGt01.get(Materials.Tungsten)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_LuV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_LuV, 'C', OrePrefixes.cableGt01.get(Materials.VanadiumGallium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_ZPM.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_ZPM, 'C', OrePrefixes.cableGt01.get(Materials.Naquadah)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_UV.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_UV, 'C', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hull_MAX.get(1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{aTextCableHull, 'M', ItemList.Casing_MAX, 'C', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV)}); } ItemList.Transformer_LV_ULV.set(new GT_MetaTileEntity_Transformer(20, "transformer.tier.00", "Ultra Low Voltage Transformer", 0, "LV -> ULV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_MV_LV.set(new GT_MetaTileEntity_Transformer(21, "transformer.tier.01", "Low Voltage Transformer", 1, "MV -> LV (Use Soft Mallet to invert)").getStackForm(1L)); @@ -192,15 +189,15 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Transformer_UV_ZPM.set(new GT_MetaTileEntity_Transformer(27, "transformer.tier.07", "ZPM Voltage Transformer", 7, "UV -> ZPM (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_MAX_UV.set(new GT_MetaTileEntity_Transformer(28, "transformer.tier.08", "Ultimate Transformer", 8, "UHV -> UV (Use Soft Mallet to invert)").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_LV_ULV.get(1L, new Object[0]), bitsd, new Object[]{" BB", "CM ", " BB", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'B', OrePrefixes.cableGt01.get(Materials.Lead)}); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_MV_LV.get(1L, new Object[0]), bitsd, new Object[]{" BB", "CM ", " BB", 'M', ItemList.Hull_LV, 'C', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'B', OrePrefixes.cableGt01.get(Materials.Tin)}); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_HV_MV.get(1L, new Object[0]), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_MV, 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'B', OrePrefixes.cableGt01.get(Materials.AnyCopper),'K',ItemList.Circuit_Parts_Coil}); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_EV_HV.get(1L, new Object[0]), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_HV, 'C', OrePrefixes.cableGt01.get(Materials.Aluminium), 'B', OrePrefixes.cableGt01.get(Materials.Gold),'K',ItemList.Circuit_Chip_ULPIC}); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_IV_EV.get(1L, new Object[0]), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_EV, 'C', OrePrefixes.cableGt01.get(Materials.Tungsten), 'B', OrePrefixes.cableGt01.get(Materials.Aluminium),'K',ItemList.Circuit_Chip_LPIC}); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_LuV_IV.get(1L, new Object[0]), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_IV, 'C', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'B', OrePrefixes.cableGt01.get(Materials.Tungsten),'K',ItemList.Circuit_Chip_PIC}); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_ZPM_LuV.get(1L, new Object[0]), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_LuV, 'C', OrePrefixes.cableGt02.get(Materials.Naquadah), 'B', OrePrefixes.cableGt01.get(Materials.VanadiumGallium),'K',ItemList.Circuit_Chip_HPIC}); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_UV_ZPM.get(1L, new Object[0]), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_ZPM, 'C', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 'B', OrePrefixes.cableGt02.get(Materials.Naquadah),'K',ItemList.Circuit_Chip_UHPIC}); - GT_ModHandler.addCraftingRecipe(ItemList.Transformer_MAX_UV.get(1L, new Object[0]), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_UV, 'C', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), 'B', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy),'K',ItemList.Circuit_Chip_NPIC}); + GT_ModHandler.addCraftingRecipe(ItemList.Transformer_LV_ULV.get(1L), bitsd, new Object[]{" BB", "CM ", " BB", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'B', OrePrefixes.cableGt01.get(Materials.Lead)}); + GT_ModHandler.addCraftingRecipe(ItemList.Transformer_MV_LV.get(1L), bitsd, new Object[]{" BB", "CM ", " BB", 'M', ItemList.Hull_LV, 'C', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'B', OrePrefixes.cableGt01.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.Transformer_HV_MV.get(1L), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_MV, 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'B', OrePrefixes.cableGt01.get(Materials.AnyCopper),'K',ItemList.Circuit_Parts_Coil}); + GT_ModHandler.addCraftingRecipe(ItemList.Transformer_EV_HV.get(1L), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_HV, 'C', OrePrefixes.cableGt01.get(Materials.Aluminium), 'B', OrePrefixes.cableGt01.get(Materials.Gold),'K',ItemList.Circuit_Chip_ULPIC}); + GT_ModHandler.addCraftingRecipe(ItemList.Transformer_IV_EV.get(1L), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_EV, 'C', OrePrefixes.cableGt01.get(Materials.Tungsten), 'B', OrePrefixes.cableGt01.get(Materials.Aluminium),'K',ItemList.Circuit_Chip_LPIC}); + GT_ModHandler.addCraftingRecipe(ItemList.Transformer_LuV_IV.get(1L), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_IV, 'C', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'B', OrePrefixes.cableGt01.get(Materials.Tungsten),'K',ItemList.Circuit_Chip_PIC}); + GT_ModHandler.addCraftingRecipe(ItemList.Transformer_ZPM_LuV.get(1L), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_LuV, 'C', OrePrefixes.cableGt02.get(Materials.Naquadah), 'B', OrePrefixes.cableGt01.get(Materials.VanadiumGallium),'K',ItemList.Circuit_Chip_HPIC}); + GT_ModHandler.addCraftingRecipe(ItemList.Transformer_UV_ZPM.get(1L), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_ZPM, 'C', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), 'B', OrePrefixes.cableGt02.get(Materials.Naquadah),'K',ItemList.Circuit_Chip_UHPIC}); + GT_ModHandler.addCraftingRecipe(ItemList.Transformer_MAX_UV.get(1L), bitsd, new Object[]{"KBB", "CM ", "KBB", 'M', ItemList.Hull_UV, 'C', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), 'B', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy),'K',ItemList.Circuit_Chip_NPIC}); ItemList.Hatch_Dynamo_ULV.set(new GT_MetaTileEntity_Hatch_Dynamo(30, "hatch.dynamo.tier.00", "ULV Dynamo Hatch", 0).getStackForm(1L)); ItemList.Hatch_Dynamo_LV.set(new GT_MetaTileEntity_Hatch_Dynamo(31, "hatch.dynamo.tier.01", "LV Dynamo Hatch", 1).getStackForm(1L)); @@ -213,9 +210,9 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Hatch_Dynamo_UV.set(new GT_MetaTileEntity_Hatch_Dynamo(38, "hatch.dynamo.tier.08", "UV Dynamo Hatch", 8).getStackForm(1L)); ItemList.Hatch_Dynamo_MAX.set(new GT_MetaTileEntity_Hatch_Dynamo(39, "hatch.dynamo.tier.09", "UHV Dynamo Hatch", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Dynamo_ULV.get(1L, new Object[0]), bitsd, new Object[]{"XOL", "SMP", "XOL", 'M', ItemList.Hull_ULV, 'S', OrePrefixes.spring.get(Materials.Lead), 'X', OrePrefixes.circuit.get(Materials.Primitive), 'O', ItemList.ULV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', OrePrefixes.rotor.get(Materials.Lead)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Dynamo_LV.get(1L, new Object[0]), bitsd, new Object[]{"XOL", "SMP", "XOL", 'M', ItemList.Hull_LV, 'S', OrePrefixes.spring.get(Materials.Tin), 'X', OrePrefixes.circuit.get(Materials.Basic), 'O', ItemList.LV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Dynamo_MV.get(1L, new Object[0]), bitsd, new Object[]{"XOL", "SMP", "XOL", 'M', ItemList.Hull_MV, 'S', OrePrefixes.spring.get(Materials.Copper), 'X', ItemList.Circuit_Chip_ULPIC, 'O', ItemList.MV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_MV}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Dynamo_ULV.get(1L), bitsd, new Object[]{"XOL", "SMP", "XOL", 'M', ItemList.Hull_ULV, 'S', OrePrefixes.spring.get(Materials.Lead), 'X', OrePrefixes.circuit.get(Materials.Primitive), 'O', ItemList.ULV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', OrePrefixes.rotor.get(Materials.Lead)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Dynamo_LV.get(1L), bitsd, new Object[]{"XOL", "SMP", "XOL", 'M', ItemList.Hull_LV, 'S', OrePrefixes.spring.get(Materials.Tin), 'X', OrePrefixes.circuit.get(Materials.Basic), 'O', ItemList.LV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Dynamo_MV.get(1L), bitsd, new Object[]{"XOL", "SMP", "XOL", 'M', ItemList.Hull_MV, 'S', OrePrefixes.spring.get(Materials.Copper), 'X', ItemList.Circuit_Chip_ULPIC, 'O', ItemList.MV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_MV}); ItemList.Hatch_Energy_ULV.set(new GT_MetaTileEntity_Hatch_Energy(40, "hatch.energy.tier.00", "ULV Energy Hatch", 0).getStackForm(1L)); ItemList.Hatch_Energy_LV.set(new GT_MetaTileEntity_Hatch_Energy(41, "hatch.energy.tier.01", "LV Energy Hatch", 1).getStackForm(1L)); @@ -228,9 +225,9 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Hatch_Energy_UV.set(new GT_MetaTileEntity_Hatch_Energy(48, "hatch.energy.tier.08", "UV Energy Hatch", 8).getStackForm(1L)); ItemList.Hatch_Energy_MAX.set(new GT_MetaTileEntity_Hatch_Energy(49, "hatch.energy.tier.09", "UHV Energy Hatch", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_ULV.get(1L, new Object[0]), bitsd, new Object[]{"COL", "XMP", "COL", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead), 'X', OrePrefixes.circuit.get(Materials.Primitive), 'O', ItemList.ULV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', OrePrefixes.rotor.get(Materials.Lead)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_LV.get(1L, new Object[0]), bitsd, new Object[]{"COL", "XMP", "COL", 'M', ItemList.Hull_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'X', OrePrefixes.circuit.get(Materials.Basic), 'O', ItemList.LV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_MV.get(1L, new Object[0]), bitsd, new Object[]{"XOL", "CMP", "XOL", 'M', ItemList.Hull_MV, 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'X', ItemList.Circuit_Chip_ULPIC, 'O', ItemList.MV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_MV}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_ULV.get(1L), bitsd, new Object[]{"COL", "XMP", "COL", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead), 'X', OrePrefixes.circuit.get(Materials.Primitive), 'O', ItemList.ULV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', OrePrefixes.rotor.get(Materials.Lead)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_LV.get(1L), bitsd, new Object[]{"COL", "XMP", "COL", 'M', ItemList.Hull_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'X', OrePrefixes.circuit.get(Materials.Basic), 'O', ItemList.LV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Energy_MV.get(1L), bitsd, new Object[]{"XOL", "CMP", "XOL", 'M', ItemList.Hull_MV, 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'X', ItemList.Circuit_Chip_ULPIC, 'O', ItemList.MV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_MV}); ItemList.Hatch_Input_ULV.set(new GT_MetaTileEntity_Hatch_Input(50, "hatch.input.tier.00", "Input Hatch (ULV)", 0).getStackForm(1L)); ItemList.Hatch_Input_LV.set(new GT_MetaTileEntity_Hatch_Input(51, "hatch.input.tier.01", "Input Hatch (LV)", 1).getStackForm(1L)); @@ -243,9 +240,9 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Hatch_Input_UV.set(new GT_MetaTileEntity_Hatch_Input(58, "hatch.input.tier.08", "Input Hatch (UV)", 8).getStackForm(1L)); ItemList.Hatch_Input_MAX.set(new GT_MetaTileEntity_Hatch_Input(59, "hatch.input.tier.09", "Input Hatch (UHV)", 9).getStackForm(1L)); -// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_ULV.get(1L, new Object[0]), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.plate.get(Materials.Rubber), 'I', OrePrefixes.pipeMedium.get(Materials.Copper), 'X', ItemList.Cell_Empty}); -// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_LV.get(1L, new Object[0]), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_LV, 'C', ItemList.Electric_Pump_LV, 'I', OrePrefixes.pipeMedium.get(Materials.Bronze), 'X', ItemList.Large_Fluid_Cell_Steel}); -// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_MV.get(1L, new Object[0]), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_MV, 'C', ItemList.Electric_Pump_MV, 'I', OrePrefixes.pipeMedium.get(Materials.Steel), 'X', ItemList.Large_Fluid_Cell_Aluminium}); +// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_ULV.get(1L), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.plate.get(Materials.Rubber), 'I', OrePrefixes.pipeMedium.get(Materials.Copper), 'X', ItemList.Cell_Empty}); +// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_LV.get(1L), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_LV, 'C', ItemList.Electric_Pump_LV, 'I', OrePrefixes.pipeMedium.get(Materials.Bronze), 'X', ItemList.Large_Fluid_Cell_Steel}); +// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_MV.get(1L), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_MV, 'C', ItemList.Electric_Pump_MV, 'I', OrePrefixes.pipeMedium.get(Materials.Steel), 'X', ItemList.Large_Fluid_Cell_Aluminium}); ItemList.Hatch_Output_ULV.set(new GT_MetaTileEntity_Hatch_Output(60, "hatch.output.tier.00", "Output Hatch (ULV)", 0).getStackForm(1L)); ItemList.Hatch_Output_LV.set(new GT_MetaTileEntity_Hatch_Output(61, "hatch.output.tier.01", "Output Hatch (LV)", 1).getStackForm(1L)); @@ -258,9 +255,9 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Hatch_Output_UV.set(new GT_MetaTileEntity_Hatch_Output(68, "hatch.output.tier.08", "Output Hatch (UV)", 8).getStackForm(1L)); ItemList.Hatch_Output_MAX.set(new GT_MetaTileEntity_Hatch_Output(69, "hatch.output.tier.09", "Output Hatch (UHV)", 9).getStackForm(1L)); -// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_ULV.get(1L, new Object[0]), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.plate.get(Materials.Rubber), 'I', OrePrefixes.pipeMedium.get(Materials.Copper), 'X', ItemList.Cell_Empty}); -// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_LV.get(1L, new Object[0]), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_LV, 'C', ItemList.Electric_Pump_LV, 'I', OrePrefixes.pipeMedium.get(Materials.Bronze), 'X', ItemList.Large_Fluid_Cell_Steel}); -// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_MV.get(1L, new Object[0]), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_MV, 'C', ItemList.Electric_Pump_MV, 'I', OrePrefixes.pipeMedium.get(Materials.Steel), 'X', ItemList.Large_Fluid_Cell_Aluminium}); +// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_ULV.get(1L), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.plate.get(Materials.Rubber), 'I', OrePrefixes.pipeMedium.get(Materials.Copper), 'X', ItemList.Cell_Empty}); +// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_LV.get(1L), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_LV, 'C', ItemList.Electric_Pump_LV, 'I', OrePrefixes.pipeMedium.get(Materials.Bronze), 'X', ItemList.Large_Fluid_Cell_Steel}); +// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_MV.get(1L), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_MV, 'C', ItemList.Electric_Pump_MV, 'I', OrePrefixes.pipeMedium.get(Materials.Steel), 'X', ItemList.Large_Fluid_Cell_Aluminium}); ItemList.Quantum_Tank_LV.set(new GT_MetaTileEntity_QuantumTank(120, "quantum.tank.tier.06", "Quantum Tank I", 6).getStackForm(1L)); ItemList.Quantum_Tank_MV.set(new GT_MetaTileEntity_QuantumTank(121, "quantum.tank.tier.07", "Quantum Tank II", 7).getStackForm(1L)); @@ -268,11 +265,11 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Quantum_Tank_EV.set(new GT_MetaTileEntity_QuantumTank(123, "quantum.tank.tier.09", "Quantum Tank IV", 9).getStackForm(1L)); ItemList.Quantum_Tank_IV.set(new GT_MetaTileEntity_QuantumTank(124, "quantum.tank.tier.10", "Quantum Tank V", 10).getStackForm(1L)); - //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Tank_LV.get(1L, new Object[0]), bitsd, new Object[]{"DGD", aTextPlateMotor, "DPD", 'M', ItemList.Hull_LV, 'G', ItemList.Field_Generator_LV, 'D', OrePrefixes.circuit.get(Materials.Advanced), 'P', OrePrefixes.plate.get(Materials.StainlessSteel)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Tank_MV.get(1L, new Object[0]), bitsd, new Object[]{"DGD", aTextPlateMotor, "DPD", 'M', ItemList.Hull_MV, 'G', ItemList.Field_Generator_MV, 'D', OrePrefixes.circuit.get(Materials.Data), 'P', OrePrefixes.plate.get(Materials.Titanium)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Tank_HV.get(1L, new Object[0]), bitsd, new Object[]{"DGD", aTextPlateMotor, "DPD", 'M', ItemList.Hull_HV, 'G', ItemList.Field_Generator_HV, 'D', OrePrefixes.circuit.get(Materials.Elite), 'P', OrePrefixes.plate.get(Materials.TungstenSteel)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Tank_EV.get(1L, new Object[0]), bitsd, new Object[]{"DGD", aTextPlateMotor, "DPD", 'M', ItemList.Hull_EV, 'G', ItemList.Field_Generator_EV, 'D', OrePrefixes.circuit.get(Materials.Master), 'P', OrePrefixes.plate.get(Materials.Europium)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Tank_IV.get(1L, new Object[0]), bitsd, new Object[]{"DGD", aTextPlateMotor, "DPD", 'M', ItemList.Hull_IV, 'G', ItemList.Field_Generator_IV, 'D', OrePrefixes.circuit.get(Materials.Ultimate), 'P', OrePrefixes.plate.get(Materials.Americium)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Tank_LV.get(1L), bitsd, new Object[]{"DGD", aTextPlateMotor, "DPD", 'M', ItemList.Hull_LV, 'G', ItemList.Field_Generator_LV, 'D', OrePrefixes.circuit.get(Materials.Advanced), 'P', OrePrefixes.plate.get(Materials.StainlessSteel)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Tank_MV.get(1L), bitsd, new Object[]{"DGD", aTextPlateMotor, "DPD", 'M', ItemList.Hull_MV, 'G', ItemList.Field_Generator_MV, 'D', OrePrefixes.circuit.get(Materials.Data), 'P', OrePrefixes.plate.get(Materials.Titanium)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Tank_HV.get(1L), bitsd, new Object[]{"DGD", aTextPlateMotor, "DPD", 'M', ItemList.Hull_HV, 'G', ItemList.Field_Generator_HV, 'D', OrePrefixes.circuit.get(Materials.Elite), 'P', OrePrefixes.plate.get(Materials.TungstenSteel)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Tank_EV.get(1L), bitsd, new Object[]{"DGD", aTextPlateMotor, "DPD", 'M', ItemList.Hull_EV, 'G', ItemList.Field_Generator_EV, 'D', OrePrefixes.circuit.get(Materials.Master), 'P', OrePrefixes.plate.get(Materials.Europium)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Tank_IV.get(1L), bitsd, new Object[]{"DGD", aTextPlateMotor, "DPD", 'M', ItemList.Hull_IV, 'G', ItemList.Field_Generator_IV, 'D', OrePrefixes.circuit.get(Materials.Ultimate), 'P', OrePrefixes.plate.get(Materials.Americium)}); ItemList.Quantum_Chest_LV.set(new GT_MetaTileEntity_QuantumChest(125, "quantum.chest.tier.06", "Quantum Chest I", 6).getStackForm(1L)); ItemList.Quantum_Chest_MV.set(new GT_MetaTileEntity_QuantumChest(126, "quantum.chest.tier.07", "Quantum Chest II", 7).getStackForm(1L)); @@ -280,11 +277,11 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Quantum_Chest_EV.set(new GT_MetaTileEntity_QuantumChest(128, "quantum.chest.tier.09", "Quantum Chest IV", 9).getStackForm(1L)); ItemList.Quantum_Chest_IV.set(new GT_MetaTileEntity_QuantumChest(129, "quantum.chest.tier.10", "Quantum Chest V", 10).getStackForm(1L)); - //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Chest_LV.get(1L, new Object[0]), bitsd, new Object[]{"DPD", aTextPlateMotor, "DGD", 'M', ItemList.Hull_LV, 'G', ItemList.Field_Generator_LV, 'D', OrePrefixes.circuit.get(Materials.Advanced), 'P', OrePrefixes.plate.get(Materials.StainlessSteel)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Chest_MV.get(1L, new Object[0]), bitsd, new Object[]{"DPD", aTextPlateMotor, "DGD", 'M', ItemList.Hull_MV, 'G', ItemList.Field_Generator_MV, 'D', OrePrefixes.circuit.get(Materials.Data), 'P', OrePrefixes.plate.get(Materials.Titanium)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Chest_HV.get(1L, new Object[0]), bitsd, new Object[]{"DPD", aTextPlateMotor, "DGD", 'M', ItemList.Hull_HV, 'G', ItemList.Field_Generator_HV, 'D', OrePrefixes.circuit.get(Materials.Elite), 'P', OrePrefixes.plate.get(Materials.TungstenSteel)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Chest_EV.get(1L, new Object[0]), bitsd, new Object[]{"DPD", aTextPlateMotor, "DGD", 'M', ItemList.Hull_EV, 'G', ItemList.Field_Generator_EV, 'D', OrePrefixes.circuit.get(Materials.Master), 'P', OrePrefixes.plate.get(Materials.Europium)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Chest_IV.get(1L, new Object[0]), bitsd, new Object[]{"DPD", aTextPlateMotor, "DGD", 'M', ItemList.Hull_IV, 'G', ItemList.Field_Generator_IV, 'D', OrePrefixes.circuit.get(Materials.Ultimate), 'P', OrePrefixes.plate.get(Materials.Americium)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Chest_LV.get(1L), bitsd, new Object[]{"DPD", aTextPlateMotor, "DGD", 'M', ItemList.Hull_LV, 'G', ItemList.Field_Generator_LV, 'D', OrePrefixes.circuit.get(Materials.Advanced), 'P', OrePrefixes.plate.get(Materials.StainlessSteel)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Chest_MV.get(1L), bitsd, new Object[]{"DPD", aTextPlateMotor, "DGD", 'M', ItemList.Hull_MV, 'G', ItemList.Field_Generator_MV, 'D', OrePrefixes.circuit.get(Materials.Data), 'P', OrePrefixes.plate.get(Materials.Titanium)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Chest_HV.get(1L), bitsd, new Object[]{"DPD", aTextPlateMotor, "DGD", 'M', ItemList.Hull_HV, 'G', ItemList.Field_Generator_HV, 'D', OrePrefixes.circuit.get(Materials.Elite), 'P', OrePrefixes.plate.get(Materials.TungstenSteel)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Chest_EV.get(1L), bitsd, new Object[]{"DPD", aTextPlateMotor, "DGD", 'M', ItemList.Hull_EV, 'G', ItemList.Field_Generator_EV, 'D', OrePrefixes.circuit.get(Materials.Master), 'P', OrePrefixes.plate.get(Materials.Europium)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Quantum_Chest_IV.get(1L), bitsd, new Object[]{"DPD", aTextPlateMotor, "DGD", 'M', ItemList.Hull_IV, 'G', ItemList.Field_Generator_IV, 'D', OrePrefixes.circuit.get(Materials.Ultimate), 'P', OrePrefixes.plate.get(Materials.Americium)}); ItemList.Super_Tank_LV.set(new GT_MetaTileEntity_SuperTank(130, "super.tank.tier.01", "Super Tank I", 1).getStackForm(1L)); ItemList.Super_Tank_MV.set(new GT_MetaTileEntity_SuperTank(131, "super.tank.tier.02", "Super Tank II", 2).getStackForm(1L)); @@ -309,9 +306,9 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Hatch_Input_Bus_UV.set(new GT_MetaTileEntity_Hatch_InputBus(78, "hatch.input_bus.tier.08", "Input Bus (UV)", 8).getStackForm(1L)); ItemList.Hatch_Input_Bus_MAX.set(new GT_MetaTileEntity_Hatch_InputBus(79, "hatch.input_bus.tier.09", "Input Bus (UHV)", 9).getStackForm(1L)); -// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_Bus_ULV.get(1L, new Object[0]), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.plate.get(Materials.Lead), 'I', OrePrefixes.pipeMedium.get(Materials.Tin), 'X', new ItemStack(Blocks.chest, 1, 0)}); -// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_Bus_LV.get(1L, new Object[0]), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_LV, 'C', ItemList.Conveyor_Module_LV, 'I', OrePrefixes.pipeMedium.get(Materials.Nickel), 'X', new ItemStack(Blocks.chest, 1, 0)}); -// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_Bus_MV.get(1L, new Object[0]), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_MV, 'C', ItemList.Conveyor_Module_MV, 'I', OrePrefixes.pipeMedium.get(Materials.Cobalt), 'X', new ItemStack(Blocks.chest, 1, 0)}); +// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_Bus_ULV.get(1L), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.plate.get(Materials.Lead), 'I', OrePrefixes.pipeMedium.get(Materials.Tin), 'X', new ItemStack(Blocks.chest, 1, 0)}); +// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_Bus_LV.get(1L), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_LV, 'C', ItemList.Conveyor_Module_LV, 'I', OrePrefixes.pipeMedium.get(Materials.Nickel), 'X', new ItemStack(Blocks.chest, 1, 0)}); +// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Input_Bus_MV.get(1L), bitsd, new Object[]{"CX ", "MI ", 'M', ItemList.Hull_MV, 'C', ItemList.Conveyor_Module_MV, 'I', OrePrefixes.pipeMedium.get(Materials.Cobalt), 'X', new ItemStack(Blocks.chest, 1, 0)}); ItemList.Hatch_Output_Bus_ULV.set(new GT_MetaTileEntity_Hatch_OutputBus(80, "hatch.output_bus.tier.00", "Output Bus (ULV)", 0).getStackForm(1L)); ItemList.Hatch_Output_Bus_LV.set(new GT_MetaTileEntity_Hatch_OutputBus(81, "hatch.output_bus.tier.01", "Output Bus (LV)", 1).getStackForm(1L)); @@ -324,28 +321,28 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Hatch_Output_Bus_UV.set(new GT_MetaTileEntity_Hatch_OutputBus(88, "hatch.output_bus.tier.08", "Output Bus (UV)", 8).getStackForm(1L)); ItemList.Hatch_Output_Bus_MAX.set(new GT_MetaTileEntity_Hatch_OutputBus(89, "hatch.output_bus.tier.09", "Output Bus (UHV)", 9).getStackForm(1L)); -// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_Bus_ULV.get(1L, new Object[0]), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.plate.get(Materials.Lead), 'I', OrePrefixes.pipeMedium.get(Materials.Tin), 'X', new ItemStack(Blocks.chest, 1, 0)}); -// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_Bus_LV.get(1L, new Object[0]), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_LV, 'C', ItemList.Conveyor_Module_LV, 'I', OrePrefixes.pipeMedium.get(Materials.Nickel), 'X', new ItemStack(Blocks.chest, 1, 0)}); -// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_Bus_MV.get(1L, new Object[0]), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_MV, 'C', ItemList.Conveyor_Module_MV, 'I', OrePrefixes.pipeMedium.get(Materials.Cobalt), 'X', new ItemStack(Blocks.chest, 1, 0)}); +// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_Bus_ULV.get(1L), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.plate.get(Materials.Lead), 'I', OrePrefixes.pipeMedium.get(Materials.Tin), 'X', new ItemStack(Blocks.chest, 1, 0)}); +// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_Bus_LV.get(1L), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_LV, 'C', ItemList.Conveyor_Module_LV, 'I', OrePrefixes.pipeMedium.get(Materials.Nickel), 'X', new ItemStack(Blocks.chest, 1, 0)}); +// GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Output_Bus_MV.get(1L), bitsd, new Object[]{" XC", "IM ", 'M', ItemList.Hull_MV, 'C', ItemList.Conveyor_Module_MV, 'I', OrePrefixes.pipeMedium.get(Materials.Cobalt), 'X', new ItemStack(Blocks.chest, 1, 0)}); ItemList.Hatch_Maintenance.set(new GT_MetaTileEntity_Hatch_Maintenance(90, "hatch.maintenance", "Maintenance Hatch", 1).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L, new Object[0]), bitsd, new Object[]{"dwx", "hMc", "fsr", 'M', ItemList.Hull_LV}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L, new Object[0]), bitsd, new Object[]{"dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', GT_ModHandler.getModItem("Railcraft", "tool.crowbar", 1L, 0)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L, new Object[0]), bitsd, new Object[]{"dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', GT_ModHandler.getModItem("Railcraft", "tool.crowbar.reinforced", 1L, 0)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L, new Object[0]), bitsd, new Object[]{"dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', GT_ModHandler.getModItem("Railcraft", "tool.crowbar.magic", 1L, 0)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L, new Object[0]), bitsd, new Object[]{"dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', GT_ModHandler.getModItem("Railcraft", "tool.crowbar.void", 1L, 0)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[]{"dwx", "hMc", "fsr", 'M', ItemList.Hull_LV}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[]{"dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', GT_ModHandler.getModItem("Railcraft", "tool.crowbar", 1L, 0)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[]{"dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', GT_ModHandler.getModItem("Railcraft", "tool.crowbar.reinforced", 1L, 0)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[]{"dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', GT_ModHandler.getModItem("Railcraft", "tool.crowbar.magic", 1L, 0)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Maintenance.get(1L), bitsd, new Object[]{"dwx", "hMC", "fsr", 'M', ItemList.Hull_LV, 'C', GT_ModHandler.getModItem("Railcraft", "tool.crowbar.void", 1L, 0)}); ItemList.Hatch_AutoMaintenance.set(new GT_MetaTileEntity_Hatch_Maintenance(111, "hatch.maintenance.auto", "Auto Maintenance Hatch", 6, true).getStackForm(1L)); ItemList.Hatch_DataAccess_EV.set(new GT_MetaTileEntity_Hatch_DataAccess(145, "hatch.dataaccess", "Data Access Hatch", 4).getStackForm(1L)); ItemList.Hatch_DataAccess_LuV.set(new GT_MetaTileEntity_Hatch_DataAccess(146, "hatch.dataaccess.adv", "Advanced Data Access Hatch", 6).getStackForm(1L)); ItemList.Hatch_DataAccess_UV.set(new GT_MetaTileEntity_Hatch_DataAccess(147, "hatch.dataaccess.auto", "Automatable Data Access Hatch", 8).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_DataAccess_EV.get(1L, new Object[0]), bitsd, new Object[]{"COC", "OMO", "COC", 'M', ItemList.Hull_EV, 'O', ItemList.Tool_DataStick , 'C' ,OrePrefixes.circuit.get(Materials.Elite)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_DataAccess_LuV.get(1L, new Object[0]), bitsd, new Object[]{"COC", "OMO", "COC", 'M', ItemList.Hull_LuV, 'O', ItemList.Tool_DataOrb , 'C' ,OrePrefixes.circuit.get(Materials.Ultimate)}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_DataAccess_UV.get(1L, new Object[0]), bitsd, new Object[]{"CRC", "OMO", "CRC", 'M', ItemList.Hull_UV, 'O', ItemList.Tool_DataOrb , 'C' ,OrePrefixes.circuit.get(Materials.Infinite), 'R', ItemList.Robot_Arm_UV}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_DataAccess_EV.get(1L), bitsd, new Object[]{"COC", "OMO", "COC", 'M', ItemList.Hull_EV, 'O', ItemList.Tool_DataStick , 'C' ,OrePrefixes.circuit.get(Materials.Elite)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_DataAccess_LuV.get(1L), bitsd, new Object[]{"COC", "OMO", "COC", 'M', ItemList.Hull_LuV, 'O', ItemList.Tool_DataOrb , 'C' ,OrePrefixes.circuit.get(Materials.Ultimate)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_DataAccess_UV.get(1L), bitsd, new Object[]{"CRC", "OMO", "CRC", 'M', ItemList.Hull_UV, 'O', ItemList.Tool_DataOrb , 'C' ,OrePrefixes.circuit.get(Materials.Infinite), 'R', ItemList.Robot_Arm_UV}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_AutoMaintenance.get(1L, new Object[0]), bitsd, new Object[]{"CHC", "AMA", "CHC", 'M', ItemList.Hull_LuV,'H',ItemList.Hatch_Maintenance,'A',ItemList.Robot_Arm_LuV,'C',OrePrefixes.circuit.get(Materials.Ultimate)}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_AutoMaintenance.get(1L), bitsd, new Object[]{"CHC", "AMA", "CHC", 'M', ItemList.Hull_LuV,'H',ItemList.Hatch_Maintenance,'A',ItemList.Robot_Arm_LuV,'C',OrePrefixes.circuit.get(Materials.Ultimate)}); ItemList.Hatch_Muffler_LV.set(new GT_MetaTileEntity_Hatch_Muffler(91, "hatch.muffler.tier.01", "Muffler Hatch (LV)", 1).getStackForm(1L)); ItemList.Hatch_Muffler_MV.set(new GT_MetaTileEntity_Hatch_Muffler(92, "hatch.muffler.tier.02", "Muffler Hatch (MV)", 2).getStackForm(1L)); @@ -357,22 +354,23 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Hatch_Muffler_UV.set(new GT_MetaTileEntity_Hatch_Muffler(98, "hatch.muffler.tier.08", "Muffler Hatch (UV)", 8).getStackForm(1L)); ItemList.Hatch_Muffler_MAX.set(new GT_MetaTileEntity_Hatch_Muffler(99, "hatch.muffler.tier.09", "Muffler Hatch (UHV)", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Muffler_LV.get(1L, new Object[0]), bitsd, new Object[]{"MX ", "PR ", 'M', ItemList.Hull_LV, 'P', OrePrefixes.pipeMedium.get(Materials.Bronze), 'R', OrePrefixes.rotor.get(Materials.Bronze), 'X', ItemList.Electric_Motor_LV}); - GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Muffler_MV.get(1L, new Object[0]), bitsd, new Object[]{"MX ", "PR ", 'M', ItemList.Hull_MV, 'P', OrePrefixes.pipeMedium.get(Materials.Steel), 'R', OrePrefixes.rotor.get(Materials.Steel), 'X', ItemList.Electric_Motor_MV}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Muffler_LV.get(1L), bitsd, new Object[]{"MX ", "PR ", 'M', ItemList.Hull_LV, 'P', OrePrefixes.pipeMedium.get(Materials.Bronze), 'R', OrePrefixes.rotor.get(Materials.Bronze), 'X', ItemList.Electric_Motor_LV}); + GT_ModHandler.addCraftingRecipe(ItemList.Hatch_Muffler_MV.get(1L), bitsd, new Object[]{"MX ", "PR ", 'M', ItemList.Hull_MV, 'P', OrePrefixes.pipeMedium.get(Materials.Steel), 'R', OrePrefixes.rotor.get(Materials.Steel), 'X', ItemList.Electric_Motor_MV}); ItemList.Machine_Bronze_Boiler.set(new GT_MetaTileEntity_Boiler_Bronze(100, "boiler.bronze", "Small Coal Boiler").getStackForm(1L)); ItemList.Machine_Steel_Boiler.set(new GT_MetaTileEntity_Boiler_Steel(101, "boiler.steel", "High Pressure Coal Boiler").getStackForm(1L)); ItemList.Machine_Steel_Boiler_Lava.set(new GT_MetaTileEntity_Boiler_Lava(102, "boiler.lava", "High Pressure Lava Boiler").getStackForm(1L)); ItemList.Machine_Bronze_Boiler_Solar.set(new GT_MetaTileEntity_Boiler_Solar(105, "boiler.solar", "Simple Solar Boiler").getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Boiler.get(1L, new Object[0]), bits, new Object[]{aTextPlate, "PwP", "BFB", 'F', OreDictNames.craftingIronFurnace, 'P', OrePrefixes.plate.get(Materials.Bronze), 'B', new ItemStack(Blocks.brick_block, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Steel_Boiler.get(1L, new Object[0]), bits, new Object[]{aTextPlate, "PwP", "BFB", 'F', OreDictNames.craftingIronFurnace, 'P', OrePrefixes.plate.get(Materials.Steel), 'B', new ItemStack(Blocks.brick_block, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Steel_Boiler_Lava.get(1L, new Object[0]), bits, new Object[]{aTextPlate, "PTP", aTextPlateMotor, 'M', ItemList.Hull_HP, 'P', OrePrefixes.plate.get(Materials.Steel), 'T', GT_ModHandler.getModItem("BuildCraft|Factory", "tankBlock", 1L, 0)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Boiler_Solar.get(1L, new Object[0]), bits, new Object[]{"GGG", "SSS", aTextPlateMotor, 'M', ItemList.Hull_Bronze_Bricks, 'P', OrePrefixes.pipeSmall.get(Materials.Bronze), 'S', OrePrefixes.plateDouble.get(Materials.Silver), 'G', new ItemStack(Blocks.glass, 1)}); + ItemList.Machine_HP_Solar.set(new GT_MetaTileEntity_Boiler_Solar_Steel(114,"boiler.steel.solar", "High Pressure Solar Boiler").getStackForm(1L)); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Boiler.get(1L), bits, new Object[]{aTextPlate, "PwP", "BFB", 'F', OreDictNames.craftingIronFurnace, 'P', OrePrefixes.plate.get(Materials.Bronze), 'B', new ItemStack(Blocks.brick_block, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Steel_Boiler.get(1L), bits, new Object[]{aTextPlate, "PwP", "BFB", 'F', OreDictNames.craftingIronFurnace, 'P', OrePrefixes.plate.get(Materials.Steel), 'B', new ItemStack(Blocks.brick_block, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Steel_Boiler_Lava.get(1L), bits, new Object[]{aTextPlate, "PTP", aTextPlateMotor, 'M', ItemList.Hull_HP, 'P', OrePrefixes.plate.get(Materials.Steel), 'T', GT_ModHandler.getModItem("BuildCraft|Factory", "tankBlock", 1L, 0)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Boiler_Solar.get(1L), bits, new Object[]{"GGG", "SSS", aTextPlateMotor, 'M', ItemList.Hull_Bronze_Bricks, 'P', OrePrefixes.pipeSmall.get(Materials.Bronze), 'S', OrePrefixes.plateDouble.get(Materials.Silver), 'G', new ItemStack(Blocks.glass, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Solar.get(1L), bits, new Object[]{"GGG", "SSS", aTextPlateMotor, 'M', ItemList.Hull_HP_Bricks, 'P', OrePrefixes.pipeSmall.get(Materials.Steel), 'S', OrePrefixes.plateTriple.get(Materials.Silver), 'G', GT_ModHandler.getModItem("IC2","blockAlloyGlass",1L)}); ItemList.Machine_Bronze_BlastFurnace.set(new GT_MetaTileEntity_BronzeBlastFurnace(108, "bronzemachine.blastfurnace", "Bronze Plated Blast Furnace").getStackForm(1L)); //if (!Loader.isModLoaded("terrafirmacraft")) { - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_BlastFurnace.get(1L, new Object[0]), bits, new Object[]{"PFP", "FwF", "PFP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', OreDictNames.craftingIronFurnace}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_BlastFurnace.get(1L), bits, new Object[]{"PFP", "FwF", "PFP", 'P', OrePrefixes.plate.get(Materials.Bronze), 'F', OreDictNames.craftingIronFurnace}); //} ItemList.Machine_Bronze_Furnace.set(new GT_MetaTileEntity_Furnace_Bronze(103, "bronzemachine.furnace", "Steam Furnace").getStackForm(1L)); ItemList.Machine_HP_Furnace.set(new GT_MetaTileEntity_Furnace_Steel(104, "hpmachine.furnace", "High Pressure Furnace").getStackForm(1L)); @@ -387,18 +385,18 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Machine_Bronze_AlloySmelter.set(new GT_MetaTileEntity_AlloySmelter_Bronze(118, "bronzemachine.alloysmelter", "Steam Alloy Smelter").getStackForm(1L)); ItemList.Machine_HP_AlloySmelter.set(new GT_MetaTileEntity_AlloySmelter_Steel(119, "hpmachine.alloysmelter", "High Pressure Alloy Smelter").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Furnace.get(1L, new Object[0]), bits, new Object[]{"XXX", "XMX", "XFX", 'M', ItemList.Hull_Bronze_Bricks, 'X', OrePrefixes.pipeSmall.get(Materials.Bronze), 'F', OreDictNames.craftingFurnace}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Furnace.get(1L, new Object[0]), bits, new Object[]{"XSX", "PMP", "XXX", 'M', ItemList.Machine_Bronze_Furnace, 'X', OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Macerator.get(1L, new Object[0]), bits, new Object[]{"DXD", "XMX", "PXP", 'M', ItemList.Hull_Bronze, 'X', OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston, 'D', OrePrefixes.gem.get(Materials.Diamond)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Macerator.get(1L, new Object[0]), bits, new Object[]{"PSP", "XMX", "PPP", 'M', ItemList.Machine_Bronze_Macerator, 'X', OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Extractor.get(1L, new Object[0]), bits, new Object[]{"XXX", "PMG", "XXX", 'M', ItemList.Hull_Bronze, 'X', OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston, 'G', new ItemStack(Blocks.glass, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Extractor.get(1L, new Object[0]), bits, new Object[]{"XSX", "PMP", "XXX", 'M', ItemList.Machine_Bronze_Extractor, 'X', OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Hammer.get(1L, new Object[0]), bits, new Object[]{"XPX", "XMX", "XAX", 'M', ItemList.Hull_Bronze, 'X', OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston, 'A', OreDictNames.craftingAnvil}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Hammer.get(1L, new Object[0]), bits, new Object[]{"PSP", "XMX", "PPP", 'M', ItemList.Machine_Bronze_Hammer, 'X', OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Compressor.get(1L, new Object[0]), bits, new Object[]{"XXX", aTextPlateMotor, "XXX", 'M', ItemList.Hull_Bronze, 'X', OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Compressor.get(1L, new Object[0]), bits, new Object[]{"XSX", "PMP", "XXX", 'M', ItemList.Machine_Bronze_Compressor, 'X', OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_AlloySmelter.get(1L, new Object[0]), bits, new Object[]{"XXX", "FMF", "XXX", 'M', ItemList.Hull_Bronze_Bricks, 'X', OrePrefixes.pipeSmall.get(Materials.Bronze), 'F', OreDictNames.craftingFurnace}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_AlloySmelter.get(1L, new Object[0]), bits, new Object[]{"PSP", "PMP", "PXP", 'M', ItemList.Machine_Bronze_AlloySmelter, 'X', OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Furnace.get(1L), bits, new Object[]{"XXX", "XMX", "XFX", 'M', ItemList.Hull_Bronze_Bricks, 'X', OrePrefixes.pipeSmall.get(Materials.Bronze), 'F', OreDictNames.craftingFurnace}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Furnace.get(1L), bits, new Object[]{"XSX", "PMP", "XXX", 'M', ItemList.Machine_Bronze_Furnace, 'X', OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Macerator.get(1L), bits, new Object[]{"DXD", "XMX", "PXP", 'M', ItemList.Hull_Bronze, 'X', OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston, 'D', OrePrefixes.gem.get(Materials.Diamond)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Macerator.get(1L), bits, new Object[]{"PSP", "XMX", "PPP", 'M', ItemList.Machine_Bronze_Macerator, 'X', OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Extractor.get(1L), bits, new Object[]{"XXX", "PMG", "XXX", 'M', ItemList.Hull_Bronze, 'X', OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston, 'G', new ItemStack(Blocks.glass, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Extractor.get(1L), bits, new Object[]{"XSX", "PMP", "XXX", 'M', ItemList.Machine_Bronze_Extractor, 'X', OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Hammer.get(1L), bits, new Object[]{"XPX", "XMX", "XAX", 'M', ItemList.Hull_Bronze, 'X', OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston, 'A', OreDictNames.craftingAnvil}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Hammer.get(1L), bits, new Object[]{"PSP", "XMX", "PPP", 'M', ItemList.Machine_Bronze_Hammer, 'X', OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_Compressor.get(1L), bits, new Object[]{"XXX", aTextPlateMotor, "XXX", 'M', ItemList.Hull_Bronze, 'X', OrePrefixes.pipeSmall.get(Materials.Bronze), 'P', OreDictNames.craftingPiston}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_Compressor.get(1L), bits, new Object[]{"XSX", "PMP", "XXX", 'M', ItemList.Machine_Bronze_Compressor, 'X', OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Bronze_AlloySmelter.get(1L), bits, new Object[]{"XXX", "FMF", "XXX", 'M', ItemList.Hull_Bronze_Bricks, 'X', OrePrefixes.pipeSmall.get(Materials.Bronze), 'F', OreDictNames.craftingFurnace}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HP_AlloySmelter.get(1L), bits, new Object[]{"PSP", "PMP", "PXP", 'M', ItemList.Machine_Bronze_AlloySmelter, 'X', OrePrefixes.pipeSmall.get(Materials.WroughtIron), 'P', OrePrefixes.plate.get(Materials.WroughtIron), 'S', OrePrefixes.plate.get(Materials.Steel)}); ItemList.Locker_ULV.set(new GT_MetaTileEntity_Locker(150, "locker.tier.00", "Ultra Low Voltage Locker", 0).getStackForm(1L)); ItemList.Locker_LV.set(new GT_MetaTileEntity_Locker(151, "locker.tier.01", "Low Voltage Locker", 1).getStackForm(1L)); @@ -422,16 +420,16 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Battery_Buffer_1by1_UV.set(new GT_MetaTileEntity_BasicBatteryBuffer(168, "batterybuffer.01.tier.08", "Ultimate Voltage Battery Buffer", 8, "", 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_MAX.set(new GT_MetaTileEntity_BasicBatteryBuffer(169, "batterybuffer.01.tier.09", "Highly Ultimate Voltage Battery Buffer", 9, "", 1).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_ULV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt01.get(Materials.Lead), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_LV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt01.get(Materials.Tin), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_MV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt01.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_HV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt01.get(Materials.Gold), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_EV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt01.get(Materials.Aluminium), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_IV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt01.get(Materials.Tungsten), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_LuV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt01.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_ZPM.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt01.get(Materials.Naquadah), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_UV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt01.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_MAX.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_ULV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt01.get(Materials.Lead), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_LV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt01.get(Materials.Tin), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_MV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt01.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_HV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt01.get(Materials.Gold), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_EV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt01.get(Materials.Aluminium), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_IV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt01.get(Materials.Tungsten), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_LuV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt01.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_ZPM.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt01.get(Materials.Naquadah), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_UV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt01.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_1by1_MAX.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest}); ItemList.Battery_Buffer_2by2_ULV.set(new GT_MetaTileEntity_BasicBatteryBuffer(170, "batterybuffer.04.tier.00", "Ultra Low Voltage Battery Buffer", 0, "", 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_LV.set(new GT_MetaTileEntity_BasicBatteryBuffer(171, "batterybuffer.04.tier.01", "Low Voltage Battery Buffer", 1, "", 4).getStackForm(1L)); @@ -444,16 +442,16 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Battery_Buffer_2by2_UV.set(new GT_MetaTileEntity_BasicBatteryBuffer(178, "batterybuffer.04.tier.08", "Ultimate Voltage Battery Buffer", 8, "", 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_MAX.set(new GT_MetaTileEntity_BasicBatteryBuffer(179, "batterybuffer.04.tier.09", "Highly Ultimate Voltage Battery Buffer", 9, "", 4).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_ULV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt04.get(Materials.Lead), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_LV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt04.get(Materials.Tin), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_MV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt04.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_HV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt04.get(Materials.Gold), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_EV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt04.get(Materials.Aluminium), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_IV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt04.get(Materials.Tungsten), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_LuV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_ZPM.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt04.get(Materials.Naquadah), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_UV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_MAX.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_ULV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt04.get(Materials.Lead), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_LV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt04.get(Materials.Tin), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_MV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt04.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_HV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt04.get(Materials.Gold), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_EV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt04.get(Materials.Aluminium), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_IV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt04.get(Materials.Tungsten), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_LuV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_ZPM.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt04.get(Materials.Naquadah), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_UV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_2by2_MAX.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest}); ItemList.Battery_Buffer_3by3_ULV.set(new GT_MetaTileEntity_BasicBatteryBuffer(180, "batterybuffer.09.tier.00", "Ultra Low Voltage Battery Buffer", 0, "", 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_LV.set(new GT_MetaTileEntity_BasicBatteryBuffer(181, "batterybuffer.09.tier.01", "Low Voltage Battery Buffer", 1, "", 9).getStackForm(1L)); @@ -466,16 +464,16 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Battery_Buffer_3by3_UV.set(new GT_MetaTileEntity_BasicBatteryBuffer(188, "batterybuffer.09.tier.08", "Ultimate Voltage Battery Buffer", 8, "", 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_MAX.set(new GT_MetaTileEntity_BasicBatteryBuffer(189, "batterybuffer.09.tier.09", "Highly Ultimate Voltage Battery Buffer", 9, "", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_ULV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt08.get(Materials.Lead), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_LV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt08.get(Materials.Tin), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_MV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt08.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_HV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt08.get(Materials.Gold), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_EV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt08.get(Materials.Aluminium), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_IV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt08.get(Materials.Tungsten), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_LuV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt08.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_ZPM.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt08.get(Materials.Naquadah), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_UV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt08.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_MAX.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_ULV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt08.get(Materials.Lead), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_LV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt08.get(Materials.Tin), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_MV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt08.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_HV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt08.get(Materials.Gold), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_EV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt08.get(Materials.Aluminium), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_IV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt08.get(Materials.Tungsten), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_LuV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt08.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_ZPM.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt08.get(Materials.Naquadah), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_UV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt08.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_3by3_MAX.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest}); ItemList.Battery_Buffer_4by4_ULV.set(new GT_MetaTileEntity_BasicBatteryBuffer(190, "batterybuffer.16.tier.00", "Ultra Low Voltage Battery Buffer", 0, "", 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_LV.set(new GT_MetaTileEntity_BasicBatteryBuffer(191, "batterybuffer.16.tier.01", "Low Voltage Battery Buffer", 1, "", 16).getStackForm(1L)); @@ -488,16 +486,16 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Battery_Buffer_4by4_UV.set(new GT_MetaTileEntity_BasicBatteryBuffer(198, "batterybuffer.16.tier.08", "Ultimate Voltage Battery Buffer", 8, "", 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_MAX.set(new GT_MetaTileEntity_BasicBatteryBuffer(199, "batterybuffer.16.tier.09", "Highly Ultimate Voltage Battery Buffer", 9, "", 16).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_ULV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt16.get(Materials.Lead), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_LV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt16.get(Materials.Tin), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_MV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt16.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_HV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt16.get(Materials.Gold), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_EV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt16.get(Materials.Aluminium), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_IV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt16.get(Materials.Tungsten), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_LuV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt16.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_ZPM.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt16.get(Materials.Naquadah), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_UV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_MAX.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_ULV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt16.get(Materials.Lead), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_LV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt16.get(Materials.Tin), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_MV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt16.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_HV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt16.get(Materials.Gold), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_EV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt16.get(Materials.Aluminium), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_IV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt16.get(Materials.Tungsten), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_LuV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt16.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_ZPM.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt16.get(Materials.Naquadah), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_UV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Buffer_4by4_MAX.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest}); ItemList.Battery_Charger_4by4_ULV.set(new GT_MetaTileEntity_Charger(690, "batterycharger.16.tier.00", "Ultra Low Voltage Battery Charger", 0, "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_LV.set(new GT_MetaTileEntity_Charger(691, "batterycharger.16.tier.01", "Low Voltage Battery Charger", 1, "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); @@ -510,27 +508,27 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Battery_Charger_4by4_UV.set(new GT_MetaTileEntity_Charger(698, "batterycharger.16.tier.08", "Ultimate Voltage Battery Charger", 8, "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_MAX.set(new GT_MetaTileEntity_Charger(699, "batterycharger.16.tier.09", "Highly Ultimate Voltage Battery Charger", 9, "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_ULV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt16.get(Materials.Lead), 'T', OreDictNames.craftingChest, 'B', ItemList.Battery_RE_ULV_Tantalum, 'C', OrePrefixes.circuit.get(Materials.Primitive)}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_LV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt16.get(Materials.Tin), 'T', OreDictNames.craftingChest, 'B', ItemList.Battery_RE_LV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_MV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt16.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest, 'B', ItemList.Battery_RE_MV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Good)}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_HV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt16.get(Materials.Gold), 'T', OreDictNames.craftingChest, 'B', ItemList.Battery_RE_HV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_EV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt16.get(Materials.Aluminium), 'T', OreDictNames.craftingChest, 'B', OrePrefixes.battery.get(Materials.Master), 'C', OrePrefixes.circuit.get(Materials.Data)}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_IV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt16.get(Materials.Tungsten), 'T', OreDictNames.craftingChest, 'B', ItemList.Energy_LapotronicOrb, 'C', OrePrefixes.circuit.get(Materials.Elite)}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_LuV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt16.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest, 'B', ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.Master)}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_ZPM.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt16.get(Materials.Naquadah), 'T', OreDictNames.craftingChest, 'B', ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.Ultimate)}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_UV.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest, 'B', ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV)}); - GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_MAX.get(1L, new Object[0]), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest, 'B', ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.Infinite)}); - - GT_ModHandler.addCraftingRecipe(ItemList.Locker_ULV.get(1L, new Object[0]), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_ULV, 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_LV.get(1L, new Object[0]), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_LV, 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_MV.get(1L, new Object[0]), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_MV, 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_HV.get(1L, new Object[0]), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_HV, 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_EV.get(1L, new Object[0]), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_EV, 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_IV.get(1L, new Object[0]), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_IV, 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_LuV.get(1L, new Object[0]), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_LuV, 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_ZPM.get(1L, new Object[0]), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_ZPM, 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_UV.get(1L, new Object[0]), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_UV, 'T', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Locker_MAX.get(1L, new Object[0]), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_MAX, 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_ULV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt16.get(Materials.Lead), 'T', OreDictNames.craftingChest, 'B', ItemList.Battery_RE_ULV_Tantalum, 'C', OrePrefixes.circuit.get(Materials.Primitive)}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_LV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt16.get(Materials.Tin), 'T', OreDictNames.craftingChest, 'B', ItemList.Battery_RE_LV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_MV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt16.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest, 'B', ItemList.Battery_RE_MV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Good)}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_HV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt16.get(Materials.Gold), 'T', OreDictNames.craftingChest, 'B', ItemList.Battery_RE_HV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_EV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt16.get(Materials.Aluminium), 'T', OreDictNames.craftingChest, 'B', OrePrefixes.battery.get(Materials.Master), 'C', OrePrefixes.circuit.get(Materials.Data)}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_IV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt16.get(Materials.Tungsten), 'T', OreDictNames.craftingChest, 'B', ItemList.Energy_LapotronicOrb, 'C', OrePrefixes.circuit.get(Materials.Elite)}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_LuV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt16.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest, 'B', ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.Master)}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_ZPM.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt16.get(Materials.Naquadah), 'T', OreDictNames.craftingChest, 'B', ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.Ultimate)}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_UV.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest, 'B', ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV)}); + GT_ModHandler.addCraftingRecipe(ItemList.Battery_Charger_4by4_MAX.get(1L), bitsd, new Object[]{aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest, 'B', ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.Infinite)}); + + GT_ModHandler.addCraftingRecipe(ItemList.Locker_ULV.get(1L), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_ULV, 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Locker_LV.get(1L), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_LV, 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Locker_MV.get(1L), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_MV, 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Locker_HV.get(1L), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_HV, 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Locker_EV.get(1L), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_EV, 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Locker_IV.get(1L), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_IV, 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Locker_LuV.get(1L), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_LuV, 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Locker_ZPM.get(1L), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_ZPM, 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Locker_UV.get(1L), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_UV, 'T', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Locker_MAX.get(1L), bitsd, new Object[]{"T", "M", 'M', ItemList.Battery_Buffer_2by2_MAX, 'T', OreDictNames.craftingChest}); } private static void run2() { @@ -669,14 +667,14 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI //ItemList.Machine_ZPM_Scanner.set(new GT_MetaTileEntity_Scanner(347, "basicmachine.scanner.tier.07", "Advanced Scanner VI", 7).getStackForm(1L)); //ItemList.Machine_UV_Scanner.set(new GT_MetaTileEntity_Scanner(348, "basicmachine.scanner.tier.08", "Advanced Scanner VII", 8).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Scanner.get(1L, new Object[0]), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_LV, 'T', ItemList.Emitter_LV, 'R', ItemList.Sensor_LV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.Tin)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Scanner.get(1L, new Object[0]), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_MV, 'T', ItemList.Emitter_MV, 'R', ItemList.Sensor_MV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Scanner.get(1L, new Object[0]), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_HV, 'T', ItemList.Emitter_HV, 'R', ItemList.Sensor_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Scanner.get(1L, new Object[0]), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_EV, 'T', ItemList.Emitter_EV, 'R', ItemList.Sensor_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Scanner.get(1L, new Object[0]), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_IV, 'T', ItemList.Emitter_IV, 'R', ItemList.Sensor_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Scanner.get(1L, new Object[0]), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_LuV, 'T', ItemList.Emitter_LuV, 'R', ItemList.Sensor_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Scanner.get(1L, new Object[0]), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_ZPM, 'T', ItemList.Emitter_ZPM, 'R', ItemList.Sensor_ZPM, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Scanner.get(1L, new Object[0]), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_UV, 'T', ItemList.Emitter_UV, 'R', ItemList.Sensor_UV, 'C', OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Scanner.get(1L), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_LV, 'T', ItemList.Emitter_LV, 'R', ItemList.Sensor_LV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Scanner.get(1L), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_MV, 'T', ItemList.Emitter_MV, 'R', ItemList.Sensor_MV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Scanner.get(1L), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_HV, 'T', ItemList.Emitter_HV, 'R', ItemList.Sensor_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Scanner.get(1L), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_EV, 'T', ItemList.Emitter_EV, 'R', ItemList.Sensor_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Scanner.get(1L), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_IV, 'T', ItemList.Emitter_IV, 'R', ItemList.Sensor_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Scanner.get(1L), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_LuV, 'T', ItemList.Emitter_LuV, 'R', ItemList.Sensor_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Scanner.get(1L), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_ZPM, 'T', ItemList.Emitter_ZPM, 'R', ItemList.Sensor_ZPM, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Scanner.get(1L), bitsd, new Object[]{"CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_UV, 'T', ItemList.Emitter_UV, 'R', ItemList.Sensor_UV, 'C', OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy)}); ItemList.Machine_LV_Wiremill.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(351, "basicmachine.wiremill.tier.01", "Basic Wiremill", 1, "Produces Wires more efficiently", GT_Recipe.GT_Recipe_Map.sWiremillRecipes, 1, 1, 0, 0, 1, "Wiremill.png", (String) GregTech_API.sSoundList.get(Integer.valueOf(204)), aBoolConst_0, aBoolConst_0, 0, "WIREMILL", new Object[]{aTextMotorWire, aTextCableHull, aTextMotorWire, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE}).getStackForm(1L)); ItemList.Machine_MV_Wiremill.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(352, "basicmachine.wiremill.tier.02", "Advanced Wiremill", 2, "Produces Wires more efficiently", GT_Recipe.GT_Recipe_Map.sWiremillRecipes, 1, 1, 0, 0, 1, "Wiremill.png", (String) GregTech_API.sSoundList.get(Integer.valueOf(204)), aBoolConst_0, aBoolConst_0, 0, "WIREMILL", new Object[]{aTextMotorWire, aTextCableHull, aTextMotorWire, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE}).getStackForm(1L)); @@ -732,14 +730,14 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI //ItemList.Machine_ZPM_Boxinator.set(new GT_MetaTileEntity_Boxinator(407, "basicmachine.boxinator.tier.07", "Boxinator", 7).getStackForm(1L)); //ItemList.Machine_UV_Boxinator.set(new GT_MetaTileEntity_Boxinator(408, "basicmachine.boxinator.tier.08", "Boxinator", 8).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Boxinator.get(1L, new Object[0]), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_LV, 'R', ItemList.Robot_Arm_LV, 'V', ItemList.Conveyor_Module_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'B', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Boxinator.get(1L, new Object[0]), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_MV, 'R', ItemList.Robot_Arm_MV, 'V', ItemList.Conveyor_Module_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'B', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Boxinator.get(1L, new Object[0]), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_HV, 'R', ItemList.Robot_Arm_HV, 'V', ItemList.Conveyor_Module_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'B', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Boxinator.get(1L, new Object[0]), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_EV, 'R', ItemList.Robot_Arm_EV, 'V', ItemList.Conveyor_Module_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium), 'B', OreDictNames.craftingChest}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Boxinator.get(1L, new Object[0]), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_IV, 'R', ItemList.Robot_Arm_IV, 'V', ItemList.Conveyor_Module_IV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), 'B', OreDictNames.craftingChest}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Boxinator.get(1L, new Object[0]), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_LuV, 'R', ItemList.Robot_Arm_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'B', OreDictNames.craftingChest}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Boxinator.get(1L, new Object[0]), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_ZPM, 'R', ItemList.Robot_Arm_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah), 'B', OreDictNames.craftingChest}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Boxinator.get(1L, new Object[0]), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_UV, 'R', ItemList.Robot_Arm_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), 'B', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Boxinator.get(1L), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_LV, 'R', ItemList.Robot_Arm_LV, 'V', ItemList.Conveyor_Module_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'B', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Boxinator.get(1L), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_MV, 'R', ItemList.Robot_Arm_MV, 'V', ItemList.Conveyor_Module_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'B', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Boxinator.get(1L), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_HV, 'R', ItemList.Robot_Arm_HV, 'V', ItemList.Conveyor_Module_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'B', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Boxinator.get(1L), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_EV, 'R', ItemList.Robot_Arm_EV, 'V', ItemList.Conveyor_Module_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium), 'B', OreDictNames.craftingChest}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Boxinator.get(1L), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_IV, 'R', ItemList.Robot_Arm_IV, 'V', ItemList.Conveyor_Module_IV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), 'B', OreDictNames.craftingChest}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Boxinator.get(1L), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_LuV, 'R', ItemList.Robot_Arm_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'B', OreDictNames.craftingChest}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Boxinator.get(1L), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_ZPM, 'R', ItemList.Robot_Arm_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah), 'B', OreDictNames.craftingChest}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Boxinator.get(1L), bitsd, new Object[]{"BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_UV, 'R', ItemList.Robot_Arm_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), 'B', OreDictNames.craftingChest}); ItemList.Machine_LV_Unboxinator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(411, "basicmachine.unboxinator.tier.01", "Basic Unpackager", 1, "Grabs things out of Boxes", GT_Recipe.GT_Recipe_Map.sUnboxinatorRecipes, 1, 2, 0, 0, 1, "Unpackager.png", "", aBoolConst_0, aBoolConst_0, 0, "UNBOXINATOR", new Object[]{"BCB", "VMR", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest}).getStackForm(1L)); ItemList.Machine_MV_Unboxinator.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(412, "basicmachine.unboxinator.tier.02", "Advanced Unpackager", 2, "Grabs things out of Boxes", GT_Recipe.GT_Recipe_Map.sUnboxinatorRecipes, 1, 2, 0, 0, 1, "Unpackager.png", "", aBoolConst_0, aBoolConst_0, 0, "UNBOXINATOR", new Object[]{"BCB", "VMR", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'B', OreDictNames.craftingChest}).getStackForm(1L)); @@ -777,14 +775,14 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI //ItemList.Machine_ZPM_RockBreaker.set(new GT_MetaTileEntity_RockBreaker(447, "basicmachine.rockbreaker.tier.07", "Cryogenic Magma Solidifier R-8200", 7).getStackForm(1L)); //ItemList.Machine_UV_RockBreaker.set(new GT_MetaTileEntity_RockBreaker(448, "basicmachine.rockbreaker.tier.08", "Cryogenic Magma Solidifier R-8200", 8).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_RockBreaker.get(1L, new Object[0]), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_LV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_LV, 'P', ItemList.Electric_Piston_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'G', new ItemStack(Blocks.glass, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_RockBreaker.get(1L, new Object[0]), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_MV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_MV, 'P', ItemList.Electric_Piston_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', new ItemStack(Blocks.glass, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_RockBreaker.get(1L, new Object[0]), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_HV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_HV, 'P', ItemList.Electric_Piston_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', new ItemStack(Blocks.glass, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_RockBreaker.get(1L, new Object[0]), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_EV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_EV, 'P', ItemList.Electric_Piston_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', new ItemStack(Blocks.glass, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_RockBreaker.get(1L, new Object[0]), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_IV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_IV, 'P', ItemList.Electric_Piston_IV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', new ItemStack(Blocks.glass, 1)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_RockBreaker.get(1L, new Object[0]), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_LuV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_LuV, 'P', ItemList.Electric_Piston_LuV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'G', Ic2Items.reinforcedGlass}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_RockBreaker.get(1L, new Object[0]), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_ZPM, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_ZPM, 'P', ItemList.Electric_Piston_ZPM, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah), 'G', Ic2Items.reinforcedGlass}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_RockBreaker.get(1L, new Object[0]), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_UV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_UV, 'P', ItemList.Electric_Piston_UV, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), 'G', Ic2Items.reinforcedGlass}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_RockBreaker.get(1L), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_LV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_LV, 'P', ItemList.Electric_Piston_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'G', new ItemStack(Blocks.glass, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_RockBreaker.get(1L), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_MV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_MV, 'P', ItemList.Electric_Piston_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', new ItemStack(Blocks.glass, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_RockBreaker.get(1L), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_HV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_HV, 'P', ItemList.Electric_Piston_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', new ItemStack(Blocks.glass, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_RockBreaker.get(1L), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_EV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_EV, 'P', ItemList.Electric_Piston_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', new ItemStack(Blocks.glass, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_RockBreaker.get(1L), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_IV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_IV, 'P', ItemList.Electric_Piston_IV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', new ItemStack(Blocks.glass, 1)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_RockBreaker.get(1L), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_LuV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_LuV, 'P', ItemList.Electric_Piston_LuV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'G', Ic2Items.reinforcedGlass}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_RockBreaker.get(1L), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_ZPM, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_ZPM, 'P', ItemList.Electric_Piston_ZPM, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah), 'G', Ic2Items.reinforcedGlass}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_RockBreaker.get(1L), bitsd, new Object[]{"PED", aTextWireHull, "GGG", 'M', ItemList.Hull_UV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_UV, 'P', ItemList.Electric_Piston_UV, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), 'G', Ic2Items.reinforcedGlass}); ItemList.Machine_LV_Disassembler.set(new GT_MetaTileEntity_Disassembler(451, "basicmachine.disassembler.tier.01", "Basic Disassembler", 1).getStackForm(1L)); ItemList.Machine_MV_Disassembler.set(new GT_MetaTileEntity_Disassembler(452, "basicmachine.disassembler.tier.02", "Advanced Disassembler", 2).getStackForm(1L)); @@ -795,14 +793,14 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI //ItemList.Machine_ZPM_Disassembler.set(new GT_MetaTileEntity_Disassembler(457, "basicmachine.disassembler.tier.07", "Advanced Disassembler VI", 7).getStackForm(1L)); //ItemList.Machine_UV_Disassembler.set(new GT_MetaTileEntity_Disassembler(458, "basicmachine.disassembler.tier.08", "Advanced Disassembler VII", 8).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Disassembler.get(1L, new Object[0]), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_LV, 'A', ItemList.Robot_Arm_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Disassembler.get(1L, new Object[0]), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_MV, 'A', ItemList.Robot_Arm_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Disassembler.get(1L, new Object[0]), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_HV, 'A', ItemList.Robot_Arm_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Disassembler.get(1L, new Object[0]), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_EV, 'A', ItemList.Robot_Arm_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Disassembler.get(1L, new Object[0]), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_IV, 'A', ItemList.Robot_Arm_IV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Disassembler.get(1L, new Object[0]), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_LuV, 'A', ItemList.Robot_Arm_LuV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Disassembler.get(1L, new Object[0]), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_ZPM, 'A', ItemList.Robot_Arm_ZPM, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Disassembler.get(1L, new Object[0]), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_UV, 'A', ItemList.Robot_Arm_UV, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Disassembler.get(1L), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_LV, 'A', ItemList.Robot_Arm_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Disassembler.get(1L), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_MV, 'A', ItemList.Robot_Arm_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Disassembler.get(1L), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_HV, 'A', ItemList.Robot_Arm_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Disassembler.get(1L), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_EV, 'A', ItemList.Robot_Arm_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Disassembler.get(1L), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_IV, 'A', ItemList.Robot_Arm_IV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Disassembler.get(1L), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_LuV, 'A', ItemList.Robot_Arm_LuV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Disassembler.get(1L), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_ZPM, 'A', ItemList.Robot_Arm_ZPM, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Disassembler.get(1L), bitsd, new Object[]{"ACA", aTextWireHull, "ACA", 'M', ItemList.Hull_UV, 'A', ItemList.Robot_Arm_UV, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy)}); ItemList.Machine_LV_Massfab.set(new GT_MetaTileEntity_Massfabricator(461, "basicmachine.massfab.tier.01", "Basic Mass Fabricator", 1).getStackForm(1L)); ItemList.Machine_MV_Massfab.set(new GT_MetaTileEntity_Massfabricator(462, "basicmachine.massfab.tier.02", "Advanced Mass Fabricator", 2).getStackForm(1L)); @@ -813,14 +811,14 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI //ItemList.Machine_ZPM_Massfab.set(new GT_MetaTileEntity_Massfabricator(467, "basicmachine.massfab.tier.07", "Advanced Mass Fabricator VI", 7).getStackForm(1L)); //ItemList.Machine_UV_Massfab.set(new GT_MetaTileEntity_Massfabricator(468, "basicmachine.massfab.tier.08", "Advanced Mass Fabricator VII", 8).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Massfab.get(1L, new Object[0]), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_LV, 'F', ItemList.Field_Generator_LV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt04.get(Materials.Tin)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Massfab.get(1L, new Object[0]), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_MV, 'F', ItemList.Field_Generator_MV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt04.get(Materials.AnyCopper)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Massfab.get(1L, new Object[0]), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_HV, 'F', ItemList.Field_Generator_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt04.get(Materials.Gold)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Massfab.get(1L, new Object[0]), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_EV, 'F', ItemList.Field_Generator_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt04.get(Materials.Aluminium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Massfab.get(1L, new Object[0]), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_IV, 'F', ItemList.Field_Generator_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Massfab.get(1L, new Object[0]), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt04.get(Materials.VanadiumGallium)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Massfab.get(1L, new Object[0]), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_ZPM, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt04.get(Materials.Naquadah)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Massfab.get(1L, new Object[0]), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_UV, 'C', OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Massfab.get(1L), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_LV, 'F', ItemList.Field_Generator_LV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt04.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Massfab.get(1L), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_MV, 'F', ItemList.Field_Generator_MV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt04.get(Materials.AnyCopper)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Massfab.get(1L), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_HV, 'F', ItemList.Field_Generator_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt04.get(Materials.Gold)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Massfab.get(1L), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_EV, 'F', ItemList.Field_Generator_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt04.get(Materials.Aluminium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Massfab.get(1L), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_IV, 'F', ItemList.Field_Generator_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Massfab.get(1L), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt04.get(Materials.VanadiumGallium)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Massfab.get(1L), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_ZPM, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt04.get(Materials.Naquadah)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Massfab.get(1L), bitsd, new Object[]{"CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_UV, 'C', OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy)}); ItemList.Machine_LV_Amplifab.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(471, "basicmachine.amplifab.tier.01", "Basic Amplifabricator", 1, "Extracting UU Amplifier", GT_Recipe.GT_Recipe_Map.sAmplifiers, 1, 1, 1000, 0, 1, "Amplifabricator.png", (String) GregTech_API.sSoundList.get(Integer.valueOf(200)), aBoolConst_0, aBoolConst_0, 0, "AMPLIFAB", new Object[]{aTextWirePump, aTextPlateMotor, "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4}).getStackForm(1L)); ItemList.Machine_MV_Amplifab.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(472, "basicmachine.amplifab.tier.02", "Advanced Amplifabricator", 2, "Extracting UU Amplifier", GT_Recipe.GT_Recipe_Map.sAmplifiers, 1, 1, 1000, 0, 1, "Amplifabricator.png", (String) GregTech_API.sSoundList.get(Integer.valueOf(200)), aBoolConst_0, aBoolConst_0, 0, "AMPLIFAB", new Object[]{aTextWirePump, aTextPlateMotor, "CPC", 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE4}).getStackForm(1L)); @@ -840,14 +838,14 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI //ItemList.Machine_ZPM_Replicator.set(new GT_MetaTileEntity_Replicator(487, "basicmachine.replicator.tier.07", "Advanced Replicator VI", 7).getStackForm(1L)); //ItemList.Machine_UV_Replicator.set(new GT_MetaTileEntity_Replicator(488, "basicmachine.replicator.tier.08", "Advanced Replicator VII", 8).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Replicator.get(1L, new Object[0]), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_LV, 'F', ItemList.Field_Generator_LV, 'E', ItemList.Emitter_LV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt04.get(Materials.Tin)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Replicator.get(1L, new Object[0]), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_MV, 'F', ItemList.Field_Generator_MV, 'E', ItemList.Emitter_MV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt04.get(Materials.AnyCopper)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Replicator.get(1L, new Object[0]), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_HV, 'F', ItemList.Field_Generator_HV, 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt04.get(Materials.Gold)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Replicator.get(1L, new Object[0]), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_EV, 'F', ItemList.Field_Generator_EV, 'E', ItemList.Emitter_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt04.get(Materials.Aluminium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Replicator.get(1L, new Object[0]), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_IV, 'F', ItemList.Field_Generator_IV, 'E', ItemList.Emitter_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Replicator.get(1L, new Object[0]), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_LuV, 'E', ItemList.Emitter_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt04.get(Materials.VanadiumGallium)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Replicator.get(1L, new Object[0]), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_ZPM, 'E', ItemList.Emitter_ZPM, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt04.get(Materials.Naquadah)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Replicator.get(1L, new Object[0]), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_UV, 'E', ItemList.Emitter_UV, 'C', OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Replicator.get(1L), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_LV, 'F', ItemList.Field_Generator_LV, 'E', ItemList.Emitter_LV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt04.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Replicator.get(1L), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_MV, 'F', ItemList.Field_Generator_MV, 'E', ItemList.Emitter_MV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt04.get(Materials.AnyCopper)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Replicator.get(1L), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_HV, 'F', ItemList.Field_Generator_HV, 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt04.get(Materials.Gold)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Replicator.get(1L), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_EV, 'F', ItemList.Field_Generator_EV, 'E', ItemList.Emitter_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt04.get(Materials.Aluminium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Replicator.get(1L), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_IV, 'F', ItemList.Field_Generator_IV, 'E', ItemList.Emitter_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Replicator.get(1L), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_LuV, 'E', ItemList.Emitter_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt04.get(Materials.VanadiumGallium)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Replicator.get(1L), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_ZPM, 'E', ItemList.Emitter_ZPM, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt04.get(Materials.Naquadah)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Replicator.get(1L), bitsd, new Object[]{"EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_UV, 'E', ItemList.Emitter_UV, 'C', OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt04.get(Materials.NaquadahAlloy)}); ItemList.Machine_LV_Brewery.set(new GT_MetaTileEntity_PotionBrewer(491, "basicmachine.brewery.tier.01", "Basic Brewery", 1).getStackForm(1L)); ItemList.Machine_MV_Brewery.set(new GT_MetaTileEntity_PotionBrewer(492, "basicmachine.brewery.tier.02", "Advanced Brewery", 2).getStackForm(1L)); @@ -858,14 +856,14 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI //ItemList.Machine_ZPM_Brewery.set(new GT_MetaTileEntity_PotionBrewer(497, "basicmachine.brewery.tier.07", "Advanced Brewery VI", 7).getStackForm(1L)); //ItemList.Machine_UV_Brewery.set(new GT_MetaTileEntity_PotionBrewer(498, "basicmachine.brewery.tier.08", "Advanced Brewery VII", 8).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Brewery.get(1L, new Object[0]), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Pump_LV, 'B', new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'G', new ItemStack(Blocks.glass, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Brewery.get(1L, new Object[0]), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Pump_MV, 'B', new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', new ItemStack(Blocks.glass, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Brewery.get(1L, new Object[0]), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Pump_HV, 'B', new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', new ItemStack(Blocks.glass, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Brewery.get(1L, new Object[0]), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Pump_EV, 'B', new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', new ItemStack(Blocks.glass, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Brewery.get(1L, new Object[0]), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Pump_IV, 'B', new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', new ItemStack(Blocks.glass, 1)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Brewery.get(1L, new Object[0]), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_LuV, 'P', ItemList.Electric_Pump_LuV, 'B', new ItemStack(Items.brewing_stand, 0, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'G', Ic2Items.reinforcedGlass}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Brewery.get(1L, new Object[0]), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_ZPM, 'P', ItemList.Electric_Pump_ZPM, 'B', new ItemStack(Items.brewing_stand, 0, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah), 'G', Ic2Items.reinforcedGlass}); - //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Brewery.get(1L, new Object[0]), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_UV, 'P', ItemList.Electric_Pump_UV, 'B', new ItemStack(Items.brewing_stand, 0, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), 'G', Ic2Items.reinforcedGlass}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_LV_Brewery.get(1L), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Pump_LV, 'B', new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'G', new ItemStack(Blocks.glass, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_MV_Brewery.get(1L), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Pump_MV, 'B', new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', new ItemStack(Blocks.glass, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_Brewery.get(1L), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Pump_HV, 'B', new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', new ItemStack(Blocks.glass, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_Brewery.get(1L), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Pump_EV, 'B', new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', new ItemStack(Blocks.glass, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_Brewery.get(1L), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Pump_IV, 'B', new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', new ItemStack(Blocks.glass, 1)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_LuV_Brewery.get(1L), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_LuV, 'P', ItemList.Electric_Pump_LuV, 'B', new ItemStack(Items.brewing_stand, 0, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'G', Ic2Items.reinforcedGlass}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_ZPM_Brewery.get(1L), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_ZPM, 'P', ItemList.Electric_Pump_ZPM, 'B', new ItemStack(Items.brewing_stand, 0, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah), 'G', Ic2Items.reinforcedGlass}); + //GT_ModHandler.addCraftingRecipe(ItemList.Machine_UV_Brewery.get(1L), bitsd, new Object[]{"GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_UV, 'P', ItemList.Electric_Pump_UV, 'B', new ItemStack(Items.brewing_stand, 0, 'C', OrePrefixes.circuit.get(Materials.Superconductor), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), 'G', Ic2Items.reinforcedGlass}); ItemList.Machine_LV_Fermenter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(501, "basicmachine.fermenter.tier.01", "Basic Fermenter", 1, "Fermenting Fluids", GT_Recipe.GT_Recipe_Map.sFermentingRecipes, 1, 1, 1000, 0, 1, "Fermenter.png", "", aBoolConst_0, aBoolConst_0, 0, "FERMENTER", new Object[]{aTextWirePump, "GMG", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); ItemList.Machine_MV_Fermenter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(502, "basicmachine.fermenter.tier.02", "Advanced Fermenter", 2, "Fermenting Fluids", GT_Recipe.GT_Recipe_Map.sFermentingRecipes, 1, 1, 1000, 0, 1, "Fermenter.png", "", aBoolConst_0, aBoolConst_0, 0, "FERMENTER", new Object[]{aTextWirePump, "GMG", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'P', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); @@ -1044,44 +1042,44 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Machine_Multi_VacuumFreezer.set(new GT_MetaTileEntity_VacuumFreezer(1002, "multimachine.vacuumfreezer", "Vacuum Freezer").getStackForm(1L)); ItemList.Machine_Multi_Furnace.set(new GT_MetaTileEntity_MultiFurnace(1003, "multimachine.multifurnace", "Multi Smelter").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_BlastFurnace.get(1L, new Object[0]), bitsd, new Object[]{"FFF", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_HeatProof, 'F', OreDictNames.craftingIronFurnace, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_VacuumFreezer.get(1L, new Object[0]), bitsd, new Object[]{aTextPlate, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_FrostProof, 'P', ItemList.Electric_Pump_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_ImplosionCompressor.get(1L, new Object[0]), bitsd, new Object[]{"OOO", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_SolidSteel, 'O', Ic2Items.reinforcedStone, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_Furnace.get(1L, new Object[0]), bitsd, new Object[]{"FFF", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_HeatProof, 'F', OreDictNames.craftingIronFurnace, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.AnnealedCopper)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_BlastFurnace.get(1L), bitsd, new Object[]{"FFF", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_HeatProof, 'F', OreDictNames.craftingIronFurnace, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_VacuumFreezer.get(1L), bitsd, new Object[]{aTextPlate, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_FrostProof, 'P', ItemList.Electric_Pump_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_ImplosionCompressor.get(1L), bitsd, new Object[]{"OOO", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_SolidSteel, 'O', Ic2Items.reinforcedStone, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_Furnace.get(1L), bitsd, new Object[]{"FFF", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_HeatProof, 'F', OreDictNames.craftingIronFurnace, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.AnnealedCopper)}); ItemList.Machine_Multi_LargeBoiler_Bronze.set(new GT_MetaTileEntity_LargeBoiler_Bronze(1020, "multimachine.boiler.bronze", "Large Bronze Boiler").getStackForm(1L)); ItemList.Machine_Multi_LargeBoiler_Steel.set(new GT_MetaTileEntity_LargeBoiler_Steel(1021, "multimachine.boiler.steel", "Large Steel Boiler").getStackForm(1L)); ItemList.Machine_Multi_LargeBoiler_Titanium.set(new GT_MetaTileEntity_LargeBoiler_Titanium(1022, "multimachine.boiler.titanium", "Large Titanium Boiler").getStackForm(1L)); ItemList.Machine_Multi_LargeBoiler_TungstenSteel.set(new GT_MetaTileEntity_LargeBoiler_TungstenSteel(1023, "multimachine.boiler.tungstensteel", "Large Tungstensteel Boiler").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeBoiler_Bronze.get(1L, new Object[0]), bitsd, new Object[]{aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Bronze, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.Tin)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeBoiler_Steel.get(1L, new Object[0]), bitsd, new Object[]{aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Steel, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeBoiler_Titanium.get(1L, new Object[0]), bitsd, new Object[]{aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Titanium, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeBoiler_TungstenSteel.get(1L, new Object[0]), bitsd, new Object[]{aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_TungstenSteel, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeBoiler_Bronze.get(1L), bitsd, new Object[]{aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Bronze, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeBoiler_Steel.get(1L), bitsd, new Object[]{aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Steel, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeBoiler_Titanium.get(1L), bitsd, new Object[]{aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Titanium, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeBoiler_TungstenSteel.get(1L), bitsd, new Object[]{aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_TungstenSteel, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium)}); ItemList.Generator_Diesel_LV.set(new GT_MetaTileEntity_DieselGenerator(1110, "basicgenerator.diesel.tier.01", "Basic Combustion Generator", 1).getStackForm(1L)); ItemList.Generator_Diesel_MV.set(new GT_MetaTileEntity_DieselGenerator(1111, "basicgenerator.diesel.tier.02", "Advanced Combustion Generator", 2).getStackForm(1L)); ItemList.Generator_Diesel_HV.set(new GT_MetaTileEntity_DieselGenerator(1112, "basicgenerator.diesel.tier.03", "Turbo Combustion Generator", 3).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Diesel_LV.get(1L, new Object[0]), bitsd, new Object[]{"PCP", "EME", "GWG", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Piston_LV, 'E', ItemList.Electric_Motor_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'G', OrePrefixes.gearGt.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Diesel_MV.get(1L, new Object[0]), bitsd, new Object[]{"PCP", "EME", "GWG", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Piston_MV, 'E', ItemList.Electric_Motor_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', OrePrefixes.gearGt.get(Materials.Aluminium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Diesel_HV.get(1L, new Object[0]), bitsd, new Object[]{"PCP", "EME", "GWG", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Piston_HV, 'E', ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', OrePrefixes.gearGt.get(Materials.StainlessSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Diesel_LV.get(1L), bitsd, new Object[]{"PCP", "EME", "GWG", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Piston_LV, 'E', ItemList.Electric_Motor_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'G', OrePrefixes.gearGt.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Diesel_MV.get(1L), bitsd, new Object[]{"PCP", "EME", "GWG", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Piston_MV, 'E', ItemList.Electric_Motor_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', OrePrefixes.gearGt.get(Materials.Aluminium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Diesel_HV.get(1L), bitsd, new Object[]{"PCP", "EME", "GWG", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Piston_HV, 'E', ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', OrePrefixes.gearGt.get(Materials.StainlessSteel)}); ItemList.Generator_Gas_Turbine_LV.set(new GT_MetaTileEntity_GasTurbine(1115, "basicgenerator.gasturbine.tier.01", "Basic Gas Turbine", 1).getStackForm(1L)); ItemList.Generator_Gas_Turbine_MV.set(new GT_MetaTileEntity_GasTurbine(1116, "basicgenerator.gasturbine.tier.02", "Advanced Gas Turbine", 2).getStackForm(1L)); ItemList.Generator_Gas_Turbine_HV.set(new GT_MetaTileEntity_GasTurbine(1117, "basicgenerator.gasturbine.tier.03", "Turbo Gas Turbine", 3).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_LV.get(1L, new Object[0]), bitsd, new Object[]{"CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin)}); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_MV.get(1L, new Object[0]), bitsd, new Object[]{"CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, 'R', OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper)}); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_HV.get(1L, new Object[0]), bitsd, new Object[]{"CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'R', OrePrefixes.rotor.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_LV.get(1L), bitsd, new Object[]{"CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_MV.get(1L), bitsd, new Object[]{"CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, 'R', OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Gas_Turbine_HV.get(1L), bitsd, new Object[]{"CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'R', OrePrefixes.rotor.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold)}); ItemList.Generator_Steam_Turbine_LV.set(new GT_MetaTileEntity_SteamTurbine(1120, "basicgenerator.steamturbine.tier.01", "Basic Steam Turbine", 1).getStackForm(1L)); ItemList.Generator_Steam_Turbine_MV.set(new GT_MetaTileEntity_SteamTurbine(1121, "basicgenerator.steamturbine.tier.02", "Advanced Steam Turbine", 2).getStackForm(1L)); ItemList.Generator_Steam_Turbine_HV.set(new GT_MetaTileEntity_SteamTurbine(1122, "basicgenerator.steamturbine.tier.03", "Turbo Steam Turbine", 3).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Steam_Turbine_LV.get(1L, new Object[0]), bitsd, new Object[]{"PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'P', OrePrefixes.pipeMedium.get(Materials.Bronze)}); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Steam_Turbine_MV.get(1L, new Object[0]), bitsd, new Object[]{"PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, 'R', OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'P', OrePrefixes.pipeMedium.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Steam_Turbine_HV.get(1L, new Object[0]), bitsd, new Object[]{"PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'R', OrePrefixes.rotor.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'P', OrePrefixes.pipeMedium.get(Materials.StainlessSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Steam_Turbine_LV.get(1L), bitsd, new Object[]{"PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'P', OrePrefixes.pipeMedium.get(Materials.Bronze)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Steam_Turbine_MV.get(1L), bitsd, new Object[]{"PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, 'R', OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'P', OrePrefixes.pipeMedium.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Steam_Turbine_HV.get(1L), bitsd, new Object[]{"PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'R', OrePrefixes.rotor.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'P', OrePrefixes.pipeMedium.get(Materials.StainlessSteel)}); ItemList.Generator_Naquadah_Mark_I.set(new GT_MetaTileEntity_NaquadahReactor(1190, "basicgenerator.naquadah.tier.04",new String[]{"Requires Enriched Naquadah Bolts"}, "Naquadah Reactor Mark I", 4).getStackForm(1L)); ItemList.Generator_Naquadah_Mark_II.set(new GT_MetaTileEntity_NaquadahReactor(1191, "basicgenerator.naquadah.tier.05",new String[]{"Requires Enriched Naquadah Rods"}, "Naquadah Reactor Mark II", 5).getStackForm(1L)); @@ -1090,9 +1088,9 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Generator_Naquadah_Mark_V.set(new GT_MetaTileEntity_NaquadahReactor(1189, "basicgenerator.naquadah.tier.08",new String[]{"Requires Naquadria Rods"}, "Naquadah Reactor Mark V", 8).getStackForm(1L)); //ItemList.Generator_Naquadah_Mark_VI.set(new GT_MetaTileEntity_NaquadahReactor(1168, "basicgenerator.naquadah.tier.09",new String[]{"Requires fluid Naquadah Fuel"}, "Naquadah Reactor Mark VI", GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels,9).getStackForm(1L)); //TODO CHECK RECIPES - //GT_ModHandler.addCraftingRecipe(ItemList.Generator_Naquadah_Mark_I.get(1L, new Object[0]), bitsd, new Object[]{"UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_EV, 'F', ItemList.Field_Generator_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt04.get(Materials.Aluminium), 'U', OrePrefixes.stick.get(Materials.Uranium235)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Generator_Naquadah_Mark_II.get(1L, new Object[0]), bitsd, new Object[]{"PCP", "FMF", aTextWireCoil, 'M', ItemList.Hull_IV, 'F', ItemList.Field_Generator_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'P', OrePrefixes.stick.get(Materials.Plutonium241)}); - //GT_ModHandler.addCraftingRecipe(ItemList.Generator_Naquadah_Mark_III.get(1L, new Object[0]), bitsd, new Object[]{"NCN", "FMF", aTextWireCoil, 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt04.get(Materials.NiobiumTitanium), 'N', OrePrefixes.stick.get(Materials.NaquadahEnriched)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Generator_Naquadah_Mark_I.get(1L), bitsd, new Object[]{"UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_EV, 'F', ItemList.Field_Generator_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt04.get(Materials.Aluminium), 'U', OrePrefixes.stick.get(Materials.Uranium235)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Generator_Naquadah_Mark_II.get(1L), bitsd, new Object[]{"PCP", "FMF", aTextWireCoil, 'M', ItemList.Hull_IV, 'F', ItemList.Field_Generator_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'P', OrePrefixes.stick.get(Materials.Plutonium241)}); + //GT_ModHandler.addCraftingRecipe(ItemList.Generator_Naquadah_Mark_III.get(1L), bitsd, new Object[]{"NCN", "FMF", aTextWireCoil, 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt04.get(Materials.NiobiumTitanium), 'N', OrePrefixes.stick.get(Materials.NaquadahEnriched)}); ItemList.MagicEnergyConverter_LV.set(new GT_MetaTileEntity_MagicEnergyConverter(1123, "basicgenerator.magicenergyconverter.tier.01", "Novice Magic Energy Converter", 1).getStackForm(1L)); ItemList.MagicEnergyConverter_MV.set(new GT_MetaTileEntity_MagicEnergyConverter(1124, "basicgenerator.magicenergyconverter.tier.02", "Adept Magic Energy Converter", 2).getStackForm(1L)); @@ -1103,50 +1101,50 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.MagicEnergyAbsorber_HV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber(1129, "basicgenerator.magicenergyabsorber.tier.03", "Master Magic Energy Absorber", 3).getStackForm(1L)); ItemList.MagicEnergyAbsorber_EV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber(1130, "basicgenerator.magicenergyabsorber.tier.04", "Grandmaster Magic Energy Absorber", 4).getStackForm(1L)); if (!Loader.isModLoaded("Thaumcraft")) { - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_LV.get(1L, new Object[0]), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_LV, 'B', new ItemStack(Blocks.beacon), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'T', ItemList.Field_Generator_LV, 'F', OrePrefixes.plate.get(Materials.Platinum)}); - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_MV.get(1L, new Object[0]), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_MV, 'B', new ItemStack(Blocks.beacon), 'C', OrePrefixes.circuit.get(Materials.Data), 'T', ItemList.Field_Generator_MV, 'F', OrePrefixes.plate.get(Materials.Iridium)}); - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_HV.get(1L, new Object[0]), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', new ItemStack(Blocks.beacon), 'C', OrePrefixes.circuit.get(Materials.Elite), 'T', ItemList.Field_Generator_HV, 'F', OrePrefixes.plate.get(Materials.Neutronium)}); - - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_LV.get(1L, new Object[0]), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_LV, 'B', ItemList.MagicEnergyConverter_LV.get(1L, new Object[0]), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'T', ItemList.Field_Generator_LV, 'F', OrePrefixes.plate.get(Materials.Platinum)}); - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_MV.get(1L, new Object[0]), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_MV, 'B', ItemList.MagicEnergyConverter_MV.get(1L, new Object[0]), 'C', OrePrefixes.circuit.get(Materials.Data), 'T', ItemList.Field_Generator_MV, 'F', OrePrefixes.plate.get(Materials.Iridium)}); - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_HV.get(1L, new Object[0]), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', ItemList.MagicEnergyConverter_MV.get(1L, new Object[0]), 'C', OrePrefixes.circuit.get(Materials.Elite), 'T', ItemList.Field_Generator_HV, 'F', OrePrefixes.plate.get(Materials.Europium)}); - GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_EV.get(1L, new Object[0]), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', ItemList.MagicEnergyConverter_HV.get(1L, new Object[0]), 'C', OrePrefixes.circuit.get(Materials.Master), 'T', ItemList.Field_Generator_EV, 'F', OrePrefixes.plate.get(Materials.Neutronium)}); + GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_LV.get(1L), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_LV, 'B', new ItemStack(Blocks.beacon), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'T', ItemList.Field_Generator_LV, 'F', OrePrefixes.plate.get(Materials.Platinum)}); + GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_MV.get(1L), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_MV, 'B', new ItemStack(Blocks.beacon), 'C', OrePrefixes.circuit.get(Materials.Data), 'T', ItemList.Field_Generator_MV, 'F', OrePrefixes.plate.get(Materials.Iridium)}); + GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_HV.get(1L), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', new ItemStack(Blocks.beacon), 'C', OrePrefixes.circuit.get(Materials.Elite), 'T', ItemList.Field_Generator_HV, 'F', OrePrefixes.plate.get(Materials.Neutronium)}); + + GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_LV.get(1L), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_LV, 'B', ItemList.MagicEnergyConverter_LV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'T', ItemList.Field_Generator_LV, 'F', OrePrefixes.plate.get(Materials.Platinum)}); + GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_MV.get(1L), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_MV, 'B', ItemList.MagicEnergyConverter_MV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Data), 'T', ItemList.Field_Generator_MV, 'F', OrePrefixes.plate.get(Materials.Iridium)}); + GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_HV.get(1L), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', ItemList.MagicEnergyConverter_MV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Elite), 'T', ItemList.Field_Generator_HV, 'F', OrePrefixes.plate.get(Materials.Europium)}); + GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyAbsorber_EV.get(1L), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', ItemList.MagicEnergyConverter_HV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Master), 'T', ItemList.Field_Generator_EV, 'F', OrePrefixes.plate.get(Materials.Neutronium)}); } ItemList.FusionComputer_LuV.set(new GT_MetaTileEntity_FusionComputer1(1193, "fusioncomputer.tier.06", "Fusion Control Computer Mark I").getStackForm(1L)); ItemList.FusionComputer_ZPMV.set(new GT_MetaTileEntity_FusionComputer2(1194, "fusioncomputer.tier.07", "Fusion Control Computer Mark II").getStackForm(1L)); ItemList.FusionComputer_UV.set(new GT_MetaTileEntity_FusionComputer3(1195, "fusioncomputer.tier.08", "Fusion Control Computer Mark III").getStackForm(1L)); - //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Fusion.get(1L, new Object[0]), bitsd, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', ItemList.Casing_LuV}); - //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Fusion2.get(1L, new Object[0]), bitsd, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Americium), 'F', ItemList.Casing_Fusion}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_Fusion_Coil.get(1L, new Object[0]), bitsd, new Object[]{"CTC", "FMF", "CTC", 'M', ItemList.Casing_Coil_Superconductor, 'C', OrePrefixes.circuit.get(Materials.Master), 'F', ItemList.Field_Generator_MV, 'T', ItemList.Neutron_Reflector}); + //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Fusion.get(1L), bitsd, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', ItemList.Casing_LuV}); + //GT_ModHandler.addCraftingRecipe(ItemList.Casing_Fusion2.get(1L), bitsd, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Americium), 'F', ItemList.Casing_Fusion}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_Fusion_Coil.get(1L), bitsd, new Object[]{"CTC", "FMF", "CTC", 'M', ItemList.Casing_Coil_Superconductor, 'C', OrePrefixes.circuit.get(Materials.Master), 'F', ItemList.Field_Generator_MV, 'T', ItemList.Neutron_Reflector}); -// GT_ModHandler.addCraftingRecipe(ItemList.FusionComputer_LuV.get(1L, new Object[0]), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Casing_Fusion_Coil, 'B', OrePrefixes.plate.get(Materials.NetherStar), 'C', OrePrefixes.circuit.get(Materials.Master), 'F', ItemList.Field_Generator_IV, 'T', OrePrefixes.plate.get(Materials.Plutonium241)}); -// GT_ModHandler.addCraftingRecipe(ItemList.FusionComputer_ZPMV.get(1L, new Object[0]), bitsd, new Object[]{"CBC", "FMF", "CBC", 'M', ItemList.FusionComputer_LuV, 'C', OrePrefixes.circuit.get(Materials.Master), 'F', ItemList.Field_Generator_IV, 'B', OrePrefixes.plate.get(Materials.Europium)}); -// GT_ModHandler.addCraftingRecipe(ItemList.FusionComputer_UV.get(1L, new Object[0]), bitsd, new Object[]{"CBC", "FMF", "CBC", 'M', ItemList.FusionComputer_ZPMV, 'C', OrePrefixes.circuit.get(Materials.Master), 'F', ItemList.Field_Generator_IV, 'B', OrePrefixes.plate.get(Materials.Americium)}); +// GT_ModHandler.addCraftingRecipe(ItemList.FusionComputer_LuV.get(1L), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Casing_Fusion_Coil, 'B', OrePrefixes.plate.get(Materials.NetherStar), 'C', OrePrefixes.circuit.get(Materials.Master), 'F', ItemList.Field_Generator_IV, 'T', OrePrefixes.plate.get(Materials.Plutonium241)}); +// GT_ModHandler.addCraftingRecipe(ItemList.FusionComputer_ZPMV.get(1L), bitsd, new Object[]{"CBC", "FMF", "CBC", 'M', ItemList.FusionComputer_LuV, 'C', OrePrefixes.circuit.get(Materials.Master), 'F', ItemList.Field_Generator_IV, 'B', OrePrefixes.plate.get(Materials.Europium)}); +// GT_ModHandler.addCraftingRecipe(ItemList.FusionComputer_UV.get(1L), bitsd, new Object[]{"CBC", "FMF", "CBC", 'M', ItemList.FusionComputer_ZPMV, 'C', OrePrefixes.circuit.get(Materials.Master), 'F', ItemList.Field_Generator_IV, 'B', OrePrefixes.plate.get(Materials.Americium)}); ItemList.Generator_Plasma_IV.set(new GT_MetaTileEntity_PlasmaGenerator(1196, "basicgenerator.plasmagenerator.tier.05", "Plasma Generator Mark I", 4).getStackForm(1L)); ItemList.Generator_Plasma_LuV.set(new GT_MetaTileEntity_PlasmaGenerator(1197, "basicgenerator.plasmagenerator.tier.06", "Plasma Generator Mark II", 5).getStackForm(1L)); ItemList.Generator_Plasma_ZPMV.set(new GT_MetaTileEntity_PlasmaGenerator(1198, "basicgenerator.plasmagenerator.tier.07", "Plasma Generator Mark III", 6).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Plasma_IV.get(1L, new Object[0]), bitsd, new Object[]{"UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_HV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'U', OrePrefixes.stick.get(Materials.Plutonium241)}); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Plasma_LuV.get(1L, new Object[0]), bitsd, new Object[]{"UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_EV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'U', OrePrefixes.stick.get(Materials.Europium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Generator_Plasma_ZPMV.get(1L, new Object[0]), bitsd, new Object[]{"UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_IV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.wireGt04.get(Materials.Naquadah), 'U', OrePrefixes.stick.get(Materials.Americium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Plasma_IV.get(1L), bitsd, new Object[]{"UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_HV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'U', OrePrefixes.stick.get(Materials.Plutonium241)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Plasma_LuV.get(1L), bitsd, new Object[]{"UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_EV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'U', OrePrefixes.stick.get(Materials.Europium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Generator_Plasma_ZPMV.get(1L), bitsd, new Object[]{"UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_IV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.wireGt04.get(Materials.Naquadah), 'U', OrePrefixes.stick.get(Materials.Americium)}); ItemList.Processing_Array.set(new GT_MetaTileEntity_ProcessingArray(1199, "multimachine.processingarray", "Processing Array").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Processing_Array.get(1L, new Object[0]), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_EV, 'B', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Elite), 'F', ItemList.Robot_Arm_EV, 'T', ItemList.Energy_LapotronicOrb}); + GT_ModHandler.addCraftingRecipe(ItemList.Processing_Array.get(1L), bitsd, new Object[]{"CTC", "FMF", "CBC", 'M', ItemList.Hull_EV, 'B', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Elite), 'F', ItemList.Robot_Arm_EV, 'T', ItemList.Energy_LapotronicOrb}); ItemList.Distillation_Tower.set(new GT_MetaTileEntity_DistillationTower(1126, "multimachine.distillationtower", "Distillation Tower").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Distillation_Tower.get(1L, new Object[0]), bitsd, new Object[]{"CBC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Data), 'F', ItemList.Electric_Pump_HV}); + GT_ModHandler.addCraftingRecipe(ItemList.Distillation_Tower.get(1L), bitsd, new Object[]{"CBC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Data), 'F', ItemList.Electric_Pump_HV}); ItemList.LargeSteamTurbine.set(new GT_MetaTileEntity_LargeTurbine_Steam(1131, "multimachine.largeturbine", "Large Steam Turbine").getStackForm(1L)); ItemList.LargeGasTurbine.set(new GT_MetaTileEntity_LargeTurbine_Gas(1151, "multimachine.largegasturbine", "Large Gas Turbine").getStackForm(1L)); ItemList.LargeHPSteamTurbine.set(new GT_MetaTileEntity_LargeTurbine_HPSteam(1152, "multimachine.largehpturbine", "Large HP Steam Turbine").getStackForm(1L)); ItemList.LargePlasmaTurbine.set(new GT_MetaTileEntity_LargeTurbine_Plasma(1153, "multimachine.largeplasmaturbine", "Large Plasma Generator").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.LargeSteamTurbine.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_HV, 'B', OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', OrePrefixes.gearGt.get(Materials.Steel)}); - GT_ModHandler.addCraftingRecipe(ItemList.LargeGasTurbine.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_EV, 'B', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Data), 'P', OrePrefixes.gearGt.get(Materials.StainlessSteel)}); - //GT_ModHandler.addCraftingRecipe(ItemList.LargeHPSteamTurbine.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_IV, 'B', OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Elite), 'P', OrePrefixes.gearGt.get(Materials.Titanium)}); - //GT_ModHandler.addCraftingRecipe(ItemList.LargePlasmaTurbine.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_UV, 'B', OrePrefixes.pipeHuge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Master), 'P', OrePrefixes.gearGt.get(Materials.TungstenSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.LargeSteamTurbine.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_HV, 'B', OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', OrePrefixes.gearGt.get(Materials.Steel)}); + GT_ModHandler.addCraftingRecipe(ItemList.LargeGasTurbine.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_EV, 'B', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Data), 'P', OrePrefixes.gearGt.get(Materials.StainlessSteel)}); + //GT_ModHandler.addCraftingRecipe(ItemList.LargeHPSteamTurbine.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_IV, 'B', OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Elite), 'P', OrePrefixes.gearGt.get(Materials.Titanium)}); + //GT_ModHandler.addCraftingRecipe(ItemList.LargePlasmaTurbine.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_UV, 'B', OrePrefixes.pipeHuge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Master), 'P', OrePrefixes.gearGt.get(Materials.TungstenSteel)}); ItemList.Pump_LV.set(new GT_MetaTileEntity_Pump(1140, "basicmachine.pump.tier.01", "Basic Pump", 1).getStackForm(1L)); ItemList.Pump_MV.set(new GT_MetaTileEntity_Pump(1141, "basicmachine.pump.tier.02", "Advanced Pump", 2).getStackForm(1L)); @@ -1157,17 +1155,17 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI // ItemList.Pump_ZPM.set(new GT_MetaTileEntity_Pump(1133, "basicmachine.pump.tier.07", "Advanced Pump VI", 7).getStackForm(1L)); // ItemList.Pump_UV.set(new GT_MetaTileEntity_Pump(1134, "basicmachine.pump.tier.08", "Advanced Pump VII", 8).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Pump_LV.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_LV, 'B', OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Basic), 'P', ItemList.Electric_Pump_LV}); - GT_ModHandler.addCraftingRecipe(ItemList.Pump_MV.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_MV, 'B', OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Good), 'P', ItemList.Electric_Pump_MV}); - GT_ModHandler.addCraftingRecipe(ItemList.Pump_HV.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_HV, 'B', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', ItemList.Electric_Pump_HV}); - GT_ModHandler.addCraftingRecipe(ItemList.Pump_EV.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_EV, 'B', OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Data), 'P', ItemList.Electric_Pump_EV}); - GT_ModHandler.addCraftingRecipe(ItemList.Pump_IV.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_IV, 'B', OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Elite), 'P', ItemList.Electric_Pump_IV}); -// GT_ModHandler.addCraftingRecipe(ItemList.Pump_LuV.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_LuV, 'B', OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Master), 'P', ItemList.Electric_Pump_LuV}); -// GT_ModHandler.addCraftingRecipe(ItemList.Pump_ZPM.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_ZPM, 'B', OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Master), 'P', ItemList.Electric_Pump_ZPM}); -// GT_ModHandler.addCraftingRecipe(ItemList.Pump_UV.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_UV, 'B', OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'P', ItemList.Electric_Pump_UV}); + GT_ModHandler.addCraftingRecipe(ItemList.Pump_LV.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_LV, 'B', OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Basic), 'P', ItemList.Electric_Pump_LV}); + GT_ModHandler.addCraftingRecipe(ItemList.Pump_MV.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_MV, 'B', OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Good), 'P', ItemList.Electric_Pump_MV}); + GT_ModHandler.addCraftingRecipe(ItemList.Pump_HV.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_HV, 'B', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', ItemList.Electric_Pump_HV}); + GT_ModHandler.addCraftingRecipe(ItemList.Pump_EV.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_EV, 'B', OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Data), 'P', ItemList.Electric_Pump_EV}); + GT_ModHandler.addCraftingRecipe(ItemList.Pump_IV.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_IV, 'B', OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Elite), 'P', ItemList.Electric_Pump_IV}); +// GT_ModHandler.addCraftingRecipe(ItemList.Pump_LuV.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_LuV, 'B', OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Master), 'P', ItemList.Electric_Pump_LuV}); +// GT_ModHandler.addCraftingRecipe(ItemList.Pump_ZPM.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_ZPM, 'B', OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Master), 'P', ItemList.Electric_Pump_ZPM}); +// GT_ModHandler.addCraftingRecipe(ItemList.Pump_UV.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_UV, 'B', OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'P', ItemList.Electric_Pump_UV}); ItemList.Teleporter.set(new GT_MetaTileEntity_Teleporter(1145, "basicmachine.teleporter", "Teleporter", 9).getStackForm(1L)); - //GT_ModHandler.addCraftingRecipe(ItemList.Teleporter.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextPlateMotor, "BCB", 'M', ItemList.Hull_LuV, 'B', ItemList.Tool_DataOrb, 'C', OrePrefixes.circuit.get(Materials.Elite), 'P', ItemList.Field_Generator_EV}); + //GT_ModHandler.addCraftingRecipe(ItemList.Teleporter.get(1L), bitsd, new Object[]{"CPC", aTextPlateMotor, "BCB", 'M', ItemList.Hull_LuV, 'B', ItemList.Tool_DataOrb, 'C', OrePrefixes.circuit.get(Materials.Elite), 'P', ItemList.Field_Generator_EV}); ItemList.MobRep_LV.set(new GT_MetaTileEntity_MonsterRepellent(1146, "basicmachine.mobrep.tier.01", "Basic Monster Repellator", 1).getStackForm(1L)); ItemList.MobRep_MV.set(new GT_MetaTileEntity_MonsterRepellent(1147, "basicmachine.mobrep.tier.02", "Advanced Monster Repellator", 2).getStackForm(1L)); @@ -1178,21 +1176,21 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.MobRep_ZPM.set(new GT_MetaTileEntity_MonsterRepellent(1136, "basicmachine.mobrep.tier.07", "Advanced Monster Repellator VI", 7).getStackForm(1L)); ItemList.MobRep_UV.set(new GT_MetaTileEntity_MonsterRepellent(1137, "basicmachine.mobrep.tier.08", "Advanced Monster Repellator VII", 8).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_LV.get(1L, new Object[0]), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_LV, 'E', ItemList.Emitter_LV.get(1L, new Object[0]), 'C', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_MV.get(1L, new Object[0]), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_MV, 'E', ItemList.Emitter_MV.get(1L, new Object[0]), 'C', OrePrefixes.circuit.get(Materials.Good)}); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_HV.get(1L, new Object[0]), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_HV, 'E', ItemList.Emitter_HV.get(1L, new Object[0]), 'C', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_EV.get(1L, new Object[0]), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_EV, 'E', ItemList.Emitter_EV.get(1L, new Object[0]), 'C', OrePrefixes.circuit.get(Materials.Data)}); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_IV.get(1L, new Object[0]), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_IV, 'E', ItemList.Emitter_IV.get(1L, new Object[0]), 'C', OrePrefixes.circuit.get(Materials.Elite)}); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_LuV.get(1L, new Object[0]), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_LuV, 'E', ItemList.Emitter_LuV.get(1L, new Object[0]), 'C', OrePrefixes.circuit.get(Materials.Master)}); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_ZPM.get(1L, new Object[0]), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_ZPM, 'E', ItemList.Emitter_ZPM.get(1L, new Object[0]), 'C', OrePrefixes.circuit.get(Materials.Ultimate)}); - GT_ModHandler.addCraftingRecipe(ItemList.MobRep_UV.get(1L, new Object[0]), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_UV, 'E', ItemList.Emitter_UV.get(1L, new Object[0]), 'C', OrePrefixes.circuit.get(Materials.Superconductor)}); + GT_ModHandler.addCraftingRecipe(ItemList.MobRep_LV.get(1L), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_LV, 'E', ItemList.Emitter_LV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.MobRep_MV.get(1L), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_MV, 'E', ItemList.Emitter_MV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Good)}); + GT_ModHandler.addCraftingRecipe(ItemList.MobRep_HV.get(1L), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_HV, 'E', ItemList.Emitter_HV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.MobRep_EV.get(1L), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_EV, 'E', ItemList.Emitter_EV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Data)}); + GT_ModHandler.addCraftingRecipe(ItemList.MobRep_IV.get(1L), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_IV, 'E', ItemList.Emitter_IV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Elite)}); + GT_ModHandler.addCraftingRecipe(ItemList.MobRep_LuV.get(1L), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_LuV, 'E', ItemList.Emitter_LuV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Master)}); + GT_ModHandler.addCraftingRecipe(ItemList.MobRep_ZPM.get(1L), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_ZPM, 'E', ItemList.Emitter_ZPM.get(1L), 'C', OrePrefixes.circuit.get(Materials.Ultimate)}); + GT_ModHandler.addCraftingRecipe(ItemList.MobRep_UV.get(1L), bitsd, new Object[]{"EEE", " M ", "CCC", 'M', ItemList.Hull_UV, 'E', ItemList.Emitter_UV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Superconductor)}); ItemList.Machine_Multi_HeatExchanger.set(new GT_MetaTileEntity_HeatExchanger(1154, "multimachine.heatexchanger", "Large Heat Exchanger").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_HeatExchanger.get(1L, new Object[0]), bitsd, new Object[]{aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Pipe_Titanium, 'C', OrePrefixes.pipeMedium.get(Materials.Titanium), 'W', ItemList.Electric_Pump_EV}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_HeatExchanger.get(1L), bitsd, new Object[]{aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Pipe_Titanium, 'C', OrePrefixes.pipeMedium.get(Materials.Titanium), 'W', ItemList.Electric_Pump_EV}); ItemList.Charcoal_Pile.set(new GT_MetaTileEntity_Charcoal_Pit(1155, "multimachine.charcoalpile", "Charcoal Pile Igniter").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.Charcoal_Pile.get(1L, new Object[0]), bitsd, new Object[]{"EXE", "EME", " C ", 'M', ItemList.Hull_HP_Bricks, 'E', OrePrefixes.plate.get(Materials.AnyBronze), 'C', new ItemStack(Items.flint_and_steel, 1), 'X', OrePrefixes.rotor.get(Materials.Steel),}); + GT_ModHandler.addCraftingRecipe(ItemList.Charcoal_Pile.get(1L), bitsd, new Object[]{"EXE", "EME", " C ", 'M', ItemList.Hull_HP_Bricks, 'E', OrePrefixes.plate.get(Materials.AnyBronze), 'C', new ItemStack(Items.flint_and_steel, 1), 'X', OrePrefixes.rotor.get(Materials.Steel),}); ItemList.Seismic_Prospector_LV.set(new GT_MetaTileEntity_SeismicProspector(1156, "basicmachine.seismicprospector.01", "Seismic Prospector LV", 1).getStackForm(1)); ItemList.Seismic_Prospector_MV.set(new GT_MetaTileEntity_SeismicProspector(2100, "basicmachine.seismicprospector.02", "Seismic Prospector MV", 2).getStackForm(1)); @@ -1204,26 +1202,26 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Seismic_Prospector_Adv_EV.set(new GT_MetaTileEntity_AdvSeismicProspector(1173, "basicmachine.seismicprospector.04", "Advanced Seismic Prospector EV", 4, 11*16/2, 6).getStackForm(1)); //Converter recipes in case you had old one lying around - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Seismic_Prospector_Adv_LV.get(1L, new Object[0]), bits, new Object[]{ItemList.Seismic_Prospector_LV}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Seismic_Prospector_Adv_MV.get(1L, new Object[0]), bits, new Object[]{ItemList.Seismic_Prospector_MV}); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.Seismic_Prospector_Adv_HV.get(1L, new Object[0]), bits, new Object[]{ItemList.Seismic_Prospector_HV}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Seismic_Prospector_Adv_LV.get(1L), bits, new Object[]{ItemList.Seismic_Prospector_LV}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Seismic_Prospector_Adv_MV.get(1L), bits, new Object[]{ItemList.Seismic_Prospector_MV}); + GT_ModHandler.addShapelessCraftingRecipe(ItemList.Seismic_Prospector_Adv_HV.get(1L), bits, new Object[]{ItemList.Seismic_Prospector_HV}); - GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector_Adv_LV.get(1L, new Object[0]), bitsd, new Object[]{"WWW", "EME", "CXC", 'M', ItemList.Hull_LV, 'W', OrePrefixes.plateDouble.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Basic), 'C', ItemList.Sensor_LV, 'X', OrePrefixes.cableGt02.get(Materials.Tin)}); - GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector_Adv_MV.get(1L, new Object[0]), bitsd, new Object[]{"WWW", "EME", "CXC", 'M', ItemList.Hull_MV, 'W', OrePrefixes.plateDouble.get(Materials.BlackSteel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Sensor_MV, 'X', OrePrefixes.cableGt02.get(Materials.Copper)}); - GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector_Adv_HV.get(1L, new Object[0]), bitsd, new Object[]{"WWW", "EME", "CXC", 'M', ItemList.Hull_HV, 'W', OrePrefixes.plateDouble.get(Materials.StainlessSteel), 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', ItemList.Sensor_HV, 'X', OrePrefixes.cableGt04.get(Materials.Gold)}); - GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector_Adv_EV.get(1L, new Object[0]), bitsd, new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_EV, 'W', OrePrefixes.plateDouble.get(Materials.VanadiumSteel),'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Sensor_EV, 'X', OrePrefixes.cableGt04.get(Materials.Aluminium) }); + GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector_Adv_LV.get(1L), bitsd, new Object[]{"WWW", "EME", "CXC", 'M', ItemList.Hull_LV, 'W', OrePrefixes.plateDouble.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Basic), 'C', ItemList.Sensor_LV, 'X', OrePrefixes.cableGt02.get(Materials.Tin)}); + GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector_Adv_MV.get(1L), bitsd, new Object[]{"WWW", "EME", "CXC", 'M', ItemList.Hull_MV, 'W', OrePrefixes.plateDouble.get(Materials.BlackSteel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Sensor_MV, 'X', OrePrefixes.cableGt02.get(Materials.Copper)}); + GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector_Adv_HV.get(1L), bitsd, new Object[]{"WWW", "EME", "CXC", 'M', ItemList.Hull_HV, 'W', OrePrefixes.plateDouble.get(Materials.StainlessSteel), 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', ItemList.Sensor_HV, 'X', OrePrefixes.cableGt04.get(Materials.Gold)}); + GT_ModHandler.addCraftingRecipe(ItemList.Seismic_Prospector_Adv_EV.get(1L), bitsd, new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_EV, 'W', OrePrefixes.plateDouble.get(Materials.VanadiumSteel),'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Sensor_EV, 'X', OrePrefixes.cableGt04.get(Materials.Aluminium) }); ItemList.OilDrill1.set(new GT_MetaTileEntity_OilDrill1(1157, "multimachine.oildrill1", "Oil/Gas/Fluid Drilling Rig").getStackForm(1)); ItemList.OilDrill2.set(new GT_MetaTileEntity_OilDrill2(141, "multimachine.oildrill2", "Oil/Gas/Fluid Drilling Rig II").getStackForm(1)); ItemList.OilDrill3.set(new GT_MetaTileEntity_OilDrill3(142, "multimachine.oildrill3", "Oil/Gas/Fluid Drilling Rig III").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.OilDrill1.get(1L, new Object[0]), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.Hull_MV, 'W', OrePrefixes.frameGt.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Motor_MV}); - GT_ModHandler.addCraftingRecipe(ItemList.OilDrill2.get(1L, new Object[0]), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OilDrill1, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', ItemList.Electric_Motor_HV}); - GT_ModHandler.addCraftingRecipe(ItemList.OilDrill3.get(1L, new Object[0]), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OilDrill2, 'W', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV}); + GT_ModHandler.addCraftingRecipe(ItemList.OilDrill1.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.Hull_MV, 'W', OrePrefixes.frameGt.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Motor_MV}); + GT_ModHandler.addCraftingRecipe(ItemList.OilDrill2.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OilDrill1, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', ItemList.Electric_Motor_HV}); + GT_ModHandler.addCraftingRecipe(ItemList.OilDrill3.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OilDrill2, 'W', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV}); ItemList.ConcreteBackfiller1.set(new GT_MetaTileEntity_ConcreteBackfiller1(143, "multimachine.concretebackfiller1", "Concrete Backfiller").getStackForm(1)); ItemList.ConcreteBackfiller2.set(new GT_MetaTileEntity_ConcreteBackfiller2(144, "multimachine.concretebackfiller3", "Advanced Concrete Backfiller").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.ConcreteBackfiller1.get(1L, new Object[0]), bitsd, new Object[]{"WPW", "EME", "CQC", 'M', ItemList.Hull_MV, 'W', OrePrefixes.frameGt.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Motor_MV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', ItemList.Electric_Pump_MV}); - GT_ModHandler.addCraftingRecipe(ItemList.ConcreteBackfiller2.get(1L, new Object[0]), bitsd, new Object[]{"WPW", "EME", "CQC", 'M', ItemList.ConcreteBackfiller1, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', ItemList.Electric_Pump_EV}); + GT_ModHandler.addCraftingRecipe(ItemList.ConcreteBackfiller1.get(1L), bitsd, new Object[]{"WPW", "EME", "CQC", 'M', ItemList.Hull_MV, 'W', OrePrefixes.frameGt.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Motor_MV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', ItemList.Electric_Pump_MV}); + GT_ModHandler.addCraftingRecipe(ItemList.ConcreteBackfiller2.get(1L), bitsd, new Object[]{"WPW", "EME", "CQC", 'M', ItemList.ConcreteBackfiller1, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', ItemList.Electric_Pump_EV}); ItemList.OreDrill1.set(new GT_MetaTileEntity_OreDrillingPlant1(1158, "multimachine.oredrill1", "Ore Drilling Plant").getStackForm(1)); GT_ModHandler.addCraftingRecipe(ItemList.OreDrill1.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.Hull_EV, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV}); @@ -1238,11 +1236,11 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI GT_ModHandler.addCraftingRecipe(ItemList.OreDrill4.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill3, 'W', OrePrefixes.frameGt.get(Materials.Tritanium), 'E', OrePrefixes.circuit.get(Materials.Ultimate), 'C', ItemList.Electric_Motor_ZPM}); ItemList.PyrolyseOven.set(new GT_MetaTileEntity_PyrolyseOven(1159, "multimachine.pyro", "Pyrolyse Oven").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.PyrolyseOven.get(1L, new Object[0]), bitsd, new Object[]{"WEP", "EME", "WCP", 'M', ItemList.Hull_MV, 'W', ItemList.Electric_Piston_MV, 'P', OrePrefixes.wireGt04.get(Materials.Cupronickel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Pump_MV}); + GT_ModHandler.addCraftingRecipe(ItemList.PyrolyseOven.get(1L), bitsd, new Object[]{"WEP", "EME", "WCP", 'M', ItemList.Hull_MV, 'W', ItemList.Electric_Piston_MV, 'P', OrePrefixes.wireGt04.get(Materials.Cupronickel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Pump_MV}); ItemList.OilCracker.set(new GT_MetaTileEntity_OilCracker(1160, "multimachine.cracker", "Oil Cracking Unit").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.OilCracker.get(1L, new Object[0]), bitsd, new Object[]{aTextWireCoil, "EME", aTextWireCoil, 'M', ItemList.Hull_HV, 'W', ItemList.Casing_Coil_Cupronickel, 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', ItemList.Electric_Pump_HV}); + GT_ModHandler.addCraftingRecipe(ItemList.OilCracker.get(1L), bitsd, new Object[]{aTextWireCoil, "EME", aTextWireCoil, 'M', ItemList.Hull_HV, 'W', ItemList.Casing_Coil_Cupronickel, 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', ItemList.Electric_Pump_HV}); ItemList.MicroTransmitter_HV.set(new GT_MetaTileEntity_MicrowaveEnergyTransmitter(1161, "basicmachine.microtransmitter.03", "HV Microwave Energy Transmitter", 3).getStackForm(1L)); ItemList.MicroTransmitter_EV.set(new GT_MetaTileEntity_MicrowaveEnergyTransmitter(1162, "basicmachine.microtransmitter.04", "EV Microwave Energy Transmitter", 4).getStackForm(1L)); @@ -1250,31 +1248,31 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.MicroTransmitter_LUV.set(new GT_MetaTileEntity_MicrowaveEnergyTransmitter(1164, "basicmachine.microtransmitter.06", "LuV Microwave Energy Transmitter", 6).getStackForm(1L)); ItemList.MicroTransmitter_ZPM.set(new GT_MetaTileEntity_MicrowaveEnergyTransmitter(1165, "basicmachine.microtransmitter.07", "ZPM Microwave Energy Transmitter", 7).getStackForm(1L)); ItemList.MicroTransmitter_UV.set(new GT_MetaTileEntity_MicrowaveEnergyTransmitter(1166, "basicmachine.microtransmitter.08", "UV Microwave Energy Transmitter", 8).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_HV.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_HV, 'B', ItemList.Battery_RE_HV_Lithium, 'C', ItemList.Emitter_HV, 'G', OrePrefixes.circuit.get(Materials.Advanced), 'P', ItemList.Field_Generator_HV}); - GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_EV.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_EV, 'B', GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W), 'C', ItemList.Emitter_EV, 'G', OrePrefixes.circuit.get(Materials.Data), 'P', ItemList.Field_Generator_EV}); - GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_IV.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_IV, 'B', ItemList.Energy_LapotronicOrb, 'C', ItemList.Emitter_IV, 'G', OrePrefixes.circuit.get(Materials.Elite), 'P', ItemList.Field_Generator_IV}); - GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_LUV.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_LuV, 'B', ItemList.Energy_LapotronicOrb2, 'C', ItemList.Emitter_LuV, 'G', OrePrefixes.circuit.get(Materials.Master), 'P', ItemList.Field_Generator_LuV}); - GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_ZPM.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_ZPM, 'B', GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) ? ItemList.Energy_Module : ItemList.ZPM2, 'C', ItemList.Emitter_ZPM, 'G', OrePrefixes.circuit.get(Materials.Ultimate), 'P', ItemList.Field_Generator_ZPM}); - GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_UV.get(1L, new Object[0]), bitsd, new Object[]{"CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_UV, 'B', GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) ? ItemList.Energy_Module : ItemList.ZPM3, 'C', ItemList.Emitter_UV, 'G', OrePrefixes.circuit.get(Materials.Superconductor), 'P', ItemList.Field_Generator_UV}); + GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_HV.get(1L), bitsd, new Object[]{"CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_HV, 'B', ItemList.Battery_RE_HV_Lithium, 'C', ItemList.Emitter_HV, 'G', OrePrefixes.circuit.get(Materials.Advanced), 'P', ItemList.Field_Generator_HV}); + GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_EV.get(1L), bitsd, new Object[]{"CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_EV, 'B', GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W), 'C', ItemList.Emitter_EV, 'G', OrePrefixes.circuit.get(Materials.Data), 'P', ItemList.Field_Generator_EV}); + GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_IV.get(1L), bitsd, new Object[]{"CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_IV, 'B', ItemList.Energy_LapotronicOrb, 'C', ItemList.Emitter_IV, 'G', OrePrefixes.circuit.get(Materials.Elite), 'P', ItemList.Field_Generator_IV}); + GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_LUV.get(1L), bitsd, new Object[]{"CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_LuV, 'B', ItemList.Energy_LapotronicOrb2, 'C', ItemList.Emitter_LuV, 'G', OrePrefixes.circuit.get(Materials.Master), 'P', ItemList.Field_Generator_LuV}); + GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_ZPM.get(1L), bitsd, new Object[]{"CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_ZPM, 'B', GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) ? ItemList.Energy_Module : ItemList.ZPM2, 'C', ItemList.Emitter_ZPM, 'G', OrePrefixes.circuit.get(Materials.Ultimate), 'P', ItemList.Field_Generator_ZPM}); + GT_ModHandler.addCraftingRecipe(ItemList.MicroTransmitter_UV.get(1L), bitsd, new Object[]{"CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_UV, 'B', GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) ? ItemList.Energy_Module : ItemList.ZPM3, 'C', ItemList.Emitter_UV, 'G', OrePrefixes.circuit.get(Materials.Superconductor), 'P', ItemList.Field_Generator_UV}); //ItemList.CuringOven.set(new GT_MetaTileEntity_CuringOven(1167, "basicmachine.curingoven", "Curing Oven", 1).getStackForm(1)); - //GT_ModHandler.addCraftingRecipe(ItemList.CuringOven.get(1L, new Object[0]), bitsd, new Object[]{"CWC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_LV, 'E', OrePrefixes.circuit.get(Materials.Basic), 'W', GT_OreDictUnificator.get(OrePrefixes.cable, Materials.Tin, 1), 'C', GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Cupronickel, 1)}); + //GT_ModHandler.addCraftingRecipe(ItemList.CuringOven.get(1L), bitsd, new Object[]{"CWC", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_LV, 'E', OrePrefixes.circuit.get(Materials.Basic), 'W', GT_OreDictUnificator.get(OrePrefixes.cable, Materials.Tin, 1), 'C', GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Cupronickel, 1)}); ItemList.Machine_Multi_Assemblyline.set(new GT_MetaTileEntity_AssemblyLine(1170, "multimachine.assemblyline", "Assembling Line").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_Assemblyline.get(1L, new Object[0]), bitsd, new Object[]{aTextWireCoil, "EME", aTextWireCoil, 'M', ItemList.Hull_IV, 'W', ItemList.Casing_Assembler, 'E', OrePrefixes.circuit.get(Materials.Elite), 'C', ItemList.Robot_Arm_IV}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_Assemblyline.get(1L), bitsd, new Object[]{aTextWireCoil, "EME", aTextWireCoil, 'M', ItemList.Hull_IV, 'W', ItemList.Casing_Assembler, 'E', OrePrefixes.circuit.get(Materials.Elite), 'C', ItemList.Robot_Arm_IV}); ItemList.Machine_Multi_DieselEngine.set(new GT_MetaTileEntity_DieselEngine(1171, "multimachine.dieselengine", "Combustion Engine").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_DieselEngine.get(1L, new Object[0]), bitsd, new Object[]{"PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.TungstenSteel), 'G', OrePrefixes.gearGt.get(Materials.Titanium)}); - GT_ModHandler.addCraftingRecipe(ItemList.Casing_EngineIntake.get(1L, new Object[0]), bitsd, new Object[]{"PhP", "RFR", aTextPlateWrench, 'R', OrePrefixes.pipeMedium.get(Materials.Titanium), 'F', ItemList.Casing_StableTitanium, 'P', OrePrefixes.rotor.get(Materials.Titanium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_DieselEngine.get(1L), bitsd, new Object[]{"PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.TungstenSteel), 'G', OrePrefixes.gearGt.get(Materials.Titanium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_EngineIntake.get(1L), bitsd, new Object[]{"PhP", "RFR", aTextPlateWrench, 'R', OrePrefixes.pipeMedium.get(Materials.Titanium), 'F', ItemList.Casing_StableTitanium, 'P', OrePrefixes.rotor.get(Materials.Titanium)}); ItemList.Machine_Multi_Cleanroom.set(new GT_MetaTileEntity_Cleanroom(1172, "multimachine.cleanroom", "Cleanroom Controller").getStackForm(1)); //If Cleanroom is enabled, add a recipe, else hide from NEI. if (GT_Mod.gregtechproxy.mEnableCleanroom){ - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_Cleanroom.get(1L, new Object[0]), bitsd, new Object[]{"FFF", "RHR", "MCM", 'H', ItemList.Hull_HV, 'F', ItemList.Component_Filter, 'R', OrePrefixes.rotor.get(Materials.StainlessSteel), 'M', ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_Cleanroom.get(1L), bitsd, new Object[]{"FFF", "RHR", "MCM", 'H', ItemList.Hull_HV, 'F', ItemList.Component_Filter, 'R', OrePrefixes.rotor.get(Materials.StainlessSteel), 'M', ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced)}); } else { if (isNEILoaded){ - API.hideItem(ItemList.Machine_Multi_Cleanroom.get(1L, new Object[0])); + API.hideItem(ItemList.Machine_Multi_Cleanroom.get(1L)); } } @@ -1288,14 +1286,14 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Machine_UV_CircuitAssembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe( 1187, "basicmachine.circuitassembler.tier.08", "Advanced Circuit Assembling Machine VII", 8, "Avengers, Assemble!", GT_Recipe.GT_Recipe_Map.sCircuitAssemblerRecipes, 6, 1, 16000, 0, 1, "CircuitAssembler.png", "", aBoolConst_0, aBoolConst_0, 0, "CIRCUITASSEMBLER", new Object[]{"ACE", "VMV", aTextWireCoil, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'V', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR, 'A', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.BETTER_CIRCUIT, 'W', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.WIRE, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER}).getStackForm(1L)); ItemList.Machine_HV_LightningRod.set(new GT_MetaTileEntity_LightningRod(1174, "basicgenerator.lightningrod.03", "Lightning Rod", 3).getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_LightningRod.get(1L, new Object[0]), bitsd, new Object[]{"LTL", "TMT", "LTL", 'M', ItemList.Hull_LuV, 'L', ItemList.Energy_LapotronicOrb, 'T', ItemList.Transformer_ZPM_LuV}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_HV_LightningRod.get(1L), bitsd, new Object[]{"LTL", "TMT", "LTL", 'M', ItemList.Hull_LuV, 'L', ItemList.Energy_LapotronicOrb, 'T', ItemList.Transformer_ZPM_LuV}); ItemList.Machine_EV_LightningRod.set(new GT_MetaTileEntity_LightningRod(1175, "basicgenerator.lightningrod.04", "Lightning Rod II", 4).getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_LightningRod.get(1L, new Object[0]), bitsd, new Object[]{"LTL", "TMT", "LTL", 'M', ItemList.Hull_ZPM, 'L', ItemList.Energy_LapotronicOrb2, 'T', ItemList.Transformer_UV_ZPM}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_EV_LightningRod.get(1L), bitsd, new Object[]{"LTL", "TMT", "LTL", 'M', ItemList.Hull_ZPM, 'L', ItemList.Energy_LapotronicOrb2, 'T', ItemList.Transformer_UV_ZPM}); ItemList.Machine_IV_LightningRod.set(new GT_MetaTileEntity_LightningRod(1176, "basicgenerator.lightningrod.05", "Lightning Rod III", 5).getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_LightningRod.get(1L, new Object[0]), bitsd, new Object[]{"LTL", "TMT", "LTL", 'M', ItemList.Hull_UV, 'L', ItemList.ZPM2, 'T', ItemList.Transformer_MAX_UV}); + GT_ModHandler.addCraftingRecipe(ItemList.Machine_IV_LightningRod.get(1L), bitsd, new Object[]{"LTL", "TMT", "LTL", 'M', ItemList.Hull_UV, 'L', ItemList.ZPM2, 'T', ItemList.Transformer_MAX_UV}); ItemList.Machine_Multi_LargeChemicalReactor.set(new GT_MetaTileEntity_LargeChemicalReactor(1169, "multimachine.chemicalreactor", "Large Chemical Reactor").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeChemicalReactor.get(1L, new Object[0]), bitsd, new Object[]{"CRC", "PMP", "CBC", + GT_ModHandler.addCraftingRecipe(ItemList.Machine_Multi_LargeChemicalReactor.get(1L), bitsd, new Object[]{"CRC", "PMP", "CBC", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'R', OrePrefixes.rotor.get(Materials.StainlessSteel), 'P', OrePrefixes.pipeLarge.get(Materials.Polytetrafluoroethylene), @@ -1446,9 +1444,9 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI generateFluidPipes(Materials.Polytetrafluoroethylene, Materials.Polytetrafluoroethylene.mName, "PTFE", 5680, 480, 600, true); generateFluidMultiPipes(Materials.Polytetrafluoroethylene, Materials.Polytetrafluoroethylene.mName, "PTFE", 5685, 480, 600, true); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.TungstenSteel, 1L), ItemList.Electric_Pump_EV.get(1L, new Object[0]), GT_Utility.getIntegratedCircuit(5)}, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Ultimate, 1L), 300, 1920); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1L), ItemList.Electric_Pump_IV.get(1L, new Object[0]), GT_Utility.getIntegratedCircuit(5)}, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 1L), 400, 4096); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 1L), ItemList.Electric_Pump_IV.get(2L, new Object[0]), GT_Utility.getIntegratedCircuit(5)}, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 1L), 600, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.TungstenSteel, 1L), ItemList.Electric_Pump_EV.get(1L), GT_Utility.getIntegratedCircuit(5)}, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Ultimate, 1L), 300, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1L), ItemList.Electric_Pump_IV.get(1L), GT_Utility.getIntegratedCircuit(5)}, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Ultimate, 1L), 400, 4096); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 1L), ItemList.Electric_Pump_IV.get(2L), GT_Utility.getIntegratedCircuit(5)}, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 1L), 600, 7680); //GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Superconductor, 1L), bitsd, new Object[]{"WSW", aTextCableHull, "WSW", 'M', OrePrefixes.pipeSmall.get(Materials.Titanium), 'C', OrePrefixes.plate.get(Materials.NeodymiumMagnetic), 'W', OrePrefixes.plate.get(Materials.Plastic), 'S', OrePrefixes.wireGt02.get(Materials.Superconductor)}); @@ -1497,16 +1495,16 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Automation_ChestBuffer_UV.set(new GT_MetaTileEntity_ChestBuffer(9238, "automation.chestbuffer.tier.08", "Ultimate Voltage Chest Buffer", 8).getStackForm(1L)); ItemList.Automation_ChestBuffer_MAX.set(new GT_MetaTileEntity_ChestBuffer(9239, "automation.chestbuffer.tier.09", "Highly Ultimate Voltage Chest Buffer", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_ULV.get(1L, new Object[0]), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_LV.get(1L, new Object[0]), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_MV.get(1L, new Object[0]), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_HV.get(1L, new Object[0]), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_EV.get(1L, new Object[0]), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_IV.get(1L, new Object[0]), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_LuV.get(1L, new Object[0]), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_ZPM.get(1L, new Object[0]), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_UV.get(1L, new Object[0]), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_MAX.get(1L, new Object[0]), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_ULV.get(1L), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_LV.get(1L), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_MV.get(1L), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_HV.get(1L), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_EV.get(1L), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_IV.get(1L), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_LuV.get(1L), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_ZPM.get(1L), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_UV.get(1L), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ChestBuffer_MAX.get(1L), bitsd, new Object[]{"CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic)}); ItemList.Automation_Filter_ULV.set(new GT_MetaTileEntity_Filter(9240, "automation.filter.tier.00", "Ultra Low Voltage Item Filter", 0).getStackForm(1L)); ItemList.Automation_Filter_LV.set(new GT_MetaTileEntity_Filter(9241, "automation.filter.tier.01", "Low Voltage Item Filter", 1).getStackForm(1L)); @@ -1519,16 +1517,16 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Automation_Filter_UV.set(new GT_MetaTileEntity_Filter(9248, "automation.filter.tier.08", "Ultimate Voltage Item Filter", 8).getStackForm(1L)); ItemList.Automation_Filter_MAX.set(new GT_MetaTileEntity_Filter(9249, "automation.filter.tier.09", "Highly Ultimate Voltage Item Filter", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_ULV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_LV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_MV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_HV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_EV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_IV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_LuV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_ZPM.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_UV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_MAX.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_ULV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_LV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_MV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_HV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_EV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_IV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_LuV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_ZPM.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_UV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Filter_MAX.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Basic)}); ItemList.Automation_TypeFilter_ULV.set(new GT_MetaTileEntity_TypeFilter(9250, "automation.typefilter.tier.00", "Ultra Low Voltage Type Filter", 0).getStackForm(1L)); ItemList.Automation_TypeFilter_LV.set(new GT_MetaTileEntity_TypeFilter(9251, "automation.typefilter.tier.01", "Low Voltage Type Filter", 1).getStackForm(1L)); @@ -1541,16 +1539,16 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Automation_TypeFilter_UV.set(new GT_MetaTileEntity_TypeFilter(9258, "automation.typefilter.tier.08", "Ultimate Voltage Type Filter", 8).getStackForm(1L)); ItemList.Automation_TypeFilter_MAX.set(new GT_MetaTileEntity_TypeFilter(9259, "automation.typefilter.tier.09", "Highly Ultimate Voltage Type Filter", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_ULV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_LV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_MV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_HV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_EV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_IV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_LuV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_ZPM.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_UV.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_MAX.get(1L, new Object[0]), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_ULV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_LV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_MV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_HV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_EV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_IV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_LuV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_ZPM.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_UV.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_TypeFilter_MAX.get(1L), bitsd, new Object[]{" F ", "CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); ItemList.Automation_Regulator_ULV.set(new GT_MetaTileEntity_Regulator(9270, "automation.regulator.tier.00", "Ultra Low Voltage Regulator", 0).getStackForm(1L)); ItemList.Automation_Regulator_LV.set(new GT_MetaTileEntity_Regulator(9271, "automation.regulator.tier.01", "Low Voltage Regulator", 1).getStackForm(1L)); @@ -1563,16 +1561,16 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Automation_Regulator_UV.set(new GT_MetaTileEntity_Regulator(9278, "automation.regulator.tier.08", "Ultimate Voltage Regulator", 8).getStackForm(1L)); ItemList.Automation_Regulator_MAX.set(new GT_MetaTileEntity_Regulator(9279, "automation.regulator.tier.09", "Highly Ultimate Voltage Regulator", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_ULV.get(1L, new Object[0]), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_ULV, 'V', ItemList.Robot_Arm_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_LV.get(1L, new Object[0]), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_LV, 'V', ItemList.Robot_Arm_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_MV.get(1L, new Object[0]), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_MV, 'V', ItemList.Robot_Arm_MV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_HV.get(1L, new Object[0]), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_HV, 'V', ItemList.Robot_Arm_HV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_EV.get(1L, new Object[0]), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_EV, 'V', ItemList.Robot_Arm_EV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_IV.get(1L, new Object[0]), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_IV, 'V', ItemList.Robot_Arm_IV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_LuV.get(1L, new Object[0]), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_LuV, 'V', ItemList.Robot_Arm_LuV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_ZPM.get(1L, new Object[0]), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_ZPM, 'V', ItemList.Robot_Arm_ZPM, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_UV.get(1L, new Object[0]), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_UV, 'V', ItemList.Robot_Arm_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_MAX.get(1L, new Object[0]), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_MAX, 'V', ItemList.Robot_Arm_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_ULV.get(1L), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_ULV, 'V', ItemList.Robot_Arm_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_LV.get(1L), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_LV, 'V', ItemList.Robot_Arm_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_MV.get(1L), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_MV, 'V', ItemList.Robot_Arm_MV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_HV.get(1L), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_HV, 'V', ItemList.Robot_Arm_HV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_EV.get(1L), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_EV, 'V', ItemList.Robot_Arm_EV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_IV.get(1L), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_IV, 'V', ItemList.Robot_Arm_IV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_LuV.get(1L), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_LuV, 'V', ItemList.Robot_Arm_LuV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_ZPM.get(1L), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_ZPM, 'V', ItemList.Robot_Arm_ZPM, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_UV.get(1L), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_UV, 'V', ItemList.Robot_Arm_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_Regulator_MAX.get(1L), bitsd, new Object[]{"XFX", "VMV", "XCX", 'M', ItemList.Hull_MAX, 'V', ItemList.Robot_Arm_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', OrePrefixes.circuit.get(Materials.Advanced)}); ItemList.Automation_SuperBuffer_ULV.set(new GT_MetaTileEntity_SuperBuffer(9300, "automation.superbuffer.tier.00", "Ultra Low Voltage Super Buffer", 0).getStackForm(1L)); ItemList.Automation_SuperBuffer_LV.set(new GT_MetaTileEntity_SuperBuffer(9301, "automation.superbuffer.tier.01", "Low Voltage Super Buffer", 1).getStackForm(1L)); @@ -1585,27 +1583,27 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Automation_SuperBuffer_UV.set(new GT_MetaTileEntity_SuperBuffer(9308, "automation.superbuffer.tier.08", "Ultimate Voltage Super Buffer", 8).getStackForm(1L)); ItemList.Automation_SuperBuffer_MAX.set(new GT_MetaTileEntity_SuperBuffer(9309, "automation.superbuffer.tier.09", "Highly Ultimate Voltage Super Buffer", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_ULV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'D', ItemList.Tool_DataOrb}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_LV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'D', ItemList.Tool_DataOrb}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_MV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'D', ItemList.Tool_DataOrb}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_HV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'D', ItemList.Tool_DataOrb}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_EV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'D', ItemList.Tool_DataOrb}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_IV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'D', ItemList.Tool_DataOrb}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_LuV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'D', ItemList.Tool_DataOrb}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_ZPM.get(1L, new Object[0]), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'D', ItemList.Tool_DataOrb}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_UV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'D', ItemList.Tool_DataOrb}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_MAX.get(1L, new Object[0]), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UV, 'D', ItemList.Tool_DataOrb}); - - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_ULV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'D', ItemList.Tool_DataStick}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_LV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'D', ItemList.Tool_DataStick}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_MV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'D', ItemList.Tool_DataStick}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_HV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'D', ItemList.Tool_DataStick}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_EV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'D', ItemList.Tool_DataStick}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_IV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'D', ItemList.Tool_DataStick}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_LuV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'D', ItemList.Tool_DataStick}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_ZPM.get(1L, new Object[0]), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'D', ItemList.Tool_DataStick}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_UV.get(1L, new Object[0]), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'D', ItemList.Tool_DataStick}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_MAX.get(1L, new Object[0]), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UV, 'D', ItemList.Tool_DataStick}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_ULV.get(1L), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'D', ItemList.Tool_DataOrb}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_LV.get(1L), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'D', ItemList.Tool_DataOrb}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_MV.get(1L), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'D', ItemList.Tool_DataOrb}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_HV.get(1L), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'D', ItemList.Tool_DataOrb}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_EV.get(1L), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'D', ItemList.Tool_DataOrb}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_IV.get(1L), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'D', ItemList.Tool_DataOrb}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_LuV.get(1L), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'D', ItemList.Tool_DataOrb}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_ZPM.get(1L), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'D', ItemList.Tool_DataOrb}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_UV.get(1L), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'D', ItemList.Tool_DataOrb}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_MAX.get(1L), bitsd, new Object[]{"DMV", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UV, 'D', ItemList.Tool_DataOrb}); + + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_ULV.get(1L), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'D', ItemList.Tool_DataStick}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_LV.get(1L), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'D', ItemList.Tool_DataStick}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_MV.get(1L), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'D', ItemList.Tool_DataStick}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_HV.get(1L), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'D', ItemList.Tool_DataStick}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_EV.get(1L), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'D', ItemList.Tool_DataStick}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_IV.get(1L), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'D', ItemList.Tool_DataStick}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_LuV.get(1L), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'D', ItemList.Tool_DataStick}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_ZPM.get(1L), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'D', ItemList.Tool_DataStick}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_UV.get(1L), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'D', ItemList.Tool_DataStick}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_SuperBuffer_MAX.get(1L), bitsd, new Object[]{"DMV", "DDD", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UV, 'D', ItemList.Tool_DataStick}); ItemList.Automation_ItemDistributor_ULV.set(new GT_MetaTileEntity_ItemDistributor(9320, "automation.itemdistributor.tier.00", "Ultra Low Voltage Item Distributor", 0).getStackForm(1L)); ItemList.Automation_ItemDistributor_LV.set(new GT_MetaTileEntity_ItemDistributor(9321, "automation.itemdistributor.tier.01", "Low Voltage Item Distributor", 1).getStackForm(1L)); @@ -1618,16 +1616,16 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Automation_ItemDistributor_UV.set(new GT_MetaTileEntity_ItemDistributor(9328, "automation.itemdistributor.tier.08", "Ultimate Voltage Item Distributor", 8).getStackForm(1L)); ItemList.Automation_ItemDistributor_MAX.set(new GT_MetaTileEntity_ItemDistributor(9329, "automation.itemdistributor.tier.09", "MAX Voltage Item Distributor", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_ULV.get(1L, new Object[0]), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_ULV.get(1L), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_LV.get(1L, new Object[0]), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_MV.get(1L, new Object[0]), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_HV.get(1L, new Object[0]), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_EV.get(1L, new Object[0]), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_IV.get(1L, new Object[0]), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_LuV.get(1L, new Object[0]), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_ZPM.get(1L, new Object[0]), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_LuV.get(1L), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_ZPM.get(1L), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_UV.get(1L, new Object[0]), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); - GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_MAX.get(1L, new Object[0]), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); + GT_ModHandler.addCraftingRecipe(ItemList.Automation_ItemDistributor_MAX.get(1L), bitsd, new Object[]{"XCX", "VMV", " V ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good)}); } diff --git a/src/main/resources/assets/gregtech/textures/gui/SolarHPBoiler.png b/src/main/resources/assets/gregtech/textures/gui/SolarHPBoiler.png new file mode 100644 index 0000000000..8f5324aeff Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/SolarHPBoiler.png differ -- cgit From e9a1ffaf34d83c38f0ee8364eebf6f42ad4a40a3 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Tue, 28 May 2019 00:25:29 +0200 Subject: reverted Optimised Images due to graphic bugs ingame +this commit undoes https://github.com/GTNewHorizons/GT5-Unofficial/commit/2d8cbff191745bad46125cf492486f73b781e26a Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> --- build.properties | 2 +- src/main/java/gregtech/common/GT_RecipeAdder.java | 3 ++- .../assets/gregtech/textures/BrainTechCape.png | Bin 604 -> 3654 bytes .../resources/assets/gregtech/textures/DevCape.png | Bin 33006 -> 525481 bytes .../assets/gregtech/textures/DonorCape.png | Bin 33330 -> 394192 bytes .../assets/gregtech/textures/GregTechCape.png | Bin 363 -> 588 bytes .../assets/gregtech/textures/GregoriusCape.png | Bin 811 -> 985 bytes .../assets/gregtech/textures/LogoGTI_Long.png | Bin 3895 -> 4009 bytes .../assets/gregtech/textures/MrBrainCape.png | Bin 604 -> 3689 bytes .../resources/assets/gregtech/textures/TecCape.png | Bin 111897 -> 1576004 bytes .../assets/gregtech/textures/aspects/ELECTRUM.png | Bin 2501 -> 2606 bytes .../assets/gregtech/textures/aspects/MAGNETO.png | Bin 1129 -> 1877 bytes .../assets/gregtech/textures/aspects/NEBRISUM.png | Bin 1417 -> 2454 bytes .../assets/gregtech/textures/aspects/RADIO.png | Bin 1266 -> 2174 bytes .../assets/gregtech/textures/aspects/STRONTIO.png | Bin 1389 -> 2165 bytes .../centrifuge/OVERLAY_FRONT_ACTIVE.png | Bin 652 -> 848 bytes .../centrifuge/OVERLAY_SIDE_ACTIVE.png | Bin 652 -> 848 bytes .../OVERLAY_FRONT_ACTIVE.png | Bin 670 -> 832 bytes .../laser_engraver/OVERLAY_FRONT_ACTIVE.png | Bin 687 -> 729 bytes .../basicmachines/macerator/OVERLAY_TOP_ACTIVE.png | Bin 1040 -> 1371 bytes .../basicmachines/miner/OVERLAY_TOP_ACTIVE.png | Bin 1040 -> 1371 bytes .../basicmachines/mixer/OVERLAY_TOP_ACTIVE.png | Bin 455 -> 512 bytes .../pulverizer/OVERLAY_TOP_ACTIVE.png | Bin 1040 -> 1371 bytes .../gregtech/textures/blocks/fluids/fluid.air.png | Bin 2428 -> 36130 bytes .../textures/blocks/fluids/fluid.argon.png | Bin 4000 -> 6797 bytes .../textures/blocks/fluids/fluid.berylium.png | Bin 4698 -> 9660 bytes .../textures/blocks/fluids/fluid.bioethanol.png | Bin 4320 -> 7231 bytes .../textures/blocks/fluids/fluid.biomass.png | Bin 4000 -> 6797 bytes .../textures/blocks/fluids/fluid.calcium.png | Bin 5824 -> 14695 bytes .../blocks/fluids/fluid.calciumcarbonate.png | Bin 4960 -> 11401 bytes .../textures/blocks/fluids/fluid.chlorine.png | Bin 6000 -> 15124 bytes .../textures/blocks/fluids/fluid.creosote.png | Bin 4320 -> 7232 bytes .../gregtech/textures/blocks/fluids/fluid.dyes.png | Bin 3455 -> 6580 bytes .../textures/blocks/fluids/fluid.fieryblood.png | Bin 2179 -> 3788 bytes .../textures/blocks/fluids/fluid.fishoil.png | Bin 4326 -> 7265 bytes .../textures/blocks/fluids/fluid.fluorine.png | Bin 5370 -> 12997 bytes .../textures/blocks/fluids/fluid.for.honey.png | Bin 3344 -> 7112 bytes .../gregtech/textures/blocks/fluids/fluid.fuel.png | Bin 4320 -> 7298 bytes .../textures/blocks/fluids/fluid.glyceryl.png | Bin 5300 -> 12278 bytes .../textures/blocks/fluids/fluid.heliumplasma.png | Bin 3149 -> 5475 bytes .../textures/blocks/fluids/fluid.holywater.png | Bin 3495 -> 8205 bytes .../textures/blocks/fluids/fluid.hotfryingoil.png | Bin 1131 -> 2433 bytes .../blocks/fluids/fluid.hydrochloricacid.png | Bin 4239 -> 8311 bytes .../gregtech/textures/blocks/fluids/fluid.ice.png | Bin 4119 -> 8961 bytes .../textures/blocks/fluids/fluid.indigo.png | Bin 5387 -> 11925 bytes .../blocks/fluids/fluid.indiumconcentrate.png | Bin 5114 -> 8576 bytes .../textures/blocks/fluids/fluid.iron3chloride.png | Bin 4450 -> 8856 bytes .../blocks/fluids/fluid.leadzincsolution.png | Bin 4982 -> 8544 bytes .../textures/blocks/fluids/fluid.lifeessence.png | Bin 4010 -> 8072 bytes .../fluids/fluid.liquid_cracked_heavy_fuel.png | Bin 3242 -> 6267 bytes .../fluids/fluid.liquid_cracked_light_fuel.png | Bin 4320 -> 7298 bytes .../blocks/fluids/fluid.liquid_drillingfluid.png | Bin 3242 -> 6267 bytes .../blocks/fluids/fluid.liquid_epichlorhydrin.png | Bin 4960 -> 11401 bytes .../blocks/fluids/fluid.liquid_extra_heavy_oil.png | Bin 3454 -> 4563 bytes .../blocks/fluids/fluid.liquid_heavy_fuel.png | Bin 3242 -> 6267 bytes .../blocks/fluids/fluid.liquid_heavy_oil.png | Bin 3454 -> 4563 bytes .../blocks/fluids/fluid.liquid_light_fuel.png | Bin 4320 -> 7298 bytes .../blocks/fluids/fluid.liquid_light_oil.png | Bin 3454 -> 4563 bytes .../textures/blocks/fluids/fluid.liquid_lpg.png | Bin 3149 -> 5475 bytes .../blocks/fluids/fluid.liquid_medium_oil.png | Bin 3454 -> 4563 bytes .../blocks/fluids/fluid.liquid_naphtha.png | Bin 4320 -> 7298 bytes .../fluids/fluid.liquid_sufluriclight_fuel.png | Bin 4320 -> 7298 bytes .../fluids/fluid.liquid_sulfuricheavy_fuel.png | Bin 3242 -> 6267 bytes .../blocks/fluids/fluid.liquid_sulfuricnaphtha.png | Bin 4320 -> 7298 bytes .../blocks/fluids/fluid.liquid_toluene.png | Bin 4960 -> 11401 bytes .../textures/blocks/fluids/fluid.liquidair.png | Bin 311 -> 2809 bytes .../textures/blocks/fluids/fluid.lithium.png | Bin 5370 -> 12997 bytes .../textures/blocks/fluids/fluid.lubricant.png | Bin 3242 -> 6267 bytes .../textures/blocks/fluids/fluid.mcguffium.png | Bin 4320 -> 7233 bytes .../textures/blocks/fluids/fluid.mercury.png | Bin 2487 -> 4766 bytes .../gregtech/textures/blocks/fluids/fluid.milk.png | Bin 4797 -> 9957 bytes .../blocks/fluids/fluid.molten.autogenerated.png | Bin 7019 -> 11530 bytes .../textures/blocks/fluids/fluid.molten.blaze.png | Bin 3617 -> 7556 bytes .../blocks/fluids/fluid.molten.concrete.png | Bin 3431 -> 7457 bytes .../textures/blocks/fluids/fluid.molten.glass.png | Bin 7142 -> 11695 bytes .../blocks/fluids/fluid.molten.redstone.png | Bin 4391 -> 9322 bytes .../textures/blocks/fluids/fluid.nitrocoalfuel.png | Bin 4658 -> 9745 bytes .../textures/blocks/fluids/fluid.nitrofuel.png | Bin 5538 -> 13364 bytes .../blocks/fluids/fluid.nitrogenplasma.png | Bin 1461 -> 2311 bytes .../gregtech/textures/blocks/fluids/fluid.oil.png | Bin 3454 -> 4563 bytes .../blocks/fluids/fluid.plasma.autogenerated.png | Bin 1461 -> 2311 bytes .../textures/blocks/fluids/fluid.potassium.png | Bin 5327 -> 12870 bytes .../blocks/fluids/fluid.potion.alcopops.png | Bin 4393 -> 8064 bytes .../blocks/fluids/fluid.potion.applejuice.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.awkward.png | Bin 5990 -> 13866 bytes .../textures/blocks/fluids/fluid.potion.beer.png | Bin 4393 -> 8064 bytes .../blocks/fluids/fluid.potion.cafeaulait.png | Bin 4320 -> 7233 bytes .../fluid.potion.cavejohnsonsgrenadejuice.png | Bin 4393 -> 8064 bytes .../blocks/fluids/fluid.potion.chillysauce.png | Bin 4958 -> 9766 bytes .../blocks/fluids/fluid.potion.chocolatemilk.png | Bin 4320 -> 7233 bytes .../textures/blocks/fluids/fluid.potion.cider.png | Bin 4320 -> 7330 bytes .../textures/blocks/fluids/fluid.potion.coffee.png | Bin 4320 -> 7233 bytes .../textures/blocks/fluids/fluid.potion.damage.png | Bin 4320 -> 7229 bytes .../blocks/fluids/fluid.potion.damage.splash.png | Bin 4320 -> 7229 bytes .../blocks/fluids/fluid.potion.damage.strong.png | Bin 4320 -> 7229 bytes .../fluids/fluid.potion.damage.strong.splash.png | Bin 4320 -> 7229 bytes .../blocks/fluids/fluid.potion.darkbeer.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.darkcafeaulait.png | Bin 4320 -> 7233 bytes .../fluids/fluid.potion.darkchocolatemilk.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.darkcoffee.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.diablosauce.png | Bin 4958 -> 9766 bytes .../fluids/fluid.potion.diablosauce.strong.png | Bin 4958 -> 9766 bytes .../blocks/fluids/fluid.potion.diabolosauce.png | Bin 4958 -> 9766 bytes .../blocks/fluids/fluid.potion.dragonblood.png | Bin 4320 -> 7233 bytes .../fluids/fluid.potion.fireresistance.long.png | Bin 4320 -> 7230 bytes .../fluid.potion.fireresistance.long.splash.png | Bin 4320 -> 7230 bytes .../blocks/fluids/fluid.potion.fireresistance.png | Bin 4320 -> 7230 bytes .../fluids/fluid.potion.fireresistance.splash.png | Bin 4320 -> 7230 bytes .../blocks/fluids/fluid.potion.glenmckenner.png | Bin 4320 -> 7233 bytes .../fluids/fluid.potion.goldenapplejuice.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.goldencider.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.grapejuice.png | Bin 4320 -> 7324 bytes .../textures/blocks/fluids/fluid.potion.health.png | Bin 4320 -> 7222 bytes .../blocks/fluids/fluid.potion.health.splash.png | Bin 4320 -> 7222 bytes .../blocks/fluids/fluid.potion.health.strong.png | Bin 4320 -> 7222 bytes .../fluids/fluid.potion.health.strong.splash.png | Bin 4320 -> 7222 bytes .../blocks/fluids/fluid.potion.hopsjuice.png | Bin 4320 -> 7324 bytes .../blocks/fluids/fluid.potion.hotsauce.png | Bin 4958 -> 9766 bytes .../textures/blocks/fluids/fluid.potion.icetea.png | Bin 4320 -> 7230 bytes .../blocks/fluids/fluid.potion.idunsapplejuice.png | Bin 4320 -> 7233 bytes .../fluids/fluid.potion.invisibility.long.png | Bin 4320 -> 7233 bytes .../fluid.potion.invisibility.long.splash.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.invisibility.png | Bin 4320 -> 7233 bytes .../fluids/fluid.potion.invisibility.splash.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.laitaucafe.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.lemonade.png | Bin 4393 -> 8064 bytes .../blocks/fluids/fluid.potion.lemonjuice.png | Bin 4393 -> 8064 bytes .../blocks/fluids/fluid.potion.leninade.png | Bin 4393 -> 8064 bytes .../blocks/fluids/fluid.potion.limoncello.png | Bin 4393 -> 8064 bytes .../blocks/fluids/fluid.potion.mineralwater.png | Bin 5749 -> 12247 bytes .../blocks/fluids/fluid.potion.mundane.png | Bin 5990 -> 13866 bytes .../fluids/fluid.potion.nightvision.long.png | Bin 4320 -> 7229 bytes .../fluid.potion.nightvision.long.splash.png | Bin 4320 -> 7229 bytes .../blocks/fluids/fluid.potion.nightvision.png | Bin 4320 -> 7229 bytes .../fluids/fluid.potion.nightvision.splash.png | Bin 4320 -> 7229 bytes .../blocks/fluids/fluid.potion.notchesbrew.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.piratebrew.png | Bin 4902 -> 10377 bytes .../blocks/fluids/fluid.potion.poison.long.png | Bin 4320 -> 7232 bytes .../fluids/fluid.potion.poison.long.splash.png | Bin 4320 -> 7232 bytes .../textures/blocks/fluids/fluid.potion.poison.png | Bin 4320 -> 7232 bytes .../blocks/fluids/fluid.potion.poison.splash.png | Bin 4320 -> 7232 bytes .../blocks/fluids/fluid.potion.poison.strong.png | Bin 4320 -> 7232 bytes .../fluids/fluid.potion.poison.strong.splash.png | Bin 4320 -> 7232 bytes .../blocks/fluids/fluid.potion.potatojuice.png | Bin 4393 -> 8064 bytes .../blocks/fluids/fluid.potion.purpledrink.png | Bin 4320 -> 7231 bytes .../blocks/fluids/fluid.potion.reedwater.png | Bin 5990 -> 13866 bytes .../blocks/fluids/fluid.potion.regen.long.png | Bin 4320 -> 7231 bytes .../fluids/fluid.potion.regen.long.splash.png | Bin 4320 -> 7231 bytes .../textures/blocks/fluids/fluid.potion.regen.png | Bin 4320 -> 7231 bytes .../blocks/fluids/fluid.potion.regen.splash.png | Bin 4320 -> 7231 bytes .../blocks/fluids/fluid.potion.regen.strong.png | Bin 4320 -> 7231 bytes .../fluids/fluid.potion.regen.strong.splash.png | Bin 4320 -> 7231 bytes .../textures/blocks/fluids/fluid.potion.rum.png | Bin 4902 -> 10296 bytes .../blocks/fluids/fluid.potion.saltywater.png | Bin 5990 -> 13866 bytes .../textures/blocks/fluids/fluid.potion.scotch.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.slowness.long.png | Bin 4320 -> 7233 bytes .../fluids/fluid.potion.slowness.long.splash.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.slowness.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.slowness.splash.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.speed.long.png | Bin 4320 -> 7231 bytes .../fluids/fluid.potion.speed.long.splash.png | Bin 4320 -> 7231 bytes .../textures/blocks/fluids/fluid.potion.speed.png | Bin 4320 -> 7231 bytes .../blocks/fluids/fluid.potion.speed.splash.png | Bin 4320 -> 7231 bytes .../blocks/fluids/fluid.potion.speed.strong.png | Bin 4320 -> 7231 bytes .../fluids/fluid.potion.speed.strong.splash.png | Bin 4320 -> 7231 bytes .../blocks/fluids/fluid.potion.strength.long.png | Bin 4320 -> 7229 bytes .../fluids/fluid.potion.strength.long.splash.png | Bin 4320 -> 7229 bytes .../blocks/fluids/fluid.potion.strength.png | Bin 4320 -> 7229 bytes .../blocks/fluids/fluid.potion.strength.splash.png | Bin 4320 -> 7229 bytes .../blocks/fluids/fluid.potion.strength.strong.png | Bin 4320 -> 7229 bytes .../fluids/fluid.potion.strength.strong.splash.png | Bin 4320 -> 7229 bytes .../blocks/fluids/fluid.potion.sweettea.png | Bin 4320 -> 7233 bytes .../textures/blocks/fluids/fluid.potion.tea.png | Bin 4320 -> 7233 bytes .../textures/blocks/fluids/fluid.potion.thick.png | Bin 5990 -> 13866 bytes .../blocks/fluids/fluid.potion.vinegar.png | Bin 5066 -> 10107 bytes .../textures/blocks/fluids/fluid.potion.vodka.png | Bin 5148 -> 10322 bytes .../fluids/fluid.potion.waterbreathing.long.png | Bin 4320 -> 7233 bytes .../fluid.potion.waterbreathing.long.splash.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.waterbreathing.png | Bin 4320 -> 7233 bytes .../fluids/fluid.potion.waterbreathing.splash.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.weakness.long.png | Bin 4320 -> 7233 bytes .../fluids/fluid.potion.weakness.long.splash.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.weakness.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.weakness.splash.png | Bin 4320 -> 7233 bytes .../blocks/fluids/fluid.potion.wheatyhopsjuice.png | Bin 4320 -> 7330 bytes .../blocks/fluids/fluid.potion.wheatyjuice.png | Bin 4393 -> 8064 bytes .../textures/blocks/fluids/fluid.potion.wine.png | Bin 4958 -> 9766 bytes .../textures/blocks/fluids/fluid.refinedglue.png | Bin 3242 -> 6278 bytes .../textures/blocks/fluids/fluid.seedoil.png | Bin 4457 -> 8876 bytes .../textures/blocks/fluids/fluid.silicon.png | Bin 4658 -> 9734 bytes .../textures/blocks/fluids/fluid.sodium.png | Bin 5990 -> 13866 bytes .../blocks/fluids/fluid.sodiumpersulfate.png | Bin 5133 -> 11851 bytes .../textures/blocks/fluids/fluid.squidink.png | Bin 3454 -> 4563 bytes .../textures/blocks/fluids/fluid.steam.png | Bin 1256 -> 2213 bytes .../blocks/fluids/fluid.titaniumtetrachloride.png | Bin 5327 -> 12870 bytes .../textures/blocks/fluids/fluid.uuamplifier.png | Bin 4320 -> 7231 bytes .../textures/blocks/fluids/fluid.wet.concrete.png | Bin 3431 -> 10116 bytes .../textures/blocks/fluids/fluid.wolframium.png | Bin 4435 -> 8242 bytes .../textures/blocks/iconsets/BASALT_BRICKS.png | Bin 424 -> 454 bytes .../blocks/iconsets/BASALT_BRICKS_CHISELED.png | Bin 419 -> 464 bytes .../blocks/iconsets/BASALT_BRICKS_CRACKED.png | Bin 427 -> 543 bytes .../blocks/iconsets/BASALT_BRICKS_MOSSY.png | Bin 664 -> 757 bytes .../textures/blocks/iconsets/BASALT_COBBLE.png | Bin 447 -> 757 bytes .../blocks/iconsets/BASALT_COBBLE_MOSSY.png | Bin 696 -> 878 bytes .../textures/blocks/iconsets/BLOCK_BLAZE.png | Bin 851 -> 15979 bytes .../textures/blocks/iconsets/BLOCK_DILITHIUM.png | Bin 495 -> 508 bytes .../textures/blocks/iconsets/BLOCK_FORCICIUM.png | Bin 511 -> 539 bytes .../textures/blocks/iconsets/BLOCK_FORCILLIUM.png | Bin 511 -> 539 bytes .../textures/blocks/iconsets/BLOCK_ICHORIUM.png | Bin 523 -> 3075 bytes .../blocks/iconsets/BLOCK_NAQUADAHPREIN.png | Bin 381 -> 2942 bytes .../textures/blocks/iconsets/BLOCK_NETHERSTAR.png | Bin 495 -> 508 bytes .../blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png | Bin 390 -> 2959 bytes .../textures/blocks/iconsets/BLOCK_ORDOCRYSTAL.png | Bin 495 -> 508 bytes .../blocks/iconsets/BLOCK_PERDITIOCRYSTAL.png | Bin 524 -> 545 bytes .../textures/blocks/iconsets/BLOCK_PLASCRETE.png | Bin 392 -> 499 bytes .../textures/blocks/iconsets/BLOCK_STEELEAF.png | Bin 510 -> 3063 bytes .../textures/blocks/iconsets/BLOCK_STEELPREIN.png | Bin 410 -> 3003 bytes .../blocks/iconsets/BLOCK_TITANIUMPREIN.png | Bin 452 -> 2998 bytes .../textures/blocks/iconsets/BLOCK_TRINIUM.png | Bin 486 -> 891 bytes .../blocks/iconsets/BLOCK_TUNGSTENSTEEL.png | Bin 517 -> 891 bytes .../textures/blocks/iconsets/CFOAM_HARDENED.png | Bin 392 -> 499 bytes .../iconsets/CONCRETE_DARK_BRICKS_CHISELED.png | Bin 445 -> 446 bytes .../iconsets/CONCRETE_DARK_BRICKS_CRACKED.png | Bin 450 -> 497 bytes .../blocks/iconsets/CONCRETE_DARK_BRICKS_MOSSY.png | Bin 636 -> 695 bytes .../blocks/iconsets/CONCRETE_DARK_COBBLE.png | Bin 483 -> 628 bytes .../blocks/iconsets/CONCRETE_DARK_COBBLE_MOSSY.png | Bin 670 -> 830 bytes .../blocks/iconsets/CONCRETE_LIGHT_BRICKS.png | Bin 467 -> 502 bytes .../iconsets/CONCRETE_LIGHT_BRICKS_CHISELED.png | Bin 460 -> 498 bytes .../iconsets/CONCRETE_LIGHT_BRICKS_CRACKED.png | Bin 471 -> 608 bytes .../iconsets/CONCRETE_LIGHT_BRICKS_MOSSY.png | Bin 659 -> 802 bytes .../blocks/iconsets/CONCRETE_LIGHT_COBBLE.png | Bin 497 -> 754 bytes .../iconsets/CONCRETE_LIGHT_COBBLE_MOSSY.png | Bin 689 -> 935 bytes .../textures/blocks/iconsets/COVER_WOOD_PLATE.png | Bin 392 -> 547 bytes .../iconsets/GRANITE_BLACK_BRICKS_CRACKED.png | Bin 417 -> 479 bytes .../blocks/iconsets/GRANITE_BLACK_BRICKS_MOSSY.png | Bin 664 -> 753 bytes .../blocks/iconsets/GRANITE_BLACK_COBBLE.png | Bin 434 -> 624 bytes .../blocks/iconsets/GRANITE_BLACK_COBBLE_MOSSY.png | Bin 696 -> 876 bytes .../blocks/iconsets/GRANITE_RED_BRICKS.png | Bin 539 -> 557 bytes .../iconsets/GRANITE_RED_BRICKS_CHISELED.png | Bin 538 -> 575 bytes .../blocks/iconsets/GRANITE_RED_BRICKS_CRACKED.png | Bin 569 -> 673 bytes .../blocks/iconsets/GRANITE_RED_BRICKS_MOSSY.png | Bin 713 -> 788 bytes .../blocks/iconsets/GRANITE_RED_COBBLE.png | Bin 639 -> 852 bytes .../blocks/iconsets/GRANITE_RED_COBBLE_MOSSY.png | Bin 786 -> 923 bytes .../blocks/iconsets/GRANITE_RED_SMOOTH.png | Bin 453 -> 512 bytes .../textures/blocks/iconsets/GRANITE_RED_STONE.png | Bin 386 -> 422 bytes .../textures/blocks/iconsets/INSULATION_LARGE.png | Bin 657 -> 1147 bytes .../blocks/iconsets/INSULATION_MEDIUM_PLUS.png | Bin 956 -> 1147 bytes .../blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png | Bin 884 -> 890 bytes .../blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png | Bin 1094 -> 1131 bytes .../blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png | Bin 1184 -> 1347 bytes .../blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png | Bin 827 -> 949 bytes .../blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png | Bin 1173 -> 1481 bytes .../blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png | Bin 1120 -> 1176 bytes .../blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png | Bin 884 -> 890 bytes .../blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png | Bin 884 -> 890 bytes .../iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png | Bin 660 -> 737 bytes .../blocks/iconsets/MACHINE_CASING_TANK.png | Bin 529 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_0.png | Bin 992 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_1.png | Bin 847 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_10.png | Bin 695 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_11.png | Bin 689 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_12.png | Bin 696 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_13.png | Bin 695 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_14.png | Bin 692 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_15.png | Bin 699 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_2.png | Bin 919 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_3.png | Bin 942 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_4.png | Bin 942 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_5.png | Bin 786 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_6.png | Bin 805 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_7.png | Bin 873 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_8.png | Bin 873 -> 3837 bytes .../blocks/iconsets/MACHINE_CASING_TANK_9.png | Bin 812 -> 3837 bytes .../iconsets/MACHINE_COIL_AWAKENEDDRACONIUM.png | Bin 755 -> 3211 bytes .../blocks/iconsets/MACHINE_COIL_ELECTRUMFLUX.png | Bin 767 -> 3211 bytes .../blocks/iconsets/MACHINE_MAXV_BOTTOM.png | Bin 608 -> 1147 bytes .../textures/blocks/iconsets/MACHINE_MAXV_SIDE.png | Bin 608 -> 1147 bytes .../textures/blocks/iconsets/MACHINE_MAXV_TOP.png | Bin 608 -> 1147 bytes .../blocks/iconsets/MACHINE_MAX_BOTTOM.png | Bin 469 -> 546 bytes .../textures/blocks/iconsets/MACHINE_MAX_SIDE.png | Bin 469 -> 546 bytes .../textures/blocks/iconsets/MACHINE_MAX_TOP.png | Bin 469 -> 546 bytes .../blocks/iconsets/MACHINE_OPV_BOTTOM.png | Bin 597 -> 1147 bytes .../textures/blocks/iconsets/MACHINE_OPV_SIDE.png | Bin 597 -> 1147 bytes .../textures/blocks/iconsets/MACHINE_OPV_TOP.png | Bin 597 -> 1147 bytes .../blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png | Bin 660 -> 737 bytes .../blocks/iconsets/MACHINE_UEV_BOTTOM.png | Bin 588 -> 1147 bytes .../textures/blocks/iconsets/MACHINE_UEV_SIDE.png | Bin 588 -> 1147 bytes .../textures/blocks/iconsets/MACHINE_UEV_TOP.png | Bin 588 -> 1147 bytes .../blocks/iconsets/MACHINE_UIV_BOTTOM.png | Bin 591 -> 1147 bytes .../textures/blocks/iconsets/MACHINE_UIV_SIDE.png | Bin 591 -> 1147 bytes .../textures/blocks/iconsets/MACHINE_UIV_TOP.png | Bin 591 -> 1147 bytes .../blocks/iconsets/MACHINE_UMV_BOTTOM.png | Bin 607 -> 1147 bytes .../textures/blocks/iconsets/MACHINE_UMV_SIDE.png | Bin 607 -> 1147 bytes .../textures/blocks/iconsets/MACHINE_UMV_TOP.png | Bin 607 -> 1147 bytes .../blocks/iconsets/MACHINE_UXV_BOTTOM.png | Bin 588 -> 1147 bytes .../textures/blocks/iconsets/MACHINE_UXV_SIDE.png | Bin 588 -> 1147 bytes .../textures/blocks/iconsets/MACHINE_UXV_TOP.png | Bin 588 -> 1147 bytes .../textures/blocks/iconsets/MARBLE_BRICKS.png | Bin 420 -> 440 bytes .../blocks/iconsets/MARBLE_BRICKS_CHISELED.png | Bin 415 -> 442 bytes .../blocks/iconsets/MARBLE_BRICKS_CRACKED.png | Bin 423 -> 533 bytes .../blocks/iconsets/MARBLE_BRICKS_MOSSY.png | Bin 664 -> 773 bytes .../textures/blocks/iconsets/MARBLE_COBBLE.png | Bin 443 -> 692 bytes .../blocks/iconsets/MARBLE_COBBLE_MOSSY.png | Bin 696 -> 920 bytes .../blocks/iconsets/OVERLAY_AUTOMAINTENANCE.png | Bin 838 -> 6347 bytes .../iconsets/OVERLAY_AUTOMAINTENANCE_IDLE.png | Bin 579 -> 2187 bytes .../blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png | Bin 664 -> 1147 bytes .../blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png | Bin 623 -> 1147 bytes .../iconsets/OVERLAY_FRONT_ROCK_BREAKER_ACTIVE.png | Bin 1131 -> 1425 bytes .../textures/blocks/iconsets/OVERLAY_SCHEST.png | Bin 705 -> 3400 bytes .../textures/blocks/iconsets/OVERLAY_SCREEN.png | Bin 705 -> 4267 bytes .../textures/blocks/iconsets/OVERLAY_STANK.png | Bin 705 -> 3400 bytes .../blocks/iconsets/OVERLAY_TELEPORTER.png | Bin 665 -> 1147 bytes .../blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png | Bin 382 -> 4267 bytes .../blocks/iconsets/OVERLAY_TELEPORTER_SIDES.png | Bin 753 -> 8439 bytes .../OVERLAY_TOP_STEAM_MACERATOR_ACTIVE.png | Bin 1040 -> 1371 bytes .../blocks/materialicons/DIAMOND/block1.png | Bin 490 -> 642 bytes .../blocks/materialicons/DIAMOND/block2.png | Bin 459 -> 620 bytes .../blocks/materialicons/DIAMOND/block3.png | Bin 490 -> 642 bytes .../blocks/materialicons/DIAMOND/block4.png | Bin 480 -> 655 bytes .../blocks/materialicons/DIAMOND/block5.png | Bin 414 -> 427 bytes .../blocks/materialicons/DIAMOND/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/DIAMOND/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/DIAMOND/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/DIAMOND/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/DIAMOND/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/DULL/block1.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/DULL/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/DULL/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/DULL/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/DULL/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/DULL/block6.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/DULL/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/DULL/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/DULL/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/DULL/pipeSmall.png | Bin 427 -> 429 bytes .../blocks/materialicons/EMERALD/block1.png | Bin 490 -> 642 bytes .../blocks/materialicons/EMERALD/block2.png | Bin 459 -> 620 bytes .../blocks/materialicons/EMERALD/block3.png | Bin 490 -> 642 bytes .../blocks/materialicons/EMERALD/block4.png | Bin 480 -> 655 bytes .../blocks/materialicons/EMERALD/block5.png | Bin 414 -> 427 bytes .../blocks/materialicons/EMERALD/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/EMERALD/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/EMERALD/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/EMERALD/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/EMERALD/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/FIERY/block1.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/FIERY/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/FIERY/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/FIERY/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/FIERY/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/FIERY/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/FIERY/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/FIERY/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/FIERY/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/FIERY/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/FINE/block1.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/FINE/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/FINE/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/FINE/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/FINE/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/FINE/block6.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/FINE/frameGt.png | Bin 437 -> 441 bytes .../textures/blocks/materialicons/FINE/ore.png | Bin 456 -> 527 bytes .../blocks/materialicons/FINE/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/FINE/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/FINE/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/FLINT/block1.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/FLINT/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/FLINT/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/FLINT/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/FLINT/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/FLINT/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/FLINT/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/FLINT/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/FLINT/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/FLINT/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/FLUID/block1.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/FLUID/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/FLUID/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/FLUID/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/FLUID/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/FLUID/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/FLUID/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/FLUID/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/FLUID/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/FLUID/pipeSmall.png | Bin 427 -> 429 bytes .../blocks/materialicons/GEM_HORIZONTAL/block1.png | Bin 490 -> 642 bytes .../blocks/materialicons/GEM_HORIZONTAL/block2.png | Bin 459 -> 620 bytes .../blocks/materialicons/GEM_HORIZONTAL/block3.png | Bin 490 -> 642 bytes .../blocks/materialicons/GEM_HORIZONTAL/block4.png | Bin 480 -> 655 bytes .../blocks/materialicons/GEM_HORIZONTAL/block5.png | Bin 414 -> 427 bytes .../blocks/materialicons/GEM_HORIZONTAL/block6.png | Bin 437 -> 504 bytes .../materialicons/GEM_HORIZONTAL/frameGt.png | Bin 437 -> 441 bytes .../materialicons/GEM_HORIZONTAL/pipeLarge.png | Bin 429 -> 446 bytes .../materialicons/GEM_HORIZONTAL/pipeMedium.png | Bin 429 -> 442 bytes .../materialicons/GEM_HORIZONTAL/pipeSmall.png | Bin 427 -> 429 bytes .../blocks/materialicons/GEM_VERTICAL/block1.png | Bin 490 -> 642 bytes .../blocks/materialicons/GEM_VERTICAL/block2.png | Bin 459 -> 620 bytes .../blocks/materialicons/GEM_VERTICAL/block3.png | Bin 490 -> 642 bytes .../blocks/materialicons/GEM_VERTICAL/block4.png | Bin 480 -> 655 bytes .../blocks/materialicons/GEM_VERTICAL/block5.png | Bin 414 -> 427 bytes .../blocks/materialicons/GEM_VERTICAL/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/GEM_VERTICAL/frameGt.png | Bin 437 -> 441 bytes .../materialicons/GEM_VERTICAL/pipeLarge.png | Bin 429 -> 446 bytes .../materialicons/GEM_VERTICAL/pipeMedium.png | Bin 429 -> 442 bytes .../materialicons/GEM_VERTICAL/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/GLASS/block1.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/GLASS/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/GLASS/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/GLASS/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/GLASS/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/GLASS/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/GLASS/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/GLASS/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/GLASS/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/GLASS/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/LAPIS/block1.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/LAPIS/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/LAPIS/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/LAPIS/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/LAPIS/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/LAPIS/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/LAPIS/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/LAPIS/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/LAPIS/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/LAPIS/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/LEAF/block1.png | Bin 487 -> 684 bytes .../textures/blocks/materialicons/LEAF/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/LEAF/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/LEAF/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/LEAF/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/LEAF/block6.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/LEAF/frameGt.png | Bin 437 -> 441 bytes .../textures/blocks/materialicons/LEAF/ore.png | Bin 456 -> 527 bytes .../blocks/materialicons/LIGNITE/block1.png | Bin 459 -> 620 bytes .../blocks/materialicons/LIGNITE/block2.png | Bin 459 -> 620 bytes .../blocks/materialicons/LIGNITE/block3.png | Bin 490 -> 642 bytes .../blocks/materialicons/LIGNITE/block4.png | Bin 480 -> 655 bytes .../blocks/materialicons/LIGNITE/block5.png | Bin 414 -> 427 bytes .../blocks/materialicons/LIGNITE/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/LIGNITE/frameGt.png | Bin 437 -> 441 bytes .../textures/blocks/materialicons/LIGNITE/ore.png | Bin 456 -> 527 bytes .../blocks/materialicons/LIGNITE/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/LIGNITE/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/LIGNITE/pipeSmall.png | Bin 427 -> 429 bytes .../blocks/materialicons/MAGNETIC/block1.png | Bin 437 -> 504 bytes .../blocks/materialicons/MAGNETIC/block2.png | Bin 459 -> 620 bytes .../blocks/materialicons/MAGNETIC/block3.png | Bin 490 -> 642 bytes .../blocks/materialicons/MAGNETIC/block4.png | Bin 480 -> 655 bytes .../blocks/materialicons/MAGNETIC/block5.png | Bin 414 -> 427 bytes .../blocks/materialicons/MAGNETIC/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/MAGNETIC/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/MAGNETIC/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/MAGNETIC/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/MAGNETIC/pipeSmall.png | Bin 427 -> 429 bytes .../blocks/materialicons/METALLIC/block1.png | Bin 437 -> 504 bytes .../blocks/materialicons/METALLIC/block2.png | Bin 459 -> 620 bytes .../blocks/materialicons/METALLIC/block3.png | Bin 490 -> 642 bytes .../blocks/materialicons/METALLIC/block4.png | Bin 480 -> 655 bytes .../blocks/materialicons/METALLIC/block5.png | Bin 414 -> 427 bytes .../blocks/materialicons/METALLIC/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/METALLIC/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/METALLIC/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/METALLIC/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/METALLIC/pipeSmall.png | Bin 427 -> 429 bytes .../blocks/materialicons/NETHERSTAR/block1.png | Bin 490 -> 642 bytes .../blocks/materialicons/NETHERSTAR/block2.png | Bin 459 -> 620 bytes .../blocks/materialicons/NETHERSTAR/block3.png | Bin 490 -> 642 bytes .../blocks/materialicons/NETHERSTAR/block4.png | Bin 480 -> 655 bytes .../blocks/materialicons/NETHERSTAR/block5.png | Bin 414 -> 427 bytes .../blocks/materialicons/NETHERSTAR/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/NETHERSTAR/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/NETHERSTAR/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/NETHERSTAR/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/NETHERSTAR/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/NONE/block1.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/NONE/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/NONE/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/NONE/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/NONE/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/NONE/block6.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/NONE/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/NONE/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/NONE/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/NONE/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/OPAL/block1.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/OPAL/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/OPAL/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/OPAL/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/OPAL/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/OPAL/block6.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/OPAL/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/OPAL/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/OPAL/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/OPAL/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/PAPER/block1.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/PAPER/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/PAPER/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/PAPER/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/PAPER/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/PAPER/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/PAPER/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/PAPER/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/PAPER/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/PAPER/pipeSmall.png | Bin 427 -> 429 bytes .../blocks/materialicons/POWDER/block1.png | Bin 459 -> 620 bytes .../blocks/materialicons/POWDER/block2.png | Bin 459 -> 620 bytes .../blocks/materialicons/POWDER/block3.png | Bin 490 -> 642 bytes .../blocks/materialicons/POWDER/block4.png | Bin 480 -> 655 bytes .../blocks/materialicons/POWDER/block5.png | Bin 414 -> 427 bytes .../blocks/materialicons/POWDER/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/POWDER/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/POWDER/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/POWDER/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/POWDER/pipeSmall.png | Bin 427 -> 429 bytes .../blocks/materialicons/QUARTZ/block1.png | Bin 437 -> 504 bytes .../blocks/materialicons/QUARTZ/block2.png | Bin 459 -> 620 bytes .../blocks/materialicons/QUARTZ/block3.png | Bin 490 -> 642 bytes .../blocks/materialicons/QUARTZ/block4.png | Bin 480 -> 655 bytes .../blocks/materialicons/QUARTZ/block5.png | Bin 414 -> 427 bytes .../blocks/materialicons/QUARTZ/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/QUARTZ/frameGt.png | Bin 437 -> 441 bytes .../textures/blocks/materialicons/QUARTZ/ore.png | Bin 456 -> 527 bytes .../blocks/materialicons/QUARTZ/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/QUARTZ/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/QUARTZ/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/ROUGH/block1.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/ROUGH/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/ROUGH/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/ROUGH/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/ROUGH/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/ROUGH/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/ROUGH/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/ROUGH/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/ROUGH/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/ROUGH/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/RUBY/block1.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/RUBY/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/RUBY/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/RUBY/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/RUBY/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/RUBY/block6.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/RUBY/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/RUBY/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/RUBY/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/RUBY/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/SAND/block1.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/SAND/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/SAND/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/SAND/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/SAND/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/SAND/block6.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/SAND/frameGt.png | Bin 437 -> 441 bytes .../textures/blocks/materialicons/SAND/ore.png | Bin 456 -> 527 bytes .../blocks/materialicons/SAND/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/SAND/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/SAND/pipeSmall.png | Bin 427 -> 429 bytes .../blocks/materialicons/SHARDS/block1.png | Bin 490 -> 642 bytes .../blocks/materialicons/SHARDS/block2.png | Bin 459 -> 620 bytes .../blocks/materialicons/SHARDS/block3.png | Bin 490 -> 642 bytes .../blocks/materialicons/SHARDS/block4.png | Bin 480 -> 655 bytes .../blocks/materialicons/SHARDS/block5.png | Bin 414 -> 427 bytes .../blocks/materialicons/SHARDS/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/SHARDS/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/SHARDS/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/SHARDS/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/SHARDS/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/SHINY/block1.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/SHINY/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/SHINY/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/SHINY/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/SHINY/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/SHINY/block6.png | Bin 437 -> 504 bytes .../blocks/materialicons/SHINY/frameGt.png | Bin 437 -> 441 bytes .../blocks/materialicons/SHINY/pipeLarge.png | Bin 429 -> 446 bytes .../blocks/materialicons/SHINY/pipeMedium.png | Bin 429 -> 442 bytes .../blocks/materialicons/SHINY/pipeSmall.png | Bin 427 -> 429 bytes .../textures/blocks/materialicons/WOOD/block1.png | Bin 487 -> 684 bytes .../textures/blocks/materialicons/WOOD/block2.png | Bin 459 -> 620 bytes .../textures/blocks/materialicons/WOOD/block3.png | Bin 490 -> 642 bytes .../textures/blocks/materialicons/WOOD/block4.png | Bin 480 -> 655 bytes .../textures/blocks/materialicons/WOOD/block5.png | Bin 414 -> 427 bytes .../textures/blocks/materialicons/WOOD/block6.png | Bin 437 -> 504 bytes .../textures/blocks/materialicons/WOOD/frameGt.png | Bin 437 -> 441 bytes .../textures/blocks/materialicons/WOOD/ore.png | Bin 456 -> 527 bytes .../assets/gregtech/textures/gui/1by1.png | Bin 822 -> 3447 bytes .../assets/gregtech/textures/gui/2by2.png | Bin 832 -> 3453 bytes .../assets/gregtech/textures/gui/3by3.png | Bin 843 -> 3603 bytes .../assets/gregtech/textures/gui/4by4.png | Bin 840 -> 3659 bytes .../textures/gui/AdvancedCraftingTable.png | Bin 1212 -> 4330 bytes .../assets/gregtech/textures/gui/BasicTank.png | Bin 954 -> 3977 bytes .../gregtech/textures/gui/BrickedBlastFurnace.png | Bin 1327 -> 2608 bytes .../gregtech/textures/gui/BronzeBlastFurnace.png | Bin 1290 -> 2345 bytes .../assets/gregtech/textures/gui/BronzeBoiler.png | Bin 1390 -> 4397 bytes .../gregtech/textures/gui/BronzeCraftingTable.png | Bin 1057 -> 2053 bytes .../assets/gregtech/textures/gui/ChestBuffer.png | Bin 1304 -> 4515 bytes .../gregtech/textures/gui/ComputerCubeRedstone.png | Bin 1232 -> 2877 bytes .../assets/gregtech/textures/gui/CropHarvestor.png | Bin 1090 -> 3943 bytes .../gregtech/textures/gui/DataAccess2by2.png | Bin 927 -> 2120 bytes .../gregtech/textures/gui/DataAccess4by4.png | Bin 957 -> 2226 bytes .../textures/gui/ElectricAutoWorkbench.png | Bin 1678 -> 5621 bytes .../gregtech/textures/gui/ElectricBufferSmall.png | Bin 1083 -> 3943 bytes .../gregtech/textures/gui/ElectricItemCleaner.png | Bin 1090 -> 3944 bytes .../gregtech/textures/gui/FakeAssemblyline.png | Bin 1061 -> 262931 bytes .../assets/gregtech/textures/gui/Filter.png | Bin 1274 -> 2712 bytes .../assets/gregtech/textures/gui/Implosion.png | Bin 1191 -> 4231 bytes .../gregtech/textures/gui/InventoryManager.png | Bin 2376 -> 6812 bytes .../gregtech/textures/gui/ItemDistributor.png | Bin 1070 -> 4084 bytes .../assets/gregtech/textures/gui/MagicAbsorber.png | Bin 2671 -> 5722 bytes .../assets/gregtech/textures/gui/Maintenance.png | Bin 875 -> 3480 bytes .../gregtech/textures/gui/RedstoneCircuitBlock.png | Bin 1460 -> 4700 bytes .../assets/gregtech/textures/gui/Regulator.png | Bin 1075 -> 1986 bytes .../assets/gregtech/textures/gui/Retriever.png | Bin 1036 -> 2395 bytes .../assets/gregtech/textures/gui/Safe.png | Bin 883 -> 3531 bytes .../assets/gregtech/textures/gui/SolarBoiler.png | Bin 1308 -> 2602 bytes .../assets/gregtech/textures/gui/SolarHPBoiler.png | Bin 2243 -> 0 bytes .../assets/gregtech/textures/gui/Sonictron.png | Bin 842 -> 3716 bytes .../assets/gregtech/textures/gui/SteelBoiler.png | Bin 1411 -> 2366 bytes .../assets/gregtech/textures/gui/SuperBuffer.png | Bin 4778 -> 7635 bytes .../assets/gregtech/textures/gui/Teleporter.png | Bin 981 -> 3909 bytes .../gregtech/textures/gui/Tradeomat_Inventory.png | Bin 864 -> 1831 bytes .../gregtech/textures/gui/Tradeomat_Main.png | Bin 900 -> 1746 bytes .../gregtech/textures/gui/Tradeomat_Settings.png | Bin 895 -> 2085 bytes .../assets/gregtech/textures/gui/TypeFilter.png | Bin 1259 -> 2669 bytes .../gregtech/textures/gui/VolumetricFlask.png | Bin 647 -> 663 bytes .../assets/gregtech/textures/gui/armorgui3x3.png | Bin 2049 -> 3764 bytes .../assets/gregtech/textures/gui/armorgui3x4.png | Bin 2718 -> 4978 bytes .../textures/gui/basicmachines/AlloySmelter.png | Bin 1484 -> 3084 bytes .../textures/gui/basicmachines/Amplifabricator.png | Bin 1459 -> 2534 bytes .../textures/gui/basicmachines/ArcFurnace.png | Bin 1360 -> 2994 bytes .../textures/gui/basicmachines/Assembler.png | Bin 1383 -> 3124 bytes .../textures/gui/basicmachines/Assembler2.png | Bin 1453 -> 7966 bytes .../textures/gui/basicmachines/Autoclave.png | Bin 1439 -> 2508 bytes .../gregtech/textures/gui/basicmachines/Bender.png | Bin 1403 -> 3137 bytes .../gui/basicmachines/BronzeAlloySmelter.png | Bin 1578 -> 2541 bytes .../gui/basicmachines/BronzeCompressor.png | Bin 1489 -> 2416 bytes .../textures/gui/basicmachines/BronzeExtractor.png | Bin 1545 -> 2460 bytes .../textures/gui/basicmachines/BronzeFurnace.png | Bin 1537 -> 2482 bytes .../textures/gui/basicmachines/BronzeHammer.png | Bin 1464 -> 2394 bytes .../textures/gui/basicmachines/BronzeMacerator.png | Bin 1612 -> 2532 bytes .../gregtech/textures/gui/basicmachines/Canner.png | Bin 1453 -> 2507 bytes .../textures/gui/basicmachines/Centrifuge.png | Bin 1523 -> 2645 bytes .../textures/gui/basicmachines/ChemicalBath.png | Bin 1448 -> 2696 bytes .../textures/gui/basicmachines/ChemicalReactor.png | Bin 1721 -> 3687 bytes .../gui/basicmachines/CircuitAssembler.png | Bin 1548 -> 2773 bytes .../textures/gui/basicmachines/Compressor.png | Bin 1394 -> 2931 bytes .../gregtech/textures/gui/basicmachines/Cutter.png | Bin 1418 -> 3098 bytes .../textures/gui/basicmachines/Cutter2.png | Bin 1400 -> 5160 bytes .../textures/gui/basicmachines/Default.png | Bin 1186 -> 2631 bytes .../textures/gui/basicmachines/Disassembler.png | Bin 1452 -> 3204 bytes .../gui/basicmachines/DistillationTower.png | Bin 1572 -> 2788 bytes .../textures/gui/basicmachines/Distillery.png | Bin 1557 -> 2753 bytes .../textures/gui/basicmachines/E_Furnace.png | Bin 1451 -> 3042 bytes .../gregtech/textures/gui/basicmachines/E_Oven.png | Bin 1451 -> 3042 bytes .../textures/gui/basicmachines/Electrolyzer.png | Bin 1535 -> 2596 bytes .../gui/basicmachines/ElectromagneticSeparator.png | Bin 1473 -> 2626 bytes .../textures/gui/basicmachines/Extractor.png | Bin 1445 -> 3004 bytes .../textures/gui/basicmachines/Extruder.png | Bin 1612 -> 3153 bytes .../textures/gui/basicmachines/Fermenter.png | Bin 1384 -> 3051 bytes .../textures/gui/basicmachines/FluidCanner.png | Bin 1485 -> 3114 bytes .../textures/gui/basicmachines/FluidCannerNEI.png | Bin 1491 -> 3126 bytes .../textures/gui/basicmachines/FluidExtractor.png | Bin 1464 -> 3049 bytes .../textures/gui/basicmachines/FluidHeater.png | Bin 1526 -> 2721 bytes .../textures/gui/basicmachines/FluidSolidifier.png | Bin 2020 -> 2753 bytes .../textures/gui/basicmachines/FusionReactor.png | Bin 1216 -> 4782 bytes .../gregtech/textures/gui/basicmachines/Hammer.png | Bin 1344 -> 2338 bytes .../textures/gui/basicmachines/LaserEngraver.png | Bin 1772 -> 2771 bytes .../gregtech/textures/gui/basicmachines/Lathe.png | Bin 1455 -> 3070 bytes .../textures/gui/basicmachines/Macerator1.png | Bin 1501 -> 3226 bytes .../textures/gui/basicmachines/Macerator2.png | Bin 1528 -> 3287 bytes .../textures/gui/basicmachines/Macerator3.png | Bin 1531 -> 3286 bytes .../textures/gui/basicmachines/Macerator4.png | Bin 1590 -> 3473 bytes .../textures/gui/basicmachines/Massfabricator.png | Bin 1459 -> 3132 bytes .../gregtech/textures/gui/basicmachines/Miner.png | Bin 1374 -> 2391 bytes .../gregtech/textures/gui/basicmachines/Mixer.png | Bin 1644 -> 5663 bytes .../textures/gui/basicmachines/NineXNine.png | Bin 1186 -> 2631 bytes .../textures/gui/basicmachines/OilCracker.png | Bin 1216 -> 4782 bytes .../textures/gui/basicmachines/OreWasher.png | Bin 1616 -> 3462 bytes .../textures/gui/basicmachines/Packager.png | Bin 1452 -> 3021 bytes .../gui/basicmachines/PlasmaArcFurnace.png | Bin 1366 -> 2375 bytes .../textures/gui/basicmachines/Polarizer.png | Bin 1337 -> 2360 bytes .../textures/gui/basicmachines/PotionBrewer.png | Bin 1438 -> 3162 bytes .../gregtech/textures/gui/basicmachines/Press.png | Bin 1414 -> 2442 bytes .../textures/gui/basicmachines/Printer.png | Bin 1461 -> 3082 bytes .../textures/gui/basicmachines/Recycler.png | Bin 1483 -> 3122 bytes .../textures/gui/basicmachines/Replicator.png | Bin 1486 -> 3164 bytes .../textures/gui/basicmachines/RockBreaker.png | Bin 1494 -> 3225 bytes .../textures/gui/basicmachines/Scanner.png | Bin 1494 -> 3116 bytes .../gregtech/textures/gui/basicmachines/Sifter.png | Bin 1454 -> 2569 bytes .../gregtech/textures/gui/basicmachines/Slicer.png | Bin 1777 -> 3351 bytes .../gui/basicmachines/SteelAlloySmelter.png | Bin 1585 -> 2545 bytes .../textures/gui/basicmachines/SteelCompressor.png | Bin 1493 -> 2418 bytes .../textures/gui/basicmachines/SteelExtractor.png | Bin 1549 -> 2462 bytes .../textures/gui/basicmachines/SteelFurnace.png | Bin 1537 -> 2482 bytes .../textures/gui/basicmachines/SteelHammer.png | Bin 1469 -> 2404 bytes .../textures/gui/basicmachines/SteelMacerator.png | Bin 1617 -> 2534 bytes .../gui/basicmachines/ThermalCentrifuge.png | Bin 1517 -> 3209 bytes .../textures/gui/basicmachines/Unpackager.png | Bin 1421 -> 2992 bytes .../textures/gui/basicmachines/Wiremill.png | Bin 1401 -> 2971 bytes .../textures/gui/multimachines/Advanced_Miner2.png | Bin 873 -> 4373 bytes .../textures/gui/multimachines/AssemblyLine.png | Bin 934 -> 2116 bytes .../gui/multimachines/DistillationTower.png | Bin 864 -> 4366 bytes .../textures/gui/multimachines/DrillingRig.png | Bin 898 -> 265621 bytes .../gui/multimachines/ElectricBlastFurnace.png | Bin 964 -> 2210 bytes .../textures/gui/multimachines/FusionComputer.png | Bin 1729 -> 5280 bytes .../gui/multimachines/ImplosionCompressor.png | Bin 934 -> 2116 bytes .../textures/gui/multimachines/LargeBoiler.png | Bin 961 -> 2258 bytes .../gui/multimachines/LargeChemicalReactor.png | Bin 940 -> 2129 bytes .../gui/multimachines/LargeDieselEngine.png | Bin 952 -> 1870 bytes .../gui/multimachines/LargeHeatExchanger.png | Bin 912 -> 4437 bytes .../textures/gui/multimachines/LargeTurbine.png | Bin 867 -> 4313 bytes .../textures/gui/multimachines/MultiFurnace.png | Bin 944 -> 2113 bytes .../gui/multimachines/MultiblockDisplay.png | Bin 899 -> 3644 bytes .../textures/gui/multimachines/OilCrackingUnit.png | Bin 887 -> 4379 bytes .../gui/multimachines/OreDrillingPlant.png | Bin 873 -> 4364 bytes .../textures/gui/multimachines/ProcessingArray.png | Bin 934 -> 2116 bytes .../textures/gui/multimachines/PyrolyseOven.png | Bin 898 -> 4426 bytes .../textures/gui/multimachines/VacuumFreezer.png | Bin 934 -> 2116 bytes .../textures/items/gt.360k_NaK_Coolantcell.png | Bin 453 -> 480 bytes .../gregtech/textures/items/gt.Double_MNqCell.png | Bin 428 -> 1147 bytes .../textures/items/gt.Double_MNqCellDep.png | Bin 431 -> 1147 bytes .../textures/items/gt.Double_Naquadahcell.png | Bin 424 -> 1147 bytes .../textures/items/gt.Double_NaquadahcellDep.png | Bin 424 -> 1147 bytes .../assets/gregtech/textures/items/gt.MNqCell.png | Bin 402 -> 1147 bytes .../gregtech/textures/items/gt.MNqCellDep.png | Bin 411 -> 1147 bytes .../gregtech/textures/items/gt.Naquadahcell.png | Bin 399 -> 1147 bytes .../gregtech/textures/items/gt.NaquadahcellDep.png | Bin 399 -> 1147 bytes .../gregtech/textures/items/gt.Quad_MNqCell.png | Bin 501 -> 1147 bytes .../gregtech/textures/items/gt.Quad_MNqCellDep.png | Bin 504 -> 1147 bytes .../textures/items/gt.Quad_Naquadahcell.png | Bin 491 -> 1147 bytes .../textures/items/gt.Quad_NaquadahcellDep.png | Bin 491 -> 1147 bytes .../textures/items/gt.Quad_Thoriumcell.png | Bin 442 -> 469 bytes .../textures/items/gt.Quad_ThoriumcellDep.png | Bin 442 -> 469 bytes .../textures/items/gt.Volumetric_Flask.window.png | Bin 360 -> 409 bytes .../gregtech/textures/items/gt.metaitem.01/0.png | Bin 486 -> 530 bytes .../gregtech/textures/items/gt.metaitem.01/1.png | Bin 486 -> 534 bytes .../gregtech/textures/items/gt.metaitem.01/11.png | Bin 524 -> 573 bytes .../gregtech/textures/items/gt.metaitem.01/13.png | Bin 514 -> 552 bytes .../gregtech/textures/items/gt.metaitem.01/14.png | Bin 509 -> 551 bytes .../gregtech/textures/items/gt.metaitem.01/16.png | Bin 501 -> 504 bytes .../gregtech/textures/items/gt.metaitem.01/2.png | Bin 486 -> 519 bytes .../gregtech/textures/items/gt.metaitem.01/3.png | Bin 476 -> 517 bytes .../gregtech/textures/items/gt.metaitem.01/300.png | Bin 767 -> 3024 bytes .../gregtech/textures/items/gt.metaitem.01/318.png | Bin 720 -> 3066 bytes .../gregtech/textures/items/gt.metaitem.01/319.png | Bin 764 -> 3060 bytes .../gregtech/textures/items/gt.metaitem.01/320.png | Bin 819 -> 3098 bytes .../gregtech/textures/items/gt.metaitem.01/321.png | Bin 803 -> 3112 bytes .../gregtech/textures/items/gt.metaitem.01/322.png | Bin 815 -> 3129 bytes .../gregtech/textures/items/gt.metaitem.01/323.png | Bin 709 -> 3034 bytes .../gregtech/textures/items/gt.metaitem.01/324.png | Bin 896 -> 3222 bytes .../gregtech/textures/items/gt.metaitem.01/325.png | Bin 857 -> 3143 bytes .../gregtech/textures/items/gt.metaitem.01/374.png | Bin 693 -> 3157 bytes .../gregtech/textures/items/gt.metaitem.01/375.png | Bin 709 -> 3090 bytes .../gregtech/textures/items/gt.metaitem.01/376.png | Bin 654 -> 3057 bytes .../gregtech/textures/items/gt.metaitem.01/4.png | Bin 476 -> 504 bytes .../gregtech/textures/items/gt.metaitem.01/407.png | Bin 396 -> 2975 bytes .../gregtech/textures/items/gt.metaitem.01/408.png | Bin 386 -> 2959 bytes .../gregtech/textures/items/gt.metaitem.01/409.png | Bin 372 -> 2932 bytes .../gregtech/textures/items/gt.metaitem.01/410.png | Bin 364 -> 2917 bytes .../gregtech/textures/items/gt.metaitem.01/411.png | Bin 360 -> 2955 bytes .../gregtech/textures/items/gt.metaitem.01/412.png | Bin 396 -> 2966 bytes .../gregtech/textures/items/gt.metaitem.01/413.png | Bin 354 -> 2941 bytes .../gregtech/textures/items/gt.metaitem.01/462.png | Bin 462 -> 528 bytes .../gregtech/textures/items/gt.metaitem.01/463.png | Bin 467 -> 537 bytes .../gregtech/textures/items/gt.metaitem.01/464.png | Bin 468 -> 526 bytes .../gregtech/textures/items/gt.metaitem.01/482.png | Bin 476 -> 509 bytes .../gregtech/textures/items/gt.metaitem.01/483.png | Bin 514 -> 593 bytes .../gregtech/textures/items/gt.metaitem.01/484.png | Bin 494 -> 538 bytes .../gregtech/textures/items/gt.metaitem.01/5.png | Bin 486 -> 502 bytes .../textures/items/gt.metaitem.01/597/1.png | Bin 420 -> 1147 bytes .../textures/items/gt.metaitem.01/597/2.png | Bin 420 -> 1147 bytes .../textures/items/gt.metaitem.01/597/3.png | Bin 420 -> 1147 bytes .../textures/items/gt.metaitem.01/597/4.png | Bin 420 -> 1147 bytes .../textures/items/gt.metaitem.01/597/5.png | Bin 420 -> 1147 bytes .../textures/items/gt.metaitem.01/597/6.png | Bin 420 -> 1147 bytes .../textures/items/gt.metaitem.01/597/7.png | Bin 420 -> 1147 bytes .../textures/items/gt.metaitem.01/597/8.png | Bin 420 -> 1147 bytes .../gregtech/textures/items/gt.metaitem.01/6.png | Bin 485 -> 500 bytes .../textures/items/gt.metaitem.01/609/1.png | Bin 2156 -> 4235 bytes .../textures/items/gt.metaitem.01/609/2.png | Bin 2155 -> 4235 bytes .../textures/items/gt.metaitem.01/609/3.png | Bin 2154 -> 4235 bytes .../textures/items/gt.metaitem.01/609/4.png | Bin 2141 -> 4235 bytes .../textures/items/gt.metaitem.01/609/5.png | Bin 2132 -> 4235 bytes .../textures/items/gt.metaitem.01/609/6.png | Bin 2147 -> 4235 bytes .../textures/items/gt.metaitem.01/609/7.png | Bin 2154 -> 4235 bytes .../textures/items/gt.metaitem.01/609/8.png | Bin 2107 -> 4235 bytes .../gregtech/textures/items/gt.metaitem.01/660.png | Bin 752 -> 3173 bytes .../gregtech/textures/items/gt.metaitem.01/661.png | Bin 632 -> 3209 bytes .../gregtech/textures/items/gt.metaitem.01/662.png | Bin 637 -> 3220 bytes .../gregtech/textures/items/gt.metaitem.01/663.png | Bin 669 -> 3201 bytes .../gregtech/textures/items/gt.metaitem.01/664.png | Bin 678 -> 3206 bytes .../gregtech/textures/items/gt.metaitem.01/665.png | Bin 709 -> 3236 bytes .../gregtech/textures/items/gt.metaitem.01/666.png | Bin 710 -> 3228 bytes .../gregtech/textures/items/gt.metaitem.01/667.png | Bin 697 -> 3221 bytes .../gregtech/textures/items/gt.metaitem.01/669.png | Bin 371 -> 2898 bytes .../gregtech/textures/items/gt.metaitem.01/7.png | Bin 485 -> 497 bytes .../gregtech/textures/items/gt.metaitem.01/702.png | Bin 391 -> 2992 bytes .../gregtech/textures/items/gt.metaitem.01/722.png | Bin 448 -> 476 bytes .../gregtech/textures/items/gt.metaitem.01/723.png | Bin 453 -> 518 bytes .../gregtech/textures/items/gt.metaitem.01/750.png | Bin 537 -> 3093 bytes .../gregtech/textures/items/gt.metaitem.01/751.png | Bin 537 -> 3137 bytes .../gregtech/textures/items/gt.metaitem.01/752.png | Bin 534 -> 3107 bytes .../gregtech/textures/items/gt.metaitem.01/753.png | Bin 532 -> 3121 bytes .../gregtech/textures/items/gt.metaitem.01/754.png | Bin 534 -> 3118 bytes .../gregtech/textures/items/gt.metaitem.01/755.png | Bin 534 -> 3122 bytes .../gregtech/textures/items/gt.metaitem.01/756.png | Bin 537 -> 3125 bytes .../gregtech/textures/items/gt.metaitem.01/757.png | Bin 539 -> 3123 bytes .../gregtech/textures/items/gt.metaitem.01/758.png | Bin 527 -> 3136 bytes .../gregtech/textures/items/gt.metaitem.01/759.png | Bin 536 -> 3104 bytes .../gregtech/textures/items/gt.metaitem.01/763.png | Bin 1397 -> 1839 bytes .../gregtech/textures/items/gt.metaitem.02/202.png | Bin 678 -> 682 bytes .../gregtech/textures/items/gt.metaitem.02/214.png | Bin 470 -> 487 bytes .../gregtech/textures/items/gt.metaitem.02/220.png | Bin 553 -> 618 bytes .../gregtech/textures/items/gt.metaitem.02/221.png | Bin 606 -> 659 bytes .../gregtech/textures/items/gt.metaitem.02/222.png | Bin 654 -> 677 bytes .../gregtech/textures/items/gt.metaitem.02/223.png | Bin 634 -> 645 bytes .../gregtech/textures/items/gt.metaitem.02/224.png | Bin 628 -> 688 bytes .../gregtech/textures/items/gt.metaitem.02/230.png | Bin 529 -> 565 bytes .../gregtech/textures/items/gt.metaitem.02/233.png | Bin 630 -> 635 bytes .../gregtech/textures/items/gt.metaitem.02/240.png | Bin 539 -> 601 bytes .../gregtech/textures/items/gt.metaitem.02/241.png | Bin 582 -> 628 bytes .../gregtech/textures/items/gt.metaitem.02/242.png | Bin 640 -> 654 bytes .../gregtech/textures/items/gt.metaitem.02/243.png | Bin 627 -> 689 bytes .../gregtech/textures/items/gt.metaitem.02/419.png | Bin 461 -> 485 bytes .../gregtech/textures/items/gt.metaitem.02/425.png | Bin 560 -> 618 bytes .../gregtech/textures/items/gt.metaitem.02/426.png | Bin 577 -> 586 bytes .../gregtech/textures/items/gt.metaitem.02/427.png | Bin 577 -> 594 bytes .../gregtech/textures/items/gt.metaitem.02/470.png | Bin 453 -> 521 bytes .../gregtech/textures/items/gt.metaitem.02/471.png | Bin 466 -> 511 bytes .../gregtech/textures/items/gt.metaitem.02/472.png | Bin 468 -> 521 bytes .../gregtech/textures/items/gt.metaitem.02/473.png | Bin 461 -> 547 bytes .../gregtech/textures/items/gt.metaitem.02/474.png | Bin 461 -> 499 bytes .../gregtech/textures/items/gt.metaitem.02/476.png | Bin 453 -> 489 bytes .../gregtech/textures/items/gt.metaitem.02/477.png | Bin 453 -> 514 bytes .../gregtech/textures/items/gt.metaitem.02/478.png | Bin 453 -> 520 bytes .../gregtech/textures/items/gt.metaitem.02/479.png | Bin 453 -> 522 bytes .../gregtech/textures/items/gt.metaitem.02/480.png | Bin 453 -> 520 bytes .../gregtech/textures/items/gt.metaitem.02/481.png | Bin 410 -> 473 bytes .../gregtech/textures/items/gt.metaitem.02/482.png | Bin 453 -> 519 bytes .../gregtech/textures/items/gt.metaitem.02/483.png | Bin 453 -> 501 bytes .../gregtech/textures/items/gt.metaitem.02/484.png | Bin 453 -> 509 bytes .../gregtech/textures/items/gt.metaitem.02/485.png | Bin 401 -> 428 bytes .../gregtech/textures/items/gt.metaitem.02/486.png | Bin 453 -> 488 bytes .../gregtech/textures/items/gt.metaitem.02/487.png | Bin 409 -> 449 bytes .../gregtech/textures/items/gt.metaitem.02/488.png | Bin 453 -> 539 bytes .../gregtech/textures/items/gt.metaitem.02/489.png | Bin 453 -> 504 bytes .../gregtech/textures/items/gt.metaitem.02/490.png | Bin 453 -> 509 bytes .../gregtech/textures/items/gt.metaitem.02/491.png | Bin 453 -> 533 bytes .../gregtech/textures/items/gt.metaitem.02/492.png | Bin 453 -> 505 bytes .../gregtech/textures/items/gt.metaitem.02/493.png | Bin 453 -> 504 bytes .../gregtech/textures/items/gt.metaitem.02/494.png | Bin 453 -> 519 bytes .../gregtech/textures/items/gt.metaitem.02/495.png | Bin 453 -> 490 bytes .../gregtech/textures/items/gt.metaitem.02/496.png | Bin 453 -> 516 bytes .../gregtech/textures/items/gt.metaitem.02/497.png | Bin 453 -> 519 bytes .../gregtech/textures/items/gt.metaitem.02/498.png | Bin 453 -> 519 bytes .../gregtech/textures/items/gt.metaitem.02/499.png | Bin 453 -> 536 bytes .../gregtech/textures/items/gt.metaitem.02/524.png | Bin 647 -> 725 bytes .../gregtech/textures/items/gt.metaitem.02/526.png | Bin 470 -> 604 bytes .../gregtech/textures/items/gt.metaitem.02/533.png | Bin 582 -> 616 bytes .../gregtech/textures/items/gt.metaitem.02/535.png | Bin 378 -> 2990 bytes .../gregtech/textures/items/gt.metaitem.02/536.png | Bin 463 -> 3064 bytes .../gregtech/textures/items/gt.metaitem.02/554.png | Bin 609 -> 640 bytes .../gregtech/textures/items/gt.metaitem.02/561.png | Bin 550 -> 551 bytes .../gregtech/textures/items/gt.metaitem.02/562.png | Bin 568 -> 653 bytes .../gregtech/textures/items/gt.metaitem.02/563.png | Bin 521 -> 553 bytes .../gregtech/textures/items/gt.metaitem.02/564.png | Bin 572 -> 628 bytes .../gregtech/textures/items/gt.metaitem.02/565.png | Bin 525 -> 542 bytes .../gregtech/textures/items/gt.metaitem.02/566.png | Bin 557 -> 566 bytes .../gregtech/textures/items/gt.metaitem.02/567.png | Bin 576 -> 629 bytes .../gregtech/textures/items/gt.metaitem.02/766.png | Bin 1814 -> 3976 bytes .../gregtech/textures/items/gt.metaitem.03/100.png | Bin 1171 -> 3354 bytes .../gregtech/textures/items/gt.metaitem.03/101.png | Bin 1117 -> 3346 bytes .../gregtech/textures/items/gt.metaitem.03/102.png | Bin 1051 -> 3289 bytes .../gregtech/textures/items/gt.metaitem.03/103.png | Bin 1114 -> 3291 bytes .../gregtech/textures/items/gt.metaitem.03/104.png | Bin 1044 -> 3301 bytes .../gregtech/textures/items/gt.metaitem.03/105.png | Bin 1217 -> 3335 bytes .../gregtech/textures/items/gt.metaitem.03/106.png | Bin 629 -> 3115 bytes .../gregtech/textures/items/gt.metaitem.03/107.png | Bin 795 -> 3209 bytes .../gregtech/textures/items/gt.metaitem.03/110.png | Bin 591 -> 3087 bytes .../gregtech/textures/items/gt.metaitem.03/113.png | Bin 508 -> 520 bytes .../gregtech/textures/items/gt.metaitem.03/120.png | Bin 4162 -> 6682 bytes .../gregtech/textures/items/gt.metaitem.03/130.png | Bin 526 -> 3118 bytes .../gregtech/textures/items/gt.metaitem.03/131.png | Bin 536 -> 3137 bytes .../gregtech/textures/items/gt.metaitem.03/132.png | Bin 535 -> 3123 bytes .../gregtech/textures/items/gt.metaitem.03/140.png | Bin 381 -> 2933 bytes .../gregtech/textures/items/gt.metaitem.03/141.png | Bin 381 -> 2926 bytes .../gregtech/textures/items/gt.metaitem.03/142.png | Bin 381 -> 2928 bytes .../gregtech/textures/items/gt.metaitem.03/143.png | Bin 381 -> 2953 bytes .../gregtech/textures/items/gt.metaitem.03/144.png | Bin 381 -> 2931 bytes .../gregtech/textures/items/gt.metaitem.03/145.png | Bin 381 -> 2923 bytes .../gregtech/textures/items/gt.metaitem.03/146.png | Bin 381 -> 2922 bytes .../gregtech/textures/items/gt.metaitem.03/147.png | Bin 381 -> 2904 bytes .../gregtech/textures/items/gt.metaitem.03/148.png | Bin 381 -> 2928 bytes .../gregtech/textures/items/gt.metaitem.03/149.png | Bin 381 -> 2927 bytes .../gregtech/textures/items/gt.metaitem.03/150.png | Bin 1429 -> 3755 bytes .../gregtech/textures/items/gt.metaitem.03/151.png | Bin 1443 -> 3963 bytes .../gregtech/textures/items/gt.metaitem.03/152.png | Bin 1430 -> 3744 bytes .../gregtech/textures/items/gt.metaitem.03/153.png | Bin 1425 -> 3945 bytes .../gregtech/textures/items/gt.metaitem.03/160.png | Bin 1698 -> 4144 bytes .../gregtech/textures/items/gt.metaitem.03/161.png | Bin 1609 -> 3821 bytes .../gregtech/textures/items/gt.metaitem.03/162.png | Bin 1698 -> 4150 bytes .../gregtech/textures/items/gt.metaitem.03/163.png | Bin 1628 -> 3853 bytes .../gregtech/textures/items/gt.metaitem.03/164.png | Bin 1698 -> 4140 bytes .../gregtech/textures/items/gt.metaitem.03/165.png | Bin 1628 -> 3840 bytes .../gregtech/textures/items/gt.metaitem.03/21.png | Bin 667 -> 3160 bytes .../gregtech/textures/items/gt.metaitem.03/22.png | Bin 441 -> 3033 bytes .../gregtech/textures/items/gt.metaitem.03/23.png | Bin 1107 -> 3511 bytes .../gregtech/textures/items/gt.metaitem.03/36.png | Bin 1562 -> 3941 bytes .../gregtech/textures/items/gt.metaitem.03/37.png | Bin 1309 -> 3472 bytes .../gregtech/textures/items/gt.metaitem.03/38.png | Bin 1705 -> 3949 bytes .../gregtech/textures/items/gt.metaitem.03/39.png | Bin 1639 -> 3672 bytes .../gregtech/textures/items/gt.metaitem.03/40.png | Bin 1417 -> 3804 bytes .../gregtech/textures/items/gt.metaitem.03/41.png | Bin 1407 -> 3558 bytes .../gregtech/textures/items/gt.metaitem.03/42.png | Bin 1491 -> 3844 bytes .../gregtech/textures/items/gt.metaitem.03/43.png | Bin 1424 -> 3631 bytes .../gregtech/textures/items/gt.metaitem.03/44.png | Bin 1617 -> 3999 bytes .../gregtech/textures/items/gt.metaitem.03/45.png | Bin 1597 -> 3761 bytes .../gregtech/textures/items/gt.metaitem.03/46.png | Bin 1693 -> 4150 bytes .../gregtech/textures/items/gt.metaitem.03/47.png | Bin 1701 -> 3866 bytes .../gregtech/textures/items/gt.metaitem.03/48.png | Bin 1431 -> 3938 bytes .../gregtech/textures/items/gt.metaitem.03/49.png | Bin 1414 -> 3777 bytes .../gregtech/textures/items/gt.metaitem.03/50.png | Bin 1682 -> 4098 bytes .../gregtech/textures/items/gt.metaitem.03/51.png | Bin 1603 -> 3803 bytes .../gregtech/textures/items/gt.metaitem.03/52.png | Bin 1698 -> 4152 bytes .../gregtech/textures/items/gt.metaitem.03/53.png | Bin 1628 -> 3857 bytes .../gregtech/textures/items/gt.metaitem.03/54.png | Bin 1669 -> 4080 bytes .../gregtech/textures/items/gt.metaitem.03/55.png | Bin 1686 -> 3803 bytes .../gregtech/textures/items/gt.metaitem.03/56.png | Bin 1735 -> 4117 bytes .../gregtech/textures/items/gt.metaitem.03/57.png | Bin 1680 -> 3785 bytes .../gregtech/textures/items/gt.metaitem.03/58.png | Bin 1698 -> 4151 bytes .../gregtech/textures/items/gt.metaitem.03/59.png | Bin 1628 -> 3859 bytes .../gregtech/textures/items/gt.metaitem.03/60.png | Bin 1780 -> 4232 bytes .../gregtech/textures/items/gt.metaitem.03/61.png | Bin 1823 -> 3923 bytes .../gregtech/textures/items/gt.metaitem.03/62.png | Bin 1823 -> 4167 bytes .../gregtech/textures/items/gt.metaitem.03/63.png | Bin 1780 -> 3842 bytes .../gregtech/textures/items/gt.metaitem.03/64.png | Bin 1731 -> 4120 bytes .../gregtech/textures/items/gt.metaitem.03/65.png | Bin 1685 -> 3824 bytes .../gregtech/textures/items/gt.metaitem.03/68.png | Bin 388 -> 2969 bytes .../gregtech/textures/items/gt.metaitem.03/69.png | Bin 367 -> 2908 bytes .../gregtech/textures/items/gt.metaitem.03/70.png | Bin 388 -> 2959 bytes .../gregtech/textures/items/gt.metaitem.03/71.png | Bin 373 -> 2933 bytes .../gregtech/textures/items/gt.metaitem.03/74.png | Bin 376 -> 2919 bytes .../gregtech/textures/items/gt.metaitem.03/76.png | Bin 6670 -> 10545 bytes .../gregtech/textures/items/gt.metaitem.03/77.png | Bin 365 -> 2910 bytes .../gregtech/textures/items/gt.metaitem.03/78.png | Bin 366 -> 2932 bytes .../gregtech/textures/items/gt.metaitem.03/79.png | Bin 399 -> 3016 bytes .../gregtech/textures/items/gt.metaitem.03/8.png | Bin 872 -> 3193 bytes .../gregtech/textures/items/gt.metaitem.03/90.png | Bin 540 -> 3262 bytes .../gregtech/textures/items/gt.metaitem.03/96.png | Bin 405 -> 3023 bytes .../gregtech/textures/items/gt.metaitem.03/97.png | Bin 389 -> 2984 bytes .../gregtech/textures/items/gt.metaitem.03/98.png | Bin 408 -> 3028 bytes .../gregtech/textures/items/gt.metaitem.03/99.png | Bin 1104 -> 3732 bytes .../textures/items/gt.neutroniumHeatCapacitor.png | Bin 325 -> 1147 bytes .../textures/items/gt.reactorUraniumDual.png | Bin 485 -> 574 bytes .../textures/items/gt.reactorUraniumQuad.png | Bin 577 -> 739 bytes .../textures/items/gt.reactorUraniumSimple.png | Bin 461 -> 528 bytes .../gregtech/textures/items/gt.sensorcard.png | Bin 1180 -> 1446 bytes .../textures/items/iconsets/HANDLE_SOLDERING.png | Bin 330 -> 1171 bytes .../gregtech/textures/items/iconsets/TURBINE.png | Bin 382 -> 1227 bytes .../textures/items/iconsets/TURBINE_HUGE.png | Bin 382 -> 1227 bytes .../textures/items/iconsets/TURBINE_LARGE.png | Bin 382 -> 1227 bytes .../textures/items/iconsets/TURBINE_SMALL.png | Bin 382 -> 1227 bytes .../items/materialicons/DIAMOND/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../items/materialicons/DIAMOND/crushed.png | Bin 441 -> 506 bytes .../materialicons/DIAMOND/crushedPurified.png | Bin 460 -> 603 bytes .../materialicons/DIAMOND/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../items/materialicons/DIAMOND/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/DIAMOND/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/DIAMOND/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/DIAMOND/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/DIAMOND/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/DIAMOND/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/DULL/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/DULL/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/DULL/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/DULL/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/DULL/gem.png | Bin 419 -> 451 bytes .../items/materialicons/DULL/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/DULL/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/DULL/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/DULL/toolHeadMallet.png | Bin 340 -> 2891 bytes .../items/materialicons/DULL/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/DULL/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/EMERALD/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../items/materialicons/EMERALD/crushed.png | Bin 441 -> 506 bytes .../materialicons/EMERALD/crushedPurified.png | Bin 460 -> 603 bytes .../materialicons/EMERALD/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/EMERALD/gem.png | Bin 408 -> 409 bytes .../items/materialicons/EMERALD/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/EMERALD/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/EMERALD/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/EMERALD/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/EMERALD/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/EMERALD/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/FIERY/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/FIERY/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/FIERY/crushedPurified.png | Bin 460 -> 603 bytes .../textures/items/materialicons/FIERY/gem.png | Bin 419 -> 451 bytes .../items/materialicons/FIERY/handleMallet.png | Bin 356 -> 2909 bytes .../textures/items/materialicons/FIERY/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/FIERY/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/FIERY/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/FIERY/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/FINE/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/FINE/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/FINE/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/FINE/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/FINE/gem.png | Bin 419 -> 451 bytes .../items/materialicons/FINE/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/FINE/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/FINE/plate.png | Bin 434 -> 517 bytes .../textures/items/materialicons/FINE/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/FINE/toolHeadMallet.png | Bin 340 -> 2891 bytes .../items/materialicons/FINE/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/FINE/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/FLINT/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/FLINT/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/FLINT/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/FLINT/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../items/materialicons/FLINT/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/FLINT/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/FLINT/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/FLINT/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/FLINT/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/FLINT/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/FLUID/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/FLUID/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/FLUID/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/FLUID/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/FLUID/gem.png | Bin 419 -> 451 bytes .../items/materialicons/FLUID/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/FLUID/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/FLUID/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/FLUID/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/FLUID/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/FLUID/turbineBlade.png | Bin 395 -> 1238 bytes .../materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../items/materialicons/GEM_HORIZONTAL/crushed.png | Bin 441 -> 506 bytes .../GEM_HORIZONTAL/crushedPurified.png | Bin 460 -> 603 bytes .../GEM_HORIZONTAL/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../materialicons/GEM_HORIZONTAL/handleMallet.png | Bin 356 -> 2909 bytes .../materialicons/GEM_HORIZONTAL/lens_OVERLAY.png | Bin 556 -> 567 bytes .../items/materialicons/GEM_HORIZONTAL/rotor.png | Bin 443 -> 452 bytes .../GEM_HORIZONTAL/toolHeadMallet.png | Bin 340 -> 2891 bytes .../GEM_HORIZONTAL/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../materialicons/GEM_HORIZONTAL/turbineBlade.png | Bin 395 -> 1238 bytes .../materialicons/GEM_VERTICAL/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../items/materialicons/GEM_VERTICAL/crushed.png | Bin 441 -> 506 bytes .../materialicons/GEM_VERTICAL/crushedPurified.png | Bin 460 -> 603 bytes .../materialicons/GEM_VERTICAL/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../materialicons/GEM_VERTICAL/handleMallet.png | Bin 356 -> 2909 bytes .../materialicons/GEM_VERTICAL/lens_OVERLAY.png | Bin 556 -> 567 bytes .../items/materialicons/GEM_VERTICAL/rotor.png | Bin 443 -> 452 bytes .../materialicons/GEM_VERTICAL/toolHeadMallet.png | Bin 340 -> 2891 bytes .../GEM_VERTICAL/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../materialicons/GEM_VERTICAL/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/GLASS/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/GLASS/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/GLASS/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/GLASS/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/GLASS/gem.png | Bin 419 -> 451 bytes .../items/materialicons/GLASS/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/GLASS/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/GLASS/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/GLASS/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/GLASS/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/GLASS/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/LAPIS/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/LAPIS/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/LAPIS/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/LAPIS/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/LAPIS/gem.png | Bin 387 -> 410 bytes .../items/materialicons/LAPIS/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/LAPIS/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/LAPIS/plate.png | Bin 434 -> 517 bytes .../textures/items/materialicons/LAPIS/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/LAPIS/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/LAPIS/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/LAPIS/turbineBlade.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/LEAF/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/LEAF/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/LEAF/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/LEAF/gem.png | Bin 419 -> 451 bytes .../items/materialicons/LEAF/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/LEAF/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/LEAF/plate.png | Bin 542 -> 676 bytes .../textures/items/materialicons/LEAF/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/LEAF/toolHeadMallet.png | Bin 340 -> 2891 bytes .../items/materialicons/LEAF/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/LEAF/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/LIGNITE/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../items/materialicons/LIGNITE/crushed.png | Bin 441 -> 506 bytes .../materialicons/LIGNITE/crushedPurified.png | Bin 460 -> 603 bytes .../materialicons/LIGNITE/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../items/materialicons/LIGNITE/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/LIGNITE/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/LIGNITE/plate.png | Bin 434 -> 517 bytes .../textures/items/materialicons/LIGNITE/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/LIGNITE/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/LIGNITE/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/LIGNITE/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/MAGNETIC/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../items/materialicons/MAGNETIC/crushed.png | Bin 441 -> 506 bytes .../materialicons/MAGNETIC/crushedPurified.png | Bin 460 -> 603 bytes .../materialicons/MAGNETIC/crushed_OVERLAY.png | Bin 577 -> 603 bytes .../items/materialicons/MAGNETIC/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/MAGNETIC/rotor.png | Bin 443 -> 452 bytes .../materialicons/MAGNETIC/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/MAGNETIC/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/MAGNETIC/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/METALLIC/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../items/materialicons/METALLIC/crushed.png | Bin 441 -> 506 bytes .../materialicons/METALLIC/crushedPurified.png | Bin 460 -> 603 bytes .../materialicons/METALLIC/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../items/materialicons/METALLIC/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/METALLIC/lens_OVERLAY.png | Bin 556 -> 567 bytes .../items/materialicons/METALLIC/rotor.png | Bin 443 -> 452 bytes .../materialicons/METALLIC/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/METALLIC/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/METALLIC/turbineBlade.png | Bin 395 -> 1238 bytes .../materialicons/NETHERSTAR/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../items/materialicons/NETHERSTAR/crushed.png | Bin 441 -> 506 bytes .../materialicons/NETHERSTAR/crushedPurified.png | Bin 460 -> 603 bytes .../materialicons/NETHERSTAR/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../materialicons/NETHERSTAR/handleMallet.png | Bin 356 -> 2909 bytes .../materialicons/NETHERSTAR/lens_OVERLAY.png | Bin 556 -> 567 bytes .../items/materialicons/NETHERSTAR/rotor.png | Bin 443 -> 452 bytes .../materialicons/NETHERSTAR/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/NETHERSTAR/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../materialicons/NETHERSTAR/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/NONE/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/NONE/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/NONE/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/NONE/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/NONE/gem.png | Bin 419 -> 451 bytes .../items/materialicons/NONE/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/NONE/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/NONE/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/NONE/toolHeadMallet.png | Bin 340 -> 2891 bytes .../items/materialicons/NONE/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/NONE/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/OPAL/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/OPAL/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/OPAL/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/OPAL/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/OPAL/gem.png | Bin 419 -> 451 bytes .../items/materialicons/OPAL/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/OPAL/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/OPAL/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/OPAL/toolHeadMallet.png | Bin 340 -> 2891 bytes .../items/materialicons/OPAL/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/OPAL/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/PAPER/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/PAPER/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/PAPER/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/PAPER/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/PAPER/gem.png | Bin 419 -> 451 bytes .../items/materialicons/PAPER/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/PAPER/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/PAPER/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/PAPER/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/PAPER/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/PAPER/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/POWDER/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../items/materialicons/POWDER/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/POWDER/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/POWDER/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/POWDER/gem.png | Bin 419 -> 451 bytes .../items/materialicons/POWDER/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/POWDER/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/POWDER/plate.png | Bin 434 -> 517 bytes .../textures/items/materialicons/POWDER/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/POWDER/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/POWDER/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/POWDER/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/QUARTZ/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../items/materialicons/QUARTZ/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/QUARTZ/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/QUARTZ/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../items/materialicons/QUARTZ/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/QUARTZ/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/QUARTZ/plate.png | Bin 434 -> 517 bytes .../textures/items/materialicons/QUARTZ/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/QUARTZ/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/QUARTZ/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/QUARTZ/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/ROUGH/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/ROUGH/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/ROUGH/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/ROUGH/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/ROUGH/gem.png | Bin 419 -> 451 bytes .../items/materialicons/ROUGH/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/ROUGH/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/ROUGH/plate.png | Bin 434 -> 517 bytes .../textures/items/materialicons/ROUGH/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/ROUGH/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/ROUGH/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/ROUGH/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/RUBY/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/RUBY/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/RUBY/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/RUBY/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/RUBY/gem.png | Bin 419 -> 451 bytes .../items/materialicons/RUBY/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/RUBY/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/RUBY/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/RUBY/toolHeadMallet.png | Bin 340 -> 2891 bytes .../items/materialicons/RUBY/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/RUBY/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/SAND/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/SAND/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/SAND/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/SAND/crushed_OVERLAY.png | Bin 427 -> 446 bytes .../textures/items/materialicons/SAND/gem.png | Bin 419 -> 451 bytes .../items/materialicons/SAND/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/SAND/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/SAND/plate.png | Bin 434 -> 517 bytes .../textures/items/materialicons/SAND/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/SAND/toolHeadMallet.png | Bin 340 -> 2891 bytes .../items/materialicons/SAND/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/SAND/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/SHARDS/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../items/materialicons/SHARDS/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/SHARDS/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/SHARDS/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/SHARDS/gem.png | Bin 457 -> 515 bytes .../items/materialicons/SHARDS/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/SHARDS/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/SHARDS/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/SHARDS/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/SHARDS/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/SHARDS/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/SHINY/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/SHINY/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/SHINY/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/SHINY/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/SHINY/gem.png | Bin 419 -> 451 bytes .../items/materialicons/SHINY/handleMallet.png | Bin 356 -> 2909 bytes .../items/materialicons/SHINY/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/SHINY/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/SHINY/toolHeadMallet.png | Bin 340 -> 2891 bytes .../materialicons/SHINY/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/SHINY/turbineBlade.png | Bin 395 -> 1238 bytes .../items/materialicons/WOOD/TURBINE_BLADE.png | Bin 395 -> 1238 bytes .../textures/items/materialicons/WOOD/crushed.png | Bin 441 -> 506 bytes .../items/materialicons/WOOD/crushedPurified.png | Bin 460 -> 603 bytes .../items/materialicons/WOOD/crushed_OVERLAY.png | Bin 448 -> 480 bytes .../textures/items/materialicons/WOOD/gem.png | Bin 419 -> 451 bytes .../items/materialicons/WOOD/handleMallet.png | Bin 356 -> 2909 bytes .../textures/items/materialicons/WOOD/ingot.png | Bin 431 -> 482 bytes .../items/materialicons/WOOD/lens_OVERLAY.png | Bin 556 -> 567 bytes .../textures/items/materialicons/WOOD/rotor.png | Bin 443 -> 452 bytes .../items/materialicons/WOOD/toolHeadMallet.png | Bin 340 -> 2891 bytes .../items/materialicons/WOOD/toolHeadSoldering.png | Bin 314 -> 1158 bytes .../items/materialicons/WOOD/turbineBlade.png | Bin 395 -> 1238 bytes .../gregtech/textures/items/modulararmor_boots.png | Bin 507 -> 518 bytes .../textures/items/modulararmor_chestplate.png | Bin 485 -> 504 bytes .../textures/items/modularelectric1_boots.png | Bin 567 -> 593 bytes .../textures/items/modularelectric1_chestplate.png | Bin 527 -> 544 bytes .../textures/items/modularelectric1_leggings.png | Bin 471 -> 482 bytes .../textures/items/modularelectric2_boots.png | Bin 587 -> 668 bytes .../textures/items/modularelectric2_chestplate.png | Bin 541 -> 596 bytes .../textures/items/modularelectric2_leggings.png | Bin 533 -> 542 bytes .../textures/models/armor/basic_helmet_chest.png | Bin 954 -> 1215 bytes .../textures/models/armor/basic_leggings_boots.png | Bin 453 -> 493 bytes .../textures/models/armor/e1_helmet_chest.png | Bin 1136 -> 1528 bytes .../textures/models/armor/e1_leggings_boots.png | Bin 483 -> 588 bytes .../textures/models/armor/e2_helmet_chest.png | Bin 1211 -> 1792 bytes .../textures/models/armor/e2_leggings_boots.png | Bin 548 -> 750 bytes .../textures/blocks/crop/blockCrop.Argentia.3.png | Bin 478 -> 523 bytes .../textures/blocks/crop/blockCrop.Argentia.4.png | Bin 495 -> 500 bytes .../textures/blocks/crop/blockCrop.Bauxia.2.png | Bin 478 -> 523 bytes .../blocks/crop/blockCrop.Bobsyeruncleranks.1.png | Bin 345 -> 2852 bytes .../blocks/crop/blockCrop.Bobsyeruncleranks.2.png | Bin 367 -> 2926 bytes .../blocks/crop/blockCrop.Bobsyeruncleranks.3.png | Bin 386 -> 3007 bytes .../blocks/crop/blockCrop.Bobsyeruncleranks.4.png | Bin 421 -> 3107 bytes .../textures/blocks/crop/blockCrop.Chilly.3.png | Bin 478 -> 523 bytes .../textures/blocks/crop/blockCrop.Corium.3.png | Bin 478 -> 523 bytes .../textures/blocks/crop/blockCrop.Cucumber.3.png | Bin 478 -> 523 bytes .../textures/blocks/crop/blockCrop.Diareed.4.png | Bin 362 -> 2920 bytes .../textures/blocks/crop/blockCrop.Evil Ore.3.png | Bin 409 -> 451 bytes .../textures/blocks/crop/blockCrop.Evil Ore.4.png | Bin 425 -> 454 bytes .../textures/blocks/crop/blockCrop.Fertilia.3.png | Bin 416 -> 465 bytes .../ic2/textures/blocks/crop/blockCrop.Flax.1.png | Bin 616 -> 3115 bytes .../ic2/textures/blocks/crop/blockCrop.Flax.2.png | Bin 538 -> 3171 bytes .../ic2/textures/blocks/crop/blockCrop.Flax.3.png | Bin 624 -> 3302 bytes .../ic2/textures/blocks/crop/blockCrop.Flax.4.png | Bin 1105 -> 3479 bytes .../textures/blocks/crop/blockCrop.Galvania.2.png | Bin 478 -> 523 bytes .../textures/blocks/crop/blockCrop.Galvania.3.png | Bin 495 -> 500 bytes .../textures/blocks/crop/blockCrop.Glowheat.5.png | Bin 740 -> 748 bytes .../textures/blocks/crop/blockCrop.Glowheat.6.png | Bin 846 -> 868 bytes .../blocks/crop/blockCrop.God of Thunder.3.png | Bin 416 -> 465 bytes .../blocks/crop/blockCrop.God of Thunder.4.png | Bin 446 -> 507 bytes .../ic2/textures/blocks/crop/blockCrop.Grape.3.png | Bin 478 -> 523 bytes .../textures/blocks/crop/blockCrop.Indigo.3.png | Bin 443 -> 3006 bytes .../textures/blocks/crop/blockCrop.Indigo.4.png | Bin 485 -> 3137 bytes .../textures/blocks/crop/blockCrop.Lazulia.1.png | Bin 616 -> 3115 bytes .../textures/blocks/crop/blockCrop.Lazulia.2.png | Bin 538 -> 3171 bytes .../textures/blocks/crop/blockCrop.Lazulia.3.png | Bin 624 -> 3302 bytes .../textures/blocks/crop/blockCrop.Lazulia.4.png | Bin 985 -> 3483 bytes .../ic2/textures/blocks/crop/blockCrop.Lemon.3.png | Bin 478 -> 523 bytes .../textures/blocks/crop/blockCrop.Liveroots.1.png | Bin 345 -> 2852 bytes .../textures/blocks/crop/blockCrop.Liveroots.2.png | Bin 367 -> 2926 bytes .../textures/blocks/crop/blockCrop.Liveroots.3.png | Bin 386 -> 3007 bytes .../textures/blocks/crop/blockCrop.Liveroots.4.png | Bin 542 -> 3248 bytes .../textures/blocks/crop/blockCrop.Milkwart.3.png | Bin 460 -> 493 bytes .../blocks/crop/blockCrop.Nickelback.2.png | Bin 478 -> 523 bytes .../blocks/crop/blockCrop.Nickelback.3.png | Bin 495 -> 500 bytes .../blocks/crop/blockCrop.Oilberries.1.png | Bin 359 -> 2875 bytes .../blocks/crop/blockCrop.Oilberries.2.png | Bin 410 -> 2919 bytes .../blocks/crop/blockCrop.Oilberries.3.png | Bin 430 -> 2970 bytes .../blocks/crop/blockCrop.Oilberries.4.png | Bin 451 -> 3022 bytes .../textures/blocks/crop/blockCrop.Olivia.1.png | Bin 345 -> 2852 bytes .../textures/blocks/crop/blockCrop.Olivia.2.png | Bin 367 -> 2926 bytes .../textures/blocks/crop/blockCrop.Olivia.3.png | Bin 386 -> 3007 bytes .../textures/blocks/crop/blockCrop.Olivia.4.png | Bin 421 -> 3107 bytes .../ic2/textures/blocks/crop/blockCrop.Onion.3.png | Bin 478 -> 523 bytes .../textures/blocks/crop/blockCrop.Platina.3.png | Bin 478 -> 523 bytes .../textures/blocks/crop/blockCrop.Platina.4.png | Bin 495 -> 500 bytes .../textures/blocks/crop/blockCrop.Plumbilia.3.png | Bin 478 -> 523 bytes .../textures/blocks/crop/blockCrop.Plumbilia.4.png | Bin 495 -> 503 bytes .../blocks/crop/blockCrop.Pyrolusium.2.png | Bin 478 -> 523 bytes .../blocks/crop/blockCrop.Pyrolusium.3.png | Bin 495 -> 500 bytes .../textures/blocks/crop/blockCrop.Quantaria.3.png | Bin 429 -> 456 bytes .../textures/blocks/crop/blockCrop.Quantaria.4.png | Bin 490 -> 519 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.1.png | Bin 616 -> 3115 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.2.png | Bin 538 -> 3171 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.3.png | Bin 624 -> 3302 bytes .../textures/blocks/crop/blockCrop.Reactoria.3.png | Bin 474 -> 532 bytes .../textures/blocks/crop/blockCrop.Reactoria.4.png | Bin 491 -> 570 bytes .../textures/blocks/crop/blockCrop.Sapphirum.1.png | Bin 345 -> 2852 bytes .../textures/blocks/crop/blockCrop.Sapphirum.2.png | Bin 367 -> 2926 bytes .../textures/blocks/crop/blockCrop.Sapphirum.3.png | Bin 386 -> 3007 bytes .../textures/blocks/crop/blockCrop.Sapphirum.4.png | Bin 539 -> 3133 bytes .../blocks/crop/blockCrop.Scheelinium.2.png | Bin 478 -> 523 bytes .../blocks/crop/blockCrop.Scheelinium.3.png | Bin 495 -> 500 bytes .../blocks/crop/blockCrop.Slimeplant.3.png | Bin 445 -> 576 bytes .../blocks/crop/blockCrop.Slimeplant.4.png | Bin 469 -> 623 bytes .../blocks/crop/blockCrop.Stargatium.1.png | Bin 350 -> 2859 bytes .../blocks/crop/blockCrop.Stargatium.2.png | Bin 373 -> 2947 bytes .../blocks/crop/blockCrop.Stargatium.3.png | Bin 396 -> 3024 bytes .../blocks/crop/blockCrop.Stargatium.4.png | Bin 428 -> 3071 bytes .../textures/blocks/crop/blockCrop.Starwart.3.png | Bin 460 -> 493 bytes .../blocks/crop/blockCrop.Steeleafranks.1.png | Bin 345 -> 2852 bytes .../blocks/crop/blockCrop.Steeleafranks.2.png | Bin 367 -> 2926 bytes .../blocks/crop/blockCrop.Steeleafranks.3.png | Bin 386 -> 3007 bytes .../blocks/crop/blockCrop.Steeleafranks.4.png | Bin 565 -> 3231 bytes .../ic2/textures/blocks/crop/blockCrop.Tea.3.png | Bin 478 -> 523 bytes .../ic2/textures/blocks/crop/blockCrop.Tine.3.png | Bin 409 -> 451 bytes .../textures/blocks/crop/blockCrop.Titania.2.png | Bin 478 -> 523 bytes .../textures/blocks/crop/blockCrop.Tomato.3.png | Bin 478 -> 523 bytes .../blocks/crop/blockCrop.Transformium.1.png | Bin 359 -> 2875 bytes .../blocks/crop/blockCrop.Transformium.2.png | Bin 410 -> 2919 bytes .../blocks/crop/blockCrop.Transformium.3.png | Bin 430 -> 2970 bytes .../blocks/crop/blockCrop.Transformium.4.png | Bin 731 -> 3248 bytes .../blocks/crop/blockCrop.Trollplant.1.png | Bin 561 -> 706 bytes .../blocks/crop/blockCrop.Trollplant.2.png | Bin 362 -> 2920 bytes .../blocks/crop/blockCrop.Trollplant.5.png | Bin 470 -> 478 bytes .../textures/blocks/crop/blockCrop.Withereed.4.png | Bin 374 -> 2937 bytes .../models/armor/cloakingdevice_layer_1.png | Bin 1244 -> 1246 bytes .../textures/models/armor/lapotronpack_layer_1.png | Bin 1155 -> 1255 bytes .../models/armor/lithiumbatpack_layer_1.png | Bin 480 -> 525 bytes 1362 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/gui/SolarHPBoiler.png (limited to 'src/main/resources') diff --git a/build.properties b/build.properties index de4dbaed77..09f5768360 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614-1.7.10 -gt.version=5.09.33.14 +gt.version=5.09.33.15 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 5c15ca65cd..be9963967f 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -1267,7 +1267,8 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { ItemStack uStack = GT_Utility.copyAmount(tAmount, tStack); if (GT_Utility.isStackValid(uStack)) { uList.add(uStack); - if (tInputs[i] == null) tInputs[i] = uStack; + if (tInputs[i] == null) + tInputs[i] = uStack; } } tAlts[i] = uList.toArray(new ItemStack[uList.size()]); diff --git a/src/main/resources/assets/gregtech/textures/BrainTechCape.png b/src/main/resources/assets/gregtech/textures/BrainTechCape.png index ee7462e401..7cc3fa64af 100644 Binary files a/src/main/resources/assets/gregtech/textures/BrainTechCape.png and b/src/main/resources/assets/gregtech/textures/BrainTechCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/DevCape.png b/src/main/resources/assets/gregtech/textures/DevCape.png index 80532e6223..6486b57e12 100644 Binary files a/src/main/resources/assets/gregtech/textures/DevCape.png and b/src/main/resources/assets/gregtech/textures/DevCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/DonorCape.png b/src/main/resources/assets/gregtech/textures/DonorCape.png index 0d7cad5304..fbfd7b72fb 100644 Binary files a/src/main/resources/assets/gregtech/textures/DonorCape.png and b/src/main/resources/assets/gregtech/textures/DonorCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/GregTechCape.png b/src/main/resources/assets/gregtech/textures/GregTechCape.png index c02e05ab35..e3c9f5a8a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/GregTechCape.png and b/src/main/resources/assets/gregtech/textures/GregTechCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/GregoriusCape.png b/src/main/resources/assets/gregtech/textures/GregoriusCape.png index 2d1f433a3d..5ae2d2fbfc 100644 Binary files a/src/main/resources/assets/gregtech/textures/GregoriusCape.png and b/src/main/resources/assets/gregtech/textures/GregoriusCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/LogoGTI_Long.png b/src/main/resources/assets/gregtech/textures/LogoGTI_Long.png index 7c1726a6b7..0f9598d050 100644 Binary files a/src/main/resources/assets/gregtech/textures/LogoGTI_Long.png and b/src/main/resources/assets/gregtech/textures/LogoGTI_Long.png differ diff --git a/src/main/resources/assets/gregtech/textures/MrBrainCape.png b/src/main/resources/assets/gregtech/textures/MrBrainCape.png index 8ab24ae228..fb3e37480a 100644 Binary files a/src/main/resources/assets/gregtech/textures/MrBrainCape.png and b/src/main/resources/assets/gregtech/textures/MrBrainCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/TecCape.png b/src/main/resources/assets/gregtech/textures/TecCape.png index cf620e8f91..fff0cc22a7 100644 Binary files a/src/main/resources/assets/gregtech/textures/TecCape.png and b/src/main/resources/assets/gregtech/textures/TecCape.png differ diff --git a/src/main/resources/assets/gregtech/textures/aspects/ELECTRUM.png b/src/main/resources/assets/gregtech/textures/aspects/ELECTRUM.png index 0375beda52..ab07867611 100644 Binary files a/src/main/resources/assets/gregtech/textures/aspects/ELECTRUM.png and b/src/main/resources/assets/gregtech/textures/aspects/ELECTRUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/aspects/MAGNETO.png b/src/main/resources/assets/gregtech/textures/aspects/MAGNETO.png index 634d12b8de..9e426b0eef 100644 Binary files a/src/main/resources/assets/gregtech/textures/aspects/MAGNETO.png and b/src/main/resources/assets/gregtech/textures/aspects/MAGNETO.png differ diff --git a/src/main/resources/assets/gregtech/textures/aspects/NEBRISUM.png b/src/main/resources/assets/gregtech/textures/aspects/NEBRISUM.png index f02a3677ec..91527e4dd6 100644 Binary files a/src/main/resources/assets/gregtech/textures/aspects/NEBRISUM.png and b/src/main/resources/assets/gregtech/textures/aspects/NEBRISUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/aspects/RADIO.png b/src/main/resources/assets/gregtech/textures/aspects/RADIO.png index 22bc6c8b42..d1bf607c82 100644 Binary files a/src/main/resources/assets/gregtech/textures/aspects/RADIO.png and b/src/main/resources/assets/gregtech/textures/aspects/RADIO.png differ diff --git a/src/main/resources/assets/gregtech/textures/aspects/STRONTIO.png b/src/main/resources/assets/gregtech/textures/aspects/STRONTIO.png index c5af77f73b..be46651b1e 100644 Binary files a/src/main/resources/assets/gregtech/textures/aspects/STRONTIO.png and b/src/main/resources/assets/gregtech/textures/aspects/STRONTIO.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png index dfce66ef70..91592aa072 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_FRONT_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png index dfce66ef70..0097e9de80 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/centrifuge/OVERLAY_SIDE_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png index 44349c5407..eb67b722f4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/electromagnetic_separator/OVERLAY_FRONT_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png index 476344be81..784415fdb9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/laser_engraver/OVERLAY_FRONT_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png index 37f505db3c..ee39a79a98 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/macerator/OVERLAY_TOP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png index 37f505db3c..ee39a79a98 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/miner/OVERLAY_TOP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png index bc95c20791..7ed16c3ec9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/mixer/OVERLAY_TOP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png index 37f505db3c..80d5c1365b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/basicmachines/pulverizer/OVERLAY_TOP_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png index c05a143730..86cd249126 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.air.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png index 429871bd1d..a164b8e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png index d675c27a45..2f9afa2432 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.berylium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png index 8716d81d81..edc007c1a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.bioethanol.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png index 429871bd1d..a164b8e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.biomass.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png index fecac9a11b..dbd15d2ab5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calcium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png index 19b4a5da04..39d7f64a56 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.calciumcarbonate.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png index 8ce476542b..ff75f08dde 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.chlorine.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png index cbb91e29da..5e80e0c473 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.creosote.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png index fe58536227..054182792e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.dyes.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png index ea8081fa3b..ebe8d5499b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fieryblood.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png index 718b51b843..2b35769447 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fishoil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png index 15a3c98212..6247837ed4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluorine.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png index 2bcd44b89e..ebf620d377 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.for.honey.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png index dc9f51d2d9..feeed1a60e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png index 0936827c4b..5d326fcdfd 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glyceryl.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png index 32ab14fca3..bfeb435f07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.heliumplasma.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png index b72349b1bb..022d50d7e7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.holywater.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png index 2da4ade13b..5668026b93 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hotfryingoil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png index a0d93b4fce..9e1fc197cb 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrochloricacid.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png index 63dacfe3b8..d1e2ec3052 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.ice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png index 62e8035002..489417804d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indigo.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png index b9fb43cf34..c0a8a40048 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.indiumconcentrate.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png index 6c5c39474b..822f9b0dd6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.iron3chloride.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png index 105545c15f..3cadcf533b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.leadzincsolution.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png index 329b1ddd69..de1cf92fef 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lifeessence.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png index b04a62da93..8ce2ce80a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png index dc9f51d2d9..feeed1a60e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png index b04a62da93..8ce2ce80a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png index 19b4a5da04..39d7f64a56 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png index 6c0290c38b..ef8b07e15a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_extra_heavy_oil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png index b04a62da93..8ce2ce80a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png index 6c0290c38b..ef8b07e15a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_oil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png index dc9f51d2d9..feeed1a60e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png index 6c0290c38b..ef8b07e15a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_oil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png index 32ab14fca3..bfeb435f07 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png index 6c0290c38b..ef8b07e15a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_medium_oil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_naphtha.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_naphtha.png index dc9f51d2d9..feeed1a60e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_naphtha.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_naphtha.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sufluriclight_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sufluriclight_fuel.png index dc9f51d2d9..feeed1a60e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sufluriclight_fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sufluriclight_fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricheavy_fuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricheavy_fuel.png index b04a62da93..8ce2ce80a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricheavy_fuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricheavy_fuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricnaphtha.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricnaphtha.png index dc9f51d2d9..feeed1a60e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricnaphtha.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricnaphtha.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_toluene.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_toluene.png index 19b4a5da04..39d7f64a56 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_toluene.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_toluene.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png index e4a1b7a382..afff0ed587 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lithium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lithium.png index 15a3c98212..6247837ed4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lithium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lithium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lubricant.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lubricant.png index b04a62da93..8ce2ce80a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lubricant.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.lubricant.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mcguffium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mcguffium.png index 24f0c693dc..08cee527b4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mcguffium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mcguffium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mercury.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mercury.png index c4606b8fa0..7cd41d965a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mercury.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.mercury.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.milk.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.milk.png index 87b2e3d28e..6eb3879716 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.milk.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.milk.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.autogenerated.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.autogenerated.png index 836a10809a..9a4148f6b6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.autogenerated.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.autogenerated.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.blaze.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.blaze.png index 025b55c300..3f10e10c23 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.blaze.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.blaze.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png index f9357810f8..208a1792ea 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.glass.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.glass.png index e49660b0b0..f5b45197ef 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.glass.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.glass.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.redstone.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.redstone.png index 959c213a6b..51c6594d5e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.redstone.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.redstone.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrocoalfuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrocoalfuel.png index 1175567fd7..6ef50c4ed0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrocoalfuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrocoalfuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel.png index 54ef62fe10..c563ca0021 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrofuel.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogenplasma.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogenplasma.png index e069ebcd3a..4acabc510c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogenplasma.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogenplasma.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oil.png index 6c0290c38b..ef8b07e15a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.plasma.autogenerated.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.plasma.autogenerated.png index e069ebcd3a..4acabc510c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.plasma.autogenerated.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.plasma.autogenerated.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potassium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potassium.png index f5195a76c7..67084c8fb2 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potassium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potassium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.alcopops.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.alcopops.png index 3d865eb27f..2bfc11ca51 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.alcopops.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.alcopops.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.applejuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.applejuice.png index ee93a431e6..36448eb5f3 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.applejuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.applejuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.awkward.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.awkward.png index f0cb578361..0ec7857c86 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.awkward.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.awkward.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.beer.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.beer.png index 3d865eb27f..2bfc11ca51 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.beer.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.beer.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cafeaulait.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cafeaulait.png index 9b4f827199..a059fac7b8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cafeaulait.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cafeaulait.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cavejohnsonsgrenadejuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cavejohnsonsgrenadejuice.png index 3d865eb27f..2bfc11ca51 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cavejohnsonsgrenadejuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cavejohnsonsgrenadejuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chillysauce.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chillysauce.png index b2af7571d5..2a556a12b5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chillysauce.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chillysauce.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chocolatemilk.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chocolatemilk.png index 5b3c0eb4d6..675c304bc6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chocolatemilk.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.chocolatemilk.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cider.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cider.png index adb8e58f07..dc18889791 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cider.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.cider.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.coffee.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.coffee.png index 9b4f827199..a059fac7b8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.coffee.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.coffee.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.png index 6bae5cabb9..209282b18a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.splash.png index 6bae5cabb9..e52cfcaaa8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.png index 6bae5cabb9..46ab9718bc 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.splash.png index 6bae5cabb9..8910e9602f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.damage.strong.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkbeer.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkbeer.png index eec6c89a42..c1e563c4ba 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkbeer.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkbeer.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcafeaulait.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcafeaulait.png index 5b3c0eb4d6..675c304bc6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcafeaulait.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcafeaulait.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkchocolatemilk.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkchocolatemilk.png index 5b3c0eb4d6..675c304bc6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkchocolatemilk.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkchocolatemilk.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcoffee.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcoffee.png index 5b3c0eb4d6..675c304bc6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcoffee.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.darkcoffee.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.png index b2af7571d5..2a556a12b5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.strong.png index b2af7571d5..2a556a12b5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diablosauce.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diabolosauce.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diabolosauce.png index b2af7571d5..2a556a12b5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diabolosauce.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.diabolosauce.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.dragonblood.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.dragonblood.png index 37df72e41a..8160d8f84e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.dragonblood.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.dragonblood.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.png index c59d563cf5..4d800eb4d6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.splash.png index c59d563cf5..9f24564614 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.png index c59d563cf5..c1ca6a05b6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.splash.png index c59d563cf5..1228367401 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.fireresistance.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.glenmckenner.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.glenmckenner.png index b183ba9da8..060e3faca0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.glenmckenner.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.glenmckenner.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldenapplejuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldenapplejuice.png index 60365ce5a1..8bd6c22405 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldenapplejuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldenapplejuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldencider.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldencider.png index 60365ce5a1..8bd6c22405 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldencider.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.goldencider.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.grapejuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.grapejuice.png index 08b192777a..5f17914c88 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.grapejuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.grapejuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.png index 8fb1510797..11fd4af746 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.splash.png index 8fb1510797..6a0a6328e1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.png index 8fb1510797..1f270dc136 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.splash.png index 8fb1510797..7aff717077 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.health.strong.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hopsjuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hopsjuice.png index 08b192777a..5f17914c88 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hopsjuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hopsjuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hotsauce.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hotsauce.png index b2af7571d5..2a556a12b5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hotsauce.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.hotsauce.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.icetea.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.icetea.png index e53cbee71b..3c421c594f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.icetea.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.icetea.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.idunsapplejuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.idunsapplejuice.png index 60365ce5a1..8bd6c22405 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.idunsapplejuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.idunsapplejuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.png index cf4d17992d..0fae98b0f3 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.splash.png index cf4d17992d..b931c088a9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.png index cf4d17992d..fff51b35c8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.splash.png index cf4d17992d..e4ce5baa06 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.invisibility.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.laitaucafe.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.laitaucafe.png index 9b4f827199..a059fac7b8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.laitaucafe.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.laitaucafe.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonade.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonade.png index 3d865eb27f..2bfc11ca51 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonade.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonade.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonjuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonjuice.png index 3d865eb27f..2bfc11ca51 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonjuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.lemonjuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.leninade.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.leninade.png index 3d865eb27f..2bfc11ca51 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.leninade.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.leninade.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.limoncello.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.limoncello.png index 3d865eb27f..2bfc11ca51 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.limoncello.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.limoncello.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mineralwater.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mineralwater.png index eaa902682d..6b485369d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mineralwater.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mineralwater.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mundane.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mundane.png index f0cb578361..0ec7857c86 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mundane.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.mundane.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.png index 5b3d36a968..8e964defb5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.splash.png index 5b3d36a968..1d609bc1fd 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.png index 5b3d36a968..d2e5f93218 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.splash.png index 5b3d36a968..c4c881a06c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.nightvision.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.notchesbrew.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.notchesbrew.png index 60365ce5a1..8bd6c22405 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.notchesbrew.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.notchesbrew.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.piratebrew.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.piratebrew.png index 7ad2bc6be3..698a9be51b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.piratebrew.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.piratebrew.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.png index bcf889f840..1ee518fbff 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.splash.png index bcf889f840..0cff352524 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.png index bcf889f840..67a4a6beb7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.splash.png index bcf889f840..23cd34ed3f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.png index bcf889f840..4bc97fdf1a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.splash.png index bcf889f840..1d480f0555 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.poison.strong.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.potatojuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.potatojuice.png index 3d865eb27f..2bfc11ca51 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.potatojuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.potatojuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.purpledrink.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.purpledrink.png index 231cef62d1..81de671d38 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.purpledrink.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.purpledrink.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.reedwater.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.reedwater.png index f0cb578361..0ec7857c86 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.reedwater.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.reedwater.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.png index 231cef62d1..a96d000b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.splash.png index 231cef62d1..a96d000b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.png index 231cef62d1..a96d000b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.splash.png index 231cef62d1..a96d000b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.png index 231cef62d1..a96d000b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.splash.png index 231cef62d1..a96d000b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.regen.strong.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.rum.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.rum.png index c487ed4fd8..a4e053ccf9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.rum.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.rum.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.saltywater.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.saltywater.png index f0cb578361..0ec7857c86 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.saltywater.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.saltywater.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.scotch.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.scotch.png index ee93a431e6..36448eb5f3 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.scotch.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.scotch.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.png index cf4d17992d..0fae98b0f3 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.splash.png index cf4d17992d..b931c088a9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.png index cf4d17992d..fff51b35c8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.splash.png index cf4d17992d..e4ce5baa06 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.slowness.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.png index eb3c8bfa85..5648ecfeb6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.splash.png index eb3c8bfa85..25683191c2 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.png index eb3c8bfa85..be6e2493e6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.splash.png index eb3c8bfa85..fe831985ca 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.png index eb3c8bfa85..140e447e33 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.splash.png index eb3c8bfa85..2205124e36 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.speed.strong.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.png index 98f87d6387..9cb2acadf6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.splash.png index 98f87d6387..d6722f891e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.png index 98f87d6387..f223667c4e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.splash.png index 98f87d6387..c9aa68ba96 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.png index 98f87d6387..4aa08738ef 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.splash.png index 98f87d6387..a560fc7de0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.strength.strong.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweettea.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweettea.png index 3bf7d3e86d..0ac5c138d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweettea.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.sweettea.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.tea.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.tea.png index 3bf7d3e86d..0ac5c138d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.tea.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.tea.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.thick.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.thick.png index f0cb578361..0ec7857c86 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.thick.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.thick.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vinegar.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vinegar.png index f9a0b6f154..1cf2bb9861 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vinegar.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vinegar.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vodka.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vodka.png index 576101e5c4..794ed73301 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vodka.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.vodka.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.png index 1d13b10aac..c0622021c0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.splash.png index 1d13b10aac..e5e2bb84de 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.png index 1d13b10aac..773957eb2d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.splash.png index 1d13b10aac..10d1a90133 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.waterbreathing.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.png index cf4d17992d..0fae98b0f3 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.splash.png index cf4d17992d..b931c088a9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.long.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.png index cf4d17992d..fff51b35c8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.splash.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.splash.png index cf4d17992d..e4ce5baa06 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.splash.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.weakness.splash.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyhopsjuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyhopsjuice.png index adb8e58f07..dc18889791 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyhopsjuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyhopsjuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyjuice.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyjuice.png index 3d865eb27f..2bfc11ca51 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyjuice.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wheatyjuice.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wine.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wine.png index b2af7571d5..2a556a12b5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wine.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.potion.wine.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png index 6937fe1e21..93c937e777 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.seedoil.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.seedoil.png index c26ffca7bd..f75bfb67b0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.seedoil.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.seedoil.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.silicon.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.silicon.png index ee54d8fdda..65e1aa72b9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.silicon.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.silicon.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodium.png index f0cb578361..0ec7857c86 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodiumpersulfate.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodiumpersulfate.png index 28517db38f..3de580dbe4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodiumpersulfate.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.sodiumpersulfate.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.squidink.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.squidink.png index 6c0290c38b..ef8b07e15a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.squidink.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.squidink.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.steam.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.steam.png index b80acb3df2..c0345ac54b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.steam.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.steam.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.titaniumtetrachloride.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.titaniumtetrachloride.png index f5195a76c7..67084c8fb2 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.titaniumtetrachloride.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.titaniumtetrachloride.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.uuamplifier.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.uuamplifier.png index 231cef62d1..a96d000b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.uuamplifier.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.uuamplifier.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png index 429cd51f7d..27d3a0e43c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wolframium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wolframium.png index cda3ae78bd..86b084ea73 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wolframium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wolframium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS.png index 7d4e5734d1..e6e2e57f35 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CHISELED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CHISELED.png index 7c32af0ddb..6d6c1ddfc8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CHISELED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CHISELED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CRACKED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CRACKED.png index 634881a50e..ced32822a8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CRACKED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_CRACKED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_MOSSY.png index aacdcd3b87..302581d859 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_BRICKS_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE.png index 66646dc63f..c3127ba6e7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE_MOSSY.png index 9a13b6abb1..2503cf2801 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BASALT_COBBLE_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.png index 49dcdf14d9..71a675010a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLAZE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DILITHIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DILITHIUM.png index 0c84f0bc5a..53b1f3a88e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DILITHIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DILITHIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCICIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCICIUM.png index 75674ccb75..1adf9d3587 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCICIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCICIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCILLIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCILLIUM.png index 75674ccb75..1adf9d3587 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCILLIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCILLIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ICHORIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ICHORIUM.png index 7774b9264f..20f5c78db1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ICHORIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ICHORIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png index a796ba54ec..a4828d2439 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NETHERSTAR.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NETHERSTAR.png index 0c84f0bc5a..53b1f3a88e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NETHERSTAR.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NETHERSTAR.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png index a34cc25ab7..42a2d3dbe3 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUMPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ORDOCRYSTAL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ORDOCRYSTAL.png index 0c84f0bc5a..53b1f3a88e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ORDOCRYSTAL.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ORDOCRYSTAL.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PERDITIOCRYSTAL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PERDITIOCRYSTAL.png index 8d571951c6..dbee00baf4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PERDITIOCRYSTAL.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PERDITIOCRYSTAL.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PLASCRETE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PLASCRETE.png index 092cf05057..ff3054dca1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PLASCRETE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_PLASCRETE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELEAF.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELEAF.png index f8be2f79da..4148a5eae9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELEAF.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELEAF.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png index fba7456790..f2359665cd 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_STEELPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png index 37b52eddb5..1db84e04c8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TITANIUMPREIN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TRINIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TRINIUM.png index 853f1e751d..91ca406767 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TRINIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TRINIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TUNGSTENSTEEL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TUNGSTENSTEEL.png index 9d7df62325..bceec10ed1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TUNGSTENSTEEL.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_TUNGSTENSTEEL.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CFOAM_HARDENED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CFOAM_HARDENED.png index 092cf05057..ff3054dca1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CFOAM_HARDENED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CFOAM_HARDENED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CHISELED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CHISELED.png index 86958feb32..d62e67e243 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CHISELED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CHISELED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CRACKED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CRACKED.png index b10608eb18..f3ea72ba63 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CRACKED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_CRACKED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_MOSSY.png index 5ff5faff88..d11626dbfc 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_BRICKS_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE.png index e74216f285..fdfc5b19e6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE_MOSSY.png index ad4aa968e4..88b57641a9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_DARK_COBBLE_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS.png index 9ff43ff2ea..bc2f73369c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CHISELED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CHISELED.png index b32e1a5acf..2dda5f9b7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CHISELED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CHISELED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CRACKED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CRACKED.png index 8d33383217..aec8846da6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CRACKED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_CRACKED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_MOSSY.png index 73f66f2aea..a47c360364 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_BRICKS_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE.png index 457eadea28..95a83a3257 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE_MOSSY.png index 2c8a07f4d9..631c754b42 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/CONCRETE_LIGHT_COBBLE_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/COVER_WOOD_PLATE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/COVER_WOOD_PLATE.png index a2fca2fe7e..9b4ac17f0a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/COVER_WOOD_PLATE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/COVER_WOOD_PLATE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_CRACKED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_CRACKED.png index cfcc52dc3c..eef200bd83 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_CRACKED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_CRACKED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_MOSSY.png index ec3725001a..c2561733bb 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_BRICKS_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE.png index 512d5ac618..abea572c6c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE_MOSSY.png index 88b0168b74..731ad790b8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_BLACK_COBBLE_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS.png index 724ef5abd8..b93b175a38 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CHISELED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CHISELED.png index 8210ca7e43..09a72cd7ad 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CHISELED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CHISELED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CRACKED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CRACKED.png index 517ab9982e..5e8e5d30d5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CRACKED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_CRACKED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_MOSSY.png index 5c2cc3bb70..684b09c85f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_BRICKS_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE.png index a2ee4b9b23..17712b6250 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE_MOSSY.png index c8da8aa8fb..397b092845 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_COBBLE_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_SMOOTH.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_SMOOTH.png index 596f65f3ed..8dd88ff603 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_SMOOTH.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_SMOOTH.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_STONE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_STONE.png index 919fa794fe..3b7a0c32c4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_STONE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GRANITE_RED_STONE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png index c1b2be1924..7f896a09f0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_LARGE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png index 3d0789f019..666d51b82f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/INSULATION_MEDIUM_PLUS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png index 6573e17380..f863ec49e6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_SS_ACTIVE5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png index 42c0a50871..4f7704cee8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png index 82772a1a3a..b438ec172d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png index 70783988ac..7559ff7e09 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png index 0fa7d36b73..199fe6264c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png index 9f63457796..5ca1b2694f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_ST_ACTIVE8.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png index 6573e17380..f863ec49e6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TI_ACTIVE5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png index 6573e17380..f863ec49e6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/LARGETURBINE_TU_ACTIVE5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png index 6373c0b97c..27e88f3851 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_BRONZEBRICKS_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK.png index f455724d5b..50323cb7b3 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_0.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_0.png index 750bdb0949..eeb9b81523 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_0.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_0.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_1.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_1.png index 4553218967..ff5be69bea 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_1.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_10.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_10.png index 3fac5c3635..a2985d0e80 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_10.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_10.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_11.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_11.png index 82e465f66d..9f464a2f27 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_11.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_11.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_12.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_12.png index e140992b32..5c904887a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_12.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_12.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_13.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_13.png index c2700caaaa..c2ed891b3a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_13.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_13.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_14.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_14.png index 71810e5b19..3dbb4aef90 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_14.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_14.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_15.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_15.png index 06e480f3fd..391fe46643 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_15.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_15.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_2.png index 636d3f0814..818f4aac27 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_2.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_3.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_3.png index c24715f9ce..95d50988b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_3.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_4.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_4.png index c24715f9ce..95d50988b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_4.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_5.png index 2f8dea6274..7fbfaed6f9 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_5.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_6.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_6.png index 0a88de15f5..ad4201a26a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_6.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_7.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_7.png index 372a56e73b..3350bd2b1a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_7.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_7.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_8.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_8.png index 372a56e73b..3350bd2b1a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_8.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_8.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_9.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_9.png index b41007308f..61b2f419c0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_9.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_TANK_9.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_AWAKENEDDRACONIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_AWAKENEDDRACONIUM.png index a127301092..c512e7a49a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_AWAKENEDDRACONIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_AWAKENEDDRACONIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ELECTRUMFLUX.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ELECTRUMFLUX.png index cbc73237b8..bd67a96008 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ELECTRUMFLUX.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_COIL_ELECTRUMFLUX.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_BOTTOM.png index 921e0280de..af2b3b2037 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_SIDE.png index 921e0280de..af2b3b2037 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_TOP.png index 921e0280de..af2b3b2037 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAXV_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_BOTTOM.png index 5d54205d67..cf7b890a15 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_SIDE.png index 5d54205d67..b6194762d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_TOP.png index 5d54205d67..1eda91e544 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_MAX_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_BOTTOM.png index 4d6c5c4feb..ad519ab78d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_SIDE.png index 4d6c5c4feb..ad519ab78d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_TOP.png index 4d6c5c4feb..ad519ab78d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_OPV_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png index 6373c0b97c..f8b164b50e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_STEELBRICKS_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_BOTTOM.png index dac4ea4b28..27a092adf4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_SIDE.png index dac4ea4b28..27a092adf4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_TOP.png index dac4ea4b28..27a092adf4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UEV_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_BOTTOM.png index 7225d38ce1..a2d780dc32 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_SIDE.png index 7225d38ce1..a2d780dc32 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_TOP.png index 7225d38ce1..a2d780dc32 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UIV_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_BOTTOM.png index eafa7a9a2d..a401c3900d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_SIDE.png index eafa7a9a2d..a401c3900d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_TOP.png index eafa7a9a2d..a401c3900d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UMV_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_BOTTOM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_BOTTOM.png index d0b9fa5a20..a3564826ac 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_BOTTOM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_BOTTOM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_SIDE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_SIDE.png index d0b9fa5a20..a3564826ac 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_SIDE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_SIDE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_TOP.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_TOP.png index d0b9fa5a20..a3564826ac 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_TOP.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_UXV_TOP.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS.png index 6062a15b70..5fc418d2d4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CHISELED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CHISELED.png index 6aad608f4c..d47b0b51ea 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CHISELED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CHISELED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CRACKED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CRACKED.png index a116864b60..fb2a493618 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CRACKED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_CRACKED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_MOSSY.png index b07112c08e..42a57e755e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_BRICKS_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE.png index 2600aea71d..cfd27b4fe0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE_MOSSY.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE_MOSSY.png index f82b76f050..a7c74f987a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE_MOSSY.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MARBLE_COBBLE_MOSSY.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE.png index 7779e4f773..0174dd645a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE_IDLE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE_IDLE.png index 308bb6f8d7..62895be74a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE_IDLE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_AUTOMAINTENANCE_IDLE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png index 4d2137a0b9..02393fe829 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_POWER.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png index bbfe389070..399b32696d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_POWER.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ROCK_BREAKER_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ROCK_BREAKER_ACTIVE.png index 10661df44a..872154d256 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ROCK_BREAKER_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_ROCK_BREAKER_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png index a4f1723327..9f3de110d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCHEST.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png index c78a44f6d8..4473aab984 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_SCREEN.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png index a4f1723327..9f3de110d1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_STANK.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER.png index d92c07a0fa..2b97474b4f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png index 98c7a2dc44..de39763401 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_SIDES.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_SIDES.png index 7ed8076762..cfe73788f4 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_SIDES.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TELEPORTER_SIDES.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_STEAM_MACERATOR_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_STEAM_MACERATOR_ACTIVE.png index 37f505db3c..ee39a79a98 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_STEAM_MACERATOR_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_TOP_STEAM_MACERATOR_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block1.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block1.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block1.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block1.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FIERY/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block1.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/ore.png index 46ede5268c..101c04c698 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/ore.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/ore.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FINE/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block1.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLINT/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block1.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/FLUID/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block1.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block1.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_VERTICAL/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block1.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/GLASS/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block1.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LAPIS/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block1.png index 7bd6f6f1fd..78695fb493 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/ore.png index 46ede5268c..101c04c698 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/ore.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LEAF/ore.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block1.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/ore.png index 46ede5268c..101c04c698 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/ore.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/ore.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/LIGNITE/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block1.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/MAGNETIC/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block1.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/METALLIC/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block1.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NETHERSTAR/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block1.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/NONE/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block1.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/OPAL/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block1.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/PAPER/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block1.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/POWDER/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block1.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/ore.png index 46ede5268c..101c04c698 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/ore.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/ore.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/QUARTZ/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block1.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/ROUGH/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block1.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/RUBY/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block1.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/ore.png index 46ede5268c..101c04c698 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/ore.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/ore.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SAND/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block1.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHARDS/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block1.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeLarge.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeLarge.png index a3303a32d8..65529e2772 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeLarge.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeLarge.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeMedium.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeMedium.png index ab160124d7..06b3e0d189 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeMedium.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeMedium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeSmall.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeSmall.png index 07697a3104..b5e620f045 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeSmall.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/SHINY/pipeSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block1.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block1.png index 7bd6f6f1fd..78695fb493 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block1.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block2.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block2.png index acc0ffba07..a56a62ad1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block2.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block3.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block3.png index ef14045e3c..6de77b309b 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block3.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block4.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block4.png index 2421b3880e..e5f7b5e76f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block4.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block5.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block5.png index 9ec4cbcf63..4bb49067ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block5.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block6.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block6.png index 605905b0ad..b58ded215f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block6.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/block6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/frameGt.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/frameGt.png index 1be3d77ac9..d93c52c24c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/frameGt.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/frameGt.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/ore.png b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/ore.png index 46ede5268c..101c04c698 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/ore.png and b/src/main/resources/assets/gregtech/textures/blocks/materialicons/WOOD/ore.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/1by1.png b/src/main/resources/assets/gregtech/textures/gui/1by1.png index 88a9dd37ab..816e27a66b 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/1by1.png and b/src/main/resources/assets/gregtech/textures/gui/1by1.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/2by2.png b/src/main/resources/assets/gregtech/textures/gui/2by2.png index 7d9c5ba51b..b484485b28 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/2by2.png and b/src/main/resources/assets/gregtech/textures/gui/2by2.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/3by3.png b/src/main/resources/assets/gregtech/textures/gui/3by3.png index cb1185fd05..1e5520d8c6 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/3by3.png and b/src/main/resources/assets/gregtech/textures/gui/3by3.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/4by4.png b/src/main/resources/assets/gregtech/textures/gui/4by4.png index dff1fcb579..b01d9b444f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/4by4.png and b/src/main/resources/assets/gregtech/textures/gui/4by4.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/AdvancedCraftingTable.png b/src/main/resources/assets/gregtech/textures/gui/AdvancedCraftingTable.png index 6ebfdda2a3..3d5cc1591e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/AdvancedCraftingTable.png and b/src/main/resources/assets/gregtech/textures/gui/AdvancedCraftingTable.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/BasicTank.png b/src/main/resources/assets/gregtech/textures/gui/BasicTank.png index 1ab07410b0..f70f06294d 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/BasicTank.png and b/src/main/resources/assets/gregtech/textures/gui/BasicTank.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png b/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png index f1dc26e1cd..558db61062 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png b/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png index cd6d834d13..9642624d6e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/BronzeBoiler.png b/src/main/resources/assets/gregtech/textures/gui/BronzeBoiler.png index 011207c770..12a7d92d27 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/BronzeBoiler.png and b/src/main/resources/assets/gregtech/textures/gui/BronzeBoiler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/BronzeCraftingTable.png b/src/main/resources/assets/gregtech/textures/gui/BronzeCraftingTable.png index 1839823f07..fa432b2805 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/BronzeCraftingTable.png and b/src/main/resources/assets/gregtech/textures/gui/BronzeCraftingTable.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/ChestBuffer.png b/src/main/resources/assets/gregtech/textures/gui/ChestBuffer.png index 8901e60a4f..448f09f4b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/ChestBuffer.png and b/src/main/resources/assets/gregtech/textures/gui/ChestBuffer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/ComputerCubeRedstone.png b/src/main/resources/assets/gregtech/textures/gui/ComputerCubeRedstone.png index 3fb234f8af..cd287a0a2e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/ComputerCubeRedstone.png and b/src/main/resources/assets/gregtech/textures/gui/ComputerCubeRedstone.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/CropHarvestor.png b/src/main/resources/assets/gregtech/textures/gui/CropHarvestor.png index 2b0508d23a..12ce68e790 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/CropHarvestor.png and b/src/main/resources/assets/gregtech/textures/gui/CropHarvestor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/DataAccess2by2.png b/src/main/resources/assets/gregtech/textures/gui/DataAccess2by2.png index 77f2d6df7b..99cf426016 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/DataAccess2by2.png and b/src/main/resources/assets/gregtech/textures/gui/DataAccess2by2.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/DataAccess4by4.png b/src/main/resources/assets/gregtech/textures/gui/DataAccess4by4.png index fd6450bb24..8755bacc85 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/DataAccess4by4.png and b/src/main/resources/assets/gregtech/textures/gui/DataAccess4by4.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/ElectricAutoWorkbench.png b/src/main/resources/assets/gregtech/textures/gui/ElectricAutoWorkbench.png index 880dc58461..74b2edbb82 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/ElectricAutoWorkbench.png and b/src/main/resources/assets/gregtech/textures/gui/ElectricAutoWorkbench.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/ElectricBufferSmall.png b/src/main/resources/assets/gregtech/textures/gui/ElectricBufferSmall.png index 0028d88412..9417d6e5d8 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/ElectricBufferSmall.png and b/src/main/resources/assets/gregtech/textures/gui/ElectricBufferSmall.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/ElectricItemCleaner.png b/src/main/resources/assets/gregtech/textures/gui/ElectricItemCleaner.png index 1fdfdb9366..4b046535d0 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/ElectricItemCleaner.png and b/src/main/resources/assets/gregtech/textures/gui/ElectricItemCleaner.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png b/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png index 4f1264a6da..e56d1e686e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png and b/src/main/resources/assets/gregtech/textures/gui/FakeAssemblyline.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Filter.png b/src/main/resources/assets/gregtech/textures/gui/Filter.png index a06d32dfb7..c8dbeaffcd 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Filter.png and b/src/main/resources/assets/gregtech/textures/gui/Filter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Implosion.png b/src/main/resources/assets/gregtech/textures/gui/Implosion.png index 20faf5060f..7e855b192a 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Implosion.png and b/src/main/resources/assets/gregtech/textures/gui/Implosion.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/InventoryManager.png b/src/main/resources/assets/gregtech/textures/gui/InventoryManager.png index fd60362015..dfebd41ab3 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/InventoryManager.png and b/src/main/resources/assets/gregtech/textures/gui/InventoryManager.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/ItemDistributor.png b/src/main/resources/assets/gregtech/textures/gui/ItemDistributor.png index 6b238d6d4c..bb66203449 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/ItemDistributor.png and b/src/main/resources/assets/gregtech/textures/gui/ItemDistributor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/MagicAbsorber.png b/src/main/resources/assets/gregtech/textures/gui/MagicAbsorber.png index 6c642cbb0c..cb6915fc80 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/MagicAbsorber.png and b/src/main/resources/assets/gregtech/textures/gui/MagicAbsorber.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Maintenance.png b/src/main/resources/assets/gregtech/textures/gui/Maintenance.png index 7aa0815cf5..dc28806114 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Maintenance.png and b/src/main/resources/assets/gregtech/textures/gui/Maintenance.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/RedstoneCircuitBlock.png b/src/main/resources/assets/gregtech/textures/gui/RedstoneCircuitBlock.png index 91adc35d51..0df259c657 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/RedstoneCircuitBlock.png and b/src/main/resources/assets/gregtech/textures/gui/RedstoneCircuitBlock.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Regulator.png b/src/main/resources/assets/gregtech/textures/gui/Regulator.png index 653819a7e7..ecc62186e0 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Regulator.png and b/src/main/resources/assets/gregtech/textures/gui/Regulator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Retriever.png b/src/main/resources/assets/gregtech/textures/gui/Retriever.png index 5e4273f451..ca704ab131 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Retriever.png and b/src/main/resources/assets/gregtech/textures/gui/Retriever.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Safe.png b/src/main/resources/assets/gregtech/textures/gui/Safe.png index 504b3b96f9..7a56266b88 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Safe.png and b/src/main/resources/assets/gregtech/textures/gui/Safe.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/SolarBoiler.png b/src/main/resources/assets/gregtech/textures/gui/SolarBoiler.png index c8ee4febe5..266b060dae 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/SolarBoiler.png and b/src/main/resources/assets/gregtech/textures/gui/SolarBoiler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/SolarHPBoiler.png b/src/main/resources/assets/gregtech/textures/gui/SolarHPBoiler.png deleted file mode 100644 index 8f5324aeff..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/SolarHPBoiler.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Sonictron.png b/src/main/resources/assets/gregtech/textures/gui/Sonictron.png index be0bb0aee5..ca259f6e92 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Sonictron.png and b/src/main/resources/assets/gregtech/textures/gui/Sonictron.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/SteelBoiler.png b/src/main/resources/assets/gregtech/textures/gui/SteelBoiler.png index b5c611cb54..3d702e5e26 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/SteelBoiler.png and b/src/main/resources/assets/gregtech/textures/gui/SteelBoiler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/SuperBuffer.png b/src/main/resources/assets/gregtech/textures/gui/SuperBuffer.png index c4d69770b6..d6bcef70b6 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/SuperBuffer.png and b/src/main/resources/assets/gregtech/textures/gui/SuperBuffer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Teleporter.png b/src/main/resources/assets/gregtech/textures/gui/Teleporter.png index 7c55244052..84d064d3dd 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Teleporter.png and b/src/main/resources/assets/gregtech/textures/gui/Teleporter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Inventory.png b/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Inventory.png index 04035b63c8..ba6cc37a2e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Inventory.png and b/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Inventory.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Main.png b/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Main.png index 942b64dae2..ac80150143 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Main.png and b/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Main.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Settings.png b/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Settings.png index 1fce53c657..d6e9228961 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Settings.png and b/src/main/resources/assets/gregtech/textures/gui/Tradeomat_Settings.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/TypeFilter.png b/src/main/resources/assets/gregtech/textures/gui/TypeFilter.png index cd0fc3b1c4..78695e82e5 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/TypeFilter.png and b/src/main/resources/assets/gregtech/textures/gui/TypeFilter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png b/src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png index 1dbaec1d3c..59004127eb 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png and b/src/main/resources/assets/gregtech/textures/gui/VolumetricFlask.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/armorgui3x3.png b/src/main/resources/assets/gregtech/textures/gui/armorgui3x3.png index a41d3354f5..1f1859a733 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/armorgui3x3.png and b/src/main/resources/assets/gregtech/textures/gui/armorgui3x3.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/armorgui3x4.png b/src/main/resources/assets/gregtech/textures/gui/armorgui3x4.png index 0f40d89028..a0d052a344 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/armorgui3x4.png and b/src/main/resources/assets/gregtech/textures/gui/armorgui3x4.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/AlloySmelter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/AlloySmelter.png index 895e1b036d..c6e692c8f1 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/AlloySmelter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/AlloySmelter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Amplifabricator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Amplifabricator.png index 36701b0ede..428aadf1d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Amplifabricator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Amplifabricator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ArcFurnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ArcFurnace.png index ca03fc27ab..ea08d17ff6 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ArcFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ArcFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png index 674c968d7b..7ab09c5f2e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png index b6c69403fa..a52fee09ba 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png index 9fa088f033..b619826025 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Bender.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Bender.png index 98a9226759..aa29df83d4 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Bender.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Bender.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png index 1b6fa4e9e1..54e112e67b 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeAlloySmelter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png index 29317bc001..d34569c5f3 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeCompressor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png index 872079e18e..decb60232f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeExtractor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png index 479a0c7c75..6bbe2eb904 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png index b679e8a7b8..dc9bbc559d 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeHammer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png index 62b8ed9e79..38af0ee224 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/BronzeMacerator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Canner.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Canner.png index 9232ff01ce..7a49b19be0 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Canner.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Canner.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Centrifuge.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Centrifuge.png index fc806eb224..44626e8d27 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Centrifuge.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Centrifuge.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png index c80a688fec..9a2e4ff2ab 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalBath.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png index 77a57268f6..6e3fbbea62 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ChemicalReactor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.png index ce4d3faac7..003c21061f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Compressor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Compressor.png index 5ccf8f46f8..8e5c86fe28 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Compressor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Compressor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter.png index 85861c3353..808c818e6c 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png index 5fb7c3fe73..57d556dc77 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Cutter2.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Default.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Default.png index 179e9471cf..628d86f05f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Default.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Default.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Disassembler.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Disassembler.png index 87273ae994..a53690a20f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Disassembler.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Disassembler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png index f70cfacbce..0fb00229d7 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Distillery.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Distillery.png index 5624165ccf..48d0d8773e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Distillery.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Distillery.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Furnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Furnace.png index a393639e92..0ca33f7564 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Furnace.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Furnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Oven.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Oven.png index a393639e92..0ca33f7564 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Oven.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/E_Oven.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Electrolyzer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Electrolyzer.png index 97e034b5d3..a55c3e375c 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Electrolyzer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Electrolyzer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ElectromagneticSeparator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ElectromagneticSeparator.png index 65fdc6afa2..fc559a016b 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ElectromagneticSeparator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ElectromagneticSeparator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extractor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extractor.png index 385ad036bc..da2b5ad0cd 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extractor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extractor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extruder.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extruder.png index 1d21e295a0..1e5ea466df 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extruder.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Extruder.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Fermenter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Fermenter.png index e26442429a..059fbb66e3 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Fermenter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Fermenter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCanner.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCanner.png index 8ea4355400..69e6543cb7 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCanner.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCanner.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCannerNEI.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCannerNEI.png index 3c5dbf83d1..2ca461306c 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCannerNEI.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidCannerNEI.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidExtractor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidExtractor.png index 64205f6774..f49591b300 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidExtractor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidExtractor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidHeater.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidHeater.png index caf99a648e..67d62b987f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidHeater.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidHeater.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidSolidifier.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidSolidifier.png index 7769f708ff..4d2de6d58f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidSolidifier.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FluidSolidifier.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionReactor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionReactor.png index ea4b4c542e..f72b37ac2f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionReactor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/FusionReactor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Hammer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Hammer.png index 05720e21d8..8640de0b3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Hammer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Hammer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/LaserEngraver.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/LaserEngraver.png index 1c48550537..7a94619dad 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/LaserEngraver.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/LaserEngraver.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Lathe.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Lathe.png index 2357790895..cb099355c5 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Lathe.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Lathe.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator1.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator1.png index 6304367df2..4ed79cedae 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator1.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator1.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator2.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator2.png index 2a1f3f9032..78f8b3cc00 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator2.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator2.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator3.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator3.png index b807ce3f0d..66cf9ade79 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator3.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator3.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator4.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator4.png index 373199800d..9754f2cd94 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator4.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Macerator4.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Massfabricator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Massfabricator.png index 08ee9fc94d..23c940fad0 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Massfabricator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Massfabricator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Miner.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Miner.png index 813ede2e54..a9d7978b69 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Miner.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Miner.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer.png index 0e1bdd6cfb..592eb6e307 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png index 179e9471cf..628d86f05f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png index ea4b4c542e..f72b37ac2f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/OilCracker.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/OreWasher.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/OreWasher.png index f73814729a..52c1e18717 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/OreWasher.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/OreWasher.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Packager.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Packager.png index 2eb18ac721..2e0690d656 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Packager.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Packager.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaArcFurnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaArcFurnace.png index 7d72bbbe9e..9fa8401648 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaArcFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaArcFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Polarizer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Polarizer.png index 0000e46d4c..a60bb4a3bc 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Polarizer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Polarizer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/PotionBrewer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/PotionBrewer.png index 288661f70f..8d543ccced 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/PotionBrewer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/PotionBrewer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Press.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Press.png index 6fa42f25de..e4efb0cc12 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Press.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Press.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Printer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Printer.png index 554f246ce6..8dc7155bb9 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Printer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Printer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Recycler.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Recycler.png index 18c01099fc..b4a99d7005 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Recycler.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Recycler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Replicator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Replicator.png index fc4d7cc332..f671c60c15 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Replicator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Replicator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/RockBreaker.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/RockBreaker.png index d0f574a6ec..fe0ef260f3 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/RockBreaker.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/RockBreaker.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Scanner.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Scanner.png index 9238fcb73b..515cdb43f3 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Scanner.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Scanner.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Sifter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Sifter.png index c664b92257..d967ed46d6 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Sifter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Sifter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Slicer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Slicer.png index a4172d49a3..31a86e37f9 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Slicer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Slicer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png index 48b7397bd2..862c785606 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelAlloySmelter.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png index 928fc91d23..cca9978663 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelCompressor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png index 057c3d22be..700944727f 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelExtractor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png index 6f719db331..0250f22b31 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png index 03b111376d..f379f8c000 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelHammer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png index 85099c362f..141879d5b6 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/SteelMacerator.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ThermalCentrifuge.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ThermalCentrifuge.png index 1a09c456ce..859f6e507a 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/ThermalCentrifuge.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/ThermalCentrifuge.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Unpackager.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Unpackager.png index 105024c8ed..6fbe611400 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Unpackager.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Unpackager.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Wiremill.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Wiremill.png index d4eae8f968..47904bea1e 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Wiremill.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Wiremill.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/Advanced_Miner2.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/Advanced_Miner2.png index 0a09ba62d7..7c9bbc058a 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/Advanced_Miner2.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/Advanced_Miner2.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/AssemblyLine.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/AssemblyLine.png index 36105ebc2e..3998db0137 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/AssemblyLine.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/AssemblyLine.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png index 3889b80a9e..65e6ac3197 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.png index ed7c1c9752..f05441593d 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/ElectricBlastFurnace.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/ElectricBlastFurnace.png index b05fb723e0..2ad960beb0 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/ElectricBlastFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/ElectricBlastFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/FusionComputer.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/FusionComputer.png index 0782e40a97..bf6a2f87c3 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/FusionComputer.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/FusionComputer.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/ImplosionCompressor.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/ImplosionCompressor.png index 36105ebc2e..3998db0137 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/ImplosionCompressor.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/ImplosionCompressor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeBoiler.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeBoiler.png index 396ccf40aa..ba06f705b8 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeBoiler.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeBoiler.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png index 0880731c5b..2d7771a4ef 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeChemicalReactor.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png index be4710fd0d..b9271e2140 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeDieselEngine.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeHeatExchanger.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeHeatExchanger.png index f81f62032c..9f0f9d59b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeHeatExchanger.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeHeatExchanger.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.png index fc820c8dfa..296d75f9dd 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiFurnace.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiFurnace.png index 48fd886a08..52fdd6a5c5 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiFurnace.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiFurnace.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiblockDisplay.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiblockDisplay.png index 0f6fb0936b..f2def4b3f0 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiblockDisplay.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/MultiblockDisplay.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.png index 0bb2a5b47f..57e92ac9db 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png index 3dbf7e4efa..7b60ec4de7 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/OreDrillingPlant.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/ProcessingArray.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/ProcessingArray.png index 36105ebc2e..3998db0137 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/ProcessingArray.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/ProcessingArray.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png index 6d139ba830..d3bc30c7bd 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/VacuumFreezer.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/VacuumFreezer.png index 36105ebc2e..3998db0137 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/VacuumFreezer.png and b/src/main/resources/assets/gregtech/textures/gui/multimachines/VacuumFreezer.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.360k_NaK_Coolantcell.png b/src/main/resources/assets/gregtech/textures/items/gt.360k_NaK_Coolantcell.png index e0de765db3..8f5958a099 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.360k_NaK_Coolantcell.png and b/src/main/resources/assets/gregtech/textures/items/gt.360k_NaK_Coolantcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCell.png b/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCell.png index 1ec51c9e3f..295686fa5d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCell.png and b/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCellDep.png index 4a2be79c54..4e51faddc2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.Double_MNqCellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png b/src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png index c52420770a..a15cef8e90 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png and b/src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png index 593a167a60..56735e5646 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.MNqCell.png b/src/main/resources/assets/gregtech/textures/items/gt.MNqCell.png index ddfa6d5fe2..b81e9b6e3a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.MNqCell.png and b/src/main/resources/assets/gregtech/textures/items/gt.MNqCell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.MNqCellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.MNqCellDep.png index fb0f36fdf6..40eb4a6256 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.MNqCellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.MNqCellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png b/src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png index c876a5043d..f9a1d03de5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png and b/src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png index 04b7102011..72d635ac50 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCell.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCell.png index 497b67456a..a1d34540f7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCell.png and b/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCellDep.png index 86635d2eeb..100dbe5da1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.Quad_MNqCellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png index b8d0086e2c..8209d57b72 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png and b/src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png index 32028fde1d..f812d369eb 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_Thoriumcell.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_Thoriumcell.png index 79ad4bcedf..fa65528d47 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Quad_Thoriumcell.png and b/src/main/resources/assets/gregtech/textures/items/gt.Quad_Thoriumcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_ThoriumcellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_ThoriumcellDep.png index 79ad4bcedf..fa65528d47 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Quad_ThoriumcellDep.png and b/src/main/resources/assets/gregtech/textures/items/gt.Quad_ThoriumcellDep.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png index c6f58f31da..567eccb544 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png and b/src/main/resources/assets/gregtech/textures/items/gt.Volumetric_Flask.window.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/0.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/0.png index 00cbd2ffe8..a1b0d09dc3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/0.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/0.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/1.png index 20f3cc68b4..b74ffa65ab 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/1.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/11.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/11.png index f2f82eccb9..6d3655a1fe 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/11.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/11.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/13.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/13.png index 837f19ae17..bfb8e56d0b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/13.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/13.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/14.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/14.png index f8345b4f0e..2228b9297e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/14.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/14.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/16.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/16.png index 07ed984368..874c4077fc 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/16.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/16.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/2.png index b2c7782dba..f09fc0259c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/2.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/3.png index 317ad0ef3b..ff87bf6f79 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/3.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png index 1edb7a15de..855dbae37d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png index f6b5b5f9b6..7f04b405b4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png index 47e8a16089..f2f2fca912 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png index de34f33840..9fcb969478 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png index df3378f7dc..8577b6dc61 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png index 117f3c8b68..2347de612c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png index 6469277455..2bddc5f15d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png index 5f1c81c0a6..d2420b624d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/325.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/325.png index db2df22f33..0ba7b70c02 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/325.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/325.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png index 4d7815f860..47545b369a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/375.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/375.png index 59ca3515a7..356a6711aa 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/375.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/375.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/376.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/376.png index a169f426c7..b582d4f07f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/376.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/376.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/4.png index 5e44f19076..7747e58e7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/4.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png index 00611b5e01..6d2a21cf93 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png index 77768bae23..86ae8dd7e2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png index c7b89790c6..3131758123 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png index 148815872c..0a9d1f880d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png index 3f59110864..61f7255c52 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png index 88359590f2..5cba994104 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png index 86edea02fa..80cd9711cd 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/462.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/462.png index 2004533fcd..44407a7a10 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/462.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/462.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/463.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/463.png index f4c1775ccf..713c2f5350 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/463.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/463.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/464.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/464.png index 043bd4a44b..bce9843201 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/464.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/464.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/482.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/482.png index 3fc54f7220..6cd6dfdea4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/482.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/482.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/483.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/483.png index 0f8d981f60..84cd6f024d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/483.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/483.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/484.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/484.png index 61672e8a54..bc4b420950 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/484.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/484.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/5.png index 0150b44f92..540554a37f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/5.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png index d2a3daa888..2f465760da 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png index c618f9b615..fd3942cad6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png index 24a51a0800..ed27c58baf 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png index 98e8deb8ad..ae3bcc1789 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png index bd447a7bb7..2ce8b2bca5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png index e9d3a4f72f..024f812e55 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png index a12707c367..64076bd7d4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png index da60c6f964..d9ca638485 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/8.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/6.png index 021b28b1b6..e296a0b48f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/6.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/1.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/1.png index 716d8e150e..5b01e1f1a2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/1.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/2.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/2.png index 22f91d7823..c8c2259ec7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/2.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/3.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/3.png index d63443e360..8278e8a66a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/3.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/4.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/4.png index 6092bc12eb..4f8af6fbaa 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/4.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/5.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/5.png index 6c4b604625..2bcd2f7e98 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/5.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/6.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/6.png index 8666340761..68f76dba01 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/6.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/7.png index 113fe9c6c9..de3ce2451b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/7.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/8.png index 8b4916eef9..a9f16893b2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/8.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/609/8.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png index cf430d6f1f..a09eb16257 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/660.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png index 8b43335e27..31e316ba9b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/661.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png index 47425937d1..bfa4437a85 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/662.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png index 2431f37bb9..22af0f52b1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/663.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png index b8c02d7ca8..8281767ef1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/664.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/665.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/665.png index 32c6aa37ce..14f335dbbd 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/665.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/665.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png index 9e3e6da8ef..025faa6a97 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png index 056d2e0865..72648106ec 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/669.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/669.png index 444de8ed2b..dc7a207ee0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/669.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/669.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/7.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/7.png index d27053acea..6056701582 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/7.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png index f0b57bed57..0084f55bf6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/702.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/722.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/722.png index 8163bebda5..8507f96101 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/722.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/722.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/723.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/723.png index 665ca11b09..f956068e7a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/723.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/723.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png index dea697ac99..e14156d0f9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/750.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png index 2be57fcf4b..7fc79276ee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/751.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png index 3fff541b06..edf04adc3d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/752.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png index b1661302c4..d181c017ed 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/753.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png index 143d772de3..190c30550b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/754.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png index ac4a34d0eb..7bd3b543a4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/755.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png index 634aef28e0..f7187595f1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/756.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png index cf6836a613..93c9ca2bf3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/757.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png index 1e104010f3..52df2bd8a2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/758.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png index f3c9520ef8..abf9e56ba7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/759.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/763.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/763.png index 56fa1f0974..7a77ff965e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/763.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/763.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/202.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/202.png index cd9dfabdf8..65ecfe6b40 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/202.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/202.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/214.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/214.png index 1768010582..0ed1a61146 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/214.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/214.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/220.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/220.png index eac9b08f9f..1cddc93f83 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/220.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/220.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/221.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/221.png index 47bc372116..d832abf23a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/221.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/221.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/222.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/222.png index 618632b305..a2411f6a1a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/222.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/222.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/223.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/223.png index dec24c7c6e..9b2acc43e1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/223.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/223.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/224.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/224.png index 7be214bead..1a2eb80c80 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/224.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/224.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/230.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/230.png index 701103838d..c693d33d6d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/230.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/230.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/233.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/233.png index 2d7e2df62d..18d69da397 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/233.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/233.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/240.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/240.png index 0f6c8ab694..5592fb8aec 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/240.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/240.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/241.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/241.png index ab0a274903..bbc35833a6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/241.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/241.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/242.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/242.png index fb95a84da1..8131ae5399 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/242.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/242.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/243.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/243.png index 9e9ff2355d..c175c92c50 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/243.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/243.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/419.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/419.png index 111ba51fc3..d5f6394f54 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/419.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/419.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/425.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/425.png index e3ae86619c..e482a1864a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/425.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/425.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/426.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/426.png index ff6d34692a..cc67c6d8f0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/426.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/426.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/427.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/427.png index 96ae060697..95582c7d76 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/427.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/427.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/470.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/470.png index 10708790fe..52e1759a65 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/470.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/470.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/471.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/471.png index 42b359d392..700dec8dc8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/471.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/471.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/472.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/472.png index 8b731f2aad..609f84f36d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/472.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/472.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/473.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/473.png index a640b2ce99..19945c8e0b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/473.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/473.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/474.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/474.png index 795eac6bde..8841306818 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/474.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/474.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/476.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/476.png index 330962b506..8c270784b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/476.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/476.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/477.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/477.png index e93218897f..639665674b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/477.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/477.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/478.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/478.png index fca75800b3..4cb3bbe7c9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/478.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/478.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/479.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/479.png index 611bbe1916..0684120551 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/479.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/479.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/480.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/480.png index 3839beca71..7c8bb86d56 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/480.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/480.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/481.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/481.png index 1c473029b9..80ee0bab16 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/481.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/481.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/482.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/482.png index 334ccc4a27..e74835b4c0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/482.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/482.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/483.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/483.png index cd25e7c835..7584edcdee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/483.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/483.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/484.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/484.png index 096db0b683..15aec92695 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/484.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/484.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/485.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/485.png index d6805ab256..ac3faa8362 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/485.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/485.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/486.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/486.png index 83c0a15e81..67af7d7ffc 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/486.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/486.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/487.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/487.png index 3ee7908e6d..d77a95d487 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/487.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/487.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/488.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/488.png index 3704130e94..27e06815d9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/488.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/488.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/489.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/489.png index e170735e1e..0822046e1b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/489.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/489.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/490.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/490.png index 1e10046a9c..32cbdfa1db 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/490.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/490.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/491.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/491.png index 3dc323a042..d3bf2a70e2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/491.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/491.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/492.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/492.png index 3f084cd211..8ed07becee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/492.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/492.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/493.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/493.png index 8b70e48fb7..cbbf68ca69 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/493.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/493.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/494.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/494.png index 4f76e4a8ec..f60760fd67 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/494.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/494.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/495.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/495.png index 1fea1f9725..f75e597255 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/495.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/495.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/496.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/496.png index 928a593551..5e4a043581 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/496.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/496.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/497.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/497.png index 529f9e0001..59e57b63e4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/497.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/497.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/498.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/498.png index a717799278..1788d4f28e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/498.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/498.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/499.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/499.png index 538817e8b1..3e2c35c590 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/499.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/499.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png index 023eb86b7b..9c58ab1034 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/524.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png index 248120ef47..b69ea5397c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/526.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png index 38729236c2..f95801e345 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/533.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png index 7f8b764373..a526f69e1c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/535.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/536.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/536.png index 5980b55b71..872dbc43d3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/536.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/536.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/554.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/554.png index dd1f3c7f64..f864178bcf 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/554.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/554.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/561.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/561.png index 184ce23443..1db601e63d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/561.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/561.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/562.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/562.png index 53841cbb0c..0c39994c6f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/562.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/562.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/563.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/563.png index a5639aae4f..8b2b6e2bee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/563.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/563.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/564.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/564.png index 4642684c99..67be3aca89 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/564.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/564.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/565.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/565.png index c295ab8a61..f3ff9a0798 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/565.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/565.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/566.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/566.png index 274ea366c2..48ba281619 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/566.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/566.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/567.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/567.png index cb43c472cc..db940173b0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/567.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/567.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/766.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/766.png index 33564435da..ae86249085 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/766.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/766.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png index e962e047eb..5930084b4c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/100.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/101.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/101.png index 1fe9dbb2fa..c971bfa81d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/101.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/101.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png index beab9d991e..7108a9fbe6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/102.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/103.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/103.png index 0c33332bc2..9a4f886c0a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/103.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/103.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/104.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/104.png index 6957744766..577d9a49ab 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/104.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/104.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/105.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/105.png index e44d2b4658..80d15f4d36 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/105.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/105.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/106.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/106.png index 4cf963bb73..d8bef2fda0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/106.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/106.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png index ff639d75fc..05825a9675 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/107.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/110.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/110.png index 4e6024d33d..96c17d8452 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/110.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/110.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/113.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/113.png index a1388c3ac0..6f8d8bdde5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/113.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/113.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png index 4882f87b5c..f91bcd2f26 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/120.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png index 35c7e76946..fe039142e0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/130.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png index 027b3329ba..2fad5c9386 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/131.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png index 6bcd8ca8c8..08ff840ea5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/132.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/140.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/140.png index 7db71da61e..693a70b544 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/140.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/140.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/141.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/141.png index d9ed8c2396..931c7fb4af 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/141.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/141.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/142.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/142.png index 957efc46ad..70cea830a2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/142.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/142.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/143.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/143.png index 29da3e2cf9..cfa3474e6a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/143.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/143.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/144.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/144.png index f733e63f38..2b48fc9d20 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/144.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/144.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/145.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/145.png index 98f13cabd7..f213f83db0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/145.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/145.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/146.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/146.png index f25cd66c4a..37b064afcf 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/146.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/146.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/147.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/147.png index 9c8f8b7b58..96483e97b1 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/147.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/147.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/148.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/148.png index a236483f5c..85b5d912ef 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/148.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/148.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png index a8bb5a2c26..f030991aee 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/150.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/150.png index 479c5bcb1f..4ef851a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/150.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/150.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/151.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/151.png index 5df11a8bf3..0d5a574cd5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/151.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/151.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/152.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/152.png index 933b75c6a3..316c03a760 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/152.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/152.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/153.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/153.png index 5a71ca7fcd..272ced3b3c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/153.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/153.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/160.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/160.png index def01f87fb..420c8c9b32 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/160.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/160.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/161.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/161.png index d25f895696..15ec128741 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/161.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/161.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/162.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/162.png index 1cd3a66aaf..14ca7821d5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/162.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/162.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/163.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/163.png index 80a68f82ac..45d2111075 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/163.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/163.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/164.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/164.png index 52c31518ca..42732207da 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/164.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/164.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/165.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/165.png index 24b0cf5fd1..4080403ff2 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/165.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/165.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/21.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/21.png index ce444b0a66..de8fc0a1ba 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/21.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/21.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/22.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/22.png index deaece40e4..4b151f9be8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/22.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/22.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png index c5011409f5..28beb6060d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/23.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.png index 8f68a1beda..8bb87a16ac 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.png index df79269cc7..060fc649e6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.png index 968614667b..ab8b59a35e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.png index 1dce1924ef..3fdb6b464a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/40.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/40.png index 954fc6a77f..4829840d76 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/40.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/40.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.png index 0d145e8fc3..5cb8856559 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.png index 7659c78ea0..62d3eb8d1a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.png index 0fabd6a617..9c7f70c81b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.png index b392a4f770..da74fea285 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.png index abf46b2384..83321ca27d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.png index d66d5845dd..9db8e44875 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.png index 64d3327ecf..0b94958981 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.png index e23c7dcc68..79751f715a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.png index 5d748aba58..d2923827fc 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png index abafc6cace..df4434d72e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png index 6af14558f8..967943a273 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png index a56d5c7ac3..776233d003 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png index 1fc596902e..95fe208307 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png index 2758dc618f..d9791e2687 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.png index 8157302e10..2cc9dafcad 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.png index 91f557d694..7f4722c8cb 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.png index ad7eb930d9..910070bd5a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png index d5d599bb81..91414817f8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png index b7a790f313..f8e9fa8b59 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png index dc64f01208..57185d40bf 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/61.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/61.png index 3b25755c65..216e6de4f6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/61.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/61.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.png index 5ffb009604..0ccd45871b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/63.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/63.png index e3baf8b827..8a91f91e74 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/63.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/63.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.png index 3483666f90..cf0360a77c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.png index 86fdf014a9..4d146a95c5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png index cef3fe6a8f..e505f31be8 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/68.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/69.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/69.png index 7b699162ea..36543fd45f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/69.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/69.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.png index d3e6f46d2e..eebf76ff51 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.png index 5e61e241b7..cd3f90822d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.png index 42777d18af..8e7cdee46e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/74.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png index fb8b2743e0..8748b6dae4 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/76.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png index cf0a35a5f6..d7c74e8f19 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/77.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/78.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/78.png index b38b7ebe9d..a495c4461c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/78.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/78.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png index 4cce3fbff4..6ae0c3cb8b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png index 3ba19aba7b..570cf27d9a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/8.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png index cecbe9edfe..4cae7f4118 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png index f71a18590e..3f366301b9 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png index c742f1d2d9..be9e07ae7a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/97.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png index 2cd5861e2c..f53e236793 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/98.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png index ba5d0712ff..467fc0c666 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/99.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.neutroniumHeatCapacitor.png b/src/main/resources/assets/gregtech/textures/items/gt.neutroniumHeatCapacitor.png index 9c46e064d9..141c8a578e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.neutroniumHeatCapacitor.png and b/src/main/resources/assets/gregtech/textures/items/gt.neutroniumHeatCapacitor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumDual.png b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumDual.png index 5f3a7eeb75..80fe3da0e3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumDual.png and b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumDual.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumQuad.png b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumQuad.png index 2021a70e88..1a58dad322 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumQuad.png and b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumQuad.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumSimple.png b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumSimple.png index 539be70765..b2a9614b62 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumSimple.png and b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumSimple.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.sensorcard.png b/src/main/resources/assets/gregtech/textures/items/gt.sensorcard.png index 03053ba1c3..151bdf722c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.sensorcard.png and b/src/main/resources/assets/gregtech/textures/items/gt.sensorcard.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/iconsets/HANDLE_SOLDERING.png b/src/main/resources/assets/gregtech/textures/items/iconsets/HANDLE_SOLDERING.png index 8dfc40c15b..3b66136453 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/iconsets/HANDLE_SOLDERING.png and b/src/main/resources/assets/gregtech/textures/items/iconsets/HANDLE_SOLDERING.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE.png b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE.png index 8441488c2f..7be4cc29d3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE.png and b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE.png b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE.png index 8441488c2f..7be4cc29d3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE.png and b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE.png b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE.png index 8441488c2f..7be4cc29d3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE.png and b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL.png b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL.png index 8441488c2f..7be4cc29d3 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL.png and b/src/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/gem.png index c2697bbeee..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/DULL/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/gem.png index d4c4c8cdd1..182ba96343 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/gem.png index c2697bbeee..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/gem.png index c2697bbeee..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/plate.png index e27ed68bf0..7d04a95123 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FINE/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/gem.png index c2697bbeee..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/gem.png index c2697bbeee..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/gem.png index b46f499ddb..45b050e482 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/plate.png index e27ed68bf0..7d04a95123 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/gem.png index c2697bbeee..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/plate.png index b414603a30..f4d4b8a6af 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/plate.png index e27ed68bf0..7d04a95123 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed_OVERLAY.png index 6e4b78a905..607653bd4d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE.png index 9aae5e683b..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed.png index 26086a026b..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushedPurified.png index c362080eb4..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed_OVERLAY.png index 3108c1a1a8..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/gem.png index c2697bbeee..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/handleMallet.png index aad341cf2c..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/lens_OVERLAY.png index 8cb60c4832..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/rotor.png index 1d58fd8c89..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadMallet.png index 4b740dc7b7..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadSoldering.png index 39b9d8163a..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/NONE/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed.png index 86905a2424..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushedPurified.png index a8b71e2a60..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed_OVERLAY.png index b23d7ca7e2..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/gem.png index 5b6b746841..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/handleMallet.png index 36654323a6..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/lens_OVERLAY.png index 873f4b8e59..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/rotor.png index db2ad859b2..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadMallet.png index 9c59203251..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadSoldering.png index 439aba4d33..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed.png index 86905a2424..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushedPurified.png index a8b71e2a60..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed_OVERLAY.png index b23d7ca7e2..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/gem.png index 5b6b746841..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/handleMallet.png index 36654323a6..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/lens_OVERLAY.png index 873f4b8e59..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/rotor.png index db2ad859b2..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadMallet.png index 9c59203251..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadSoldering.png index 439aba4d33..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed.png index 86905a2424..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushedPurified.png index a8b71e2a60..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed_OVERLAY.png index b23d7ca7e2..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/gem.png index 5b6b746841..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/handleMallet.png index 36654323a6..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/lens_OVERLAY.png index 873f4b8e59..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/plate.png index 5e8d61ab07..7d04a95123 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/rotor.png index db2ad859b2..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadMallet.png index 9c59203251..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadSoldering.png index 439aba4d33..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed.png index 86905a2424..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushedPurified.png index a8b71e2a60..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed_OVERLAY.png index b23d7ca7e2..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/handleMallet.png index 36654323a6..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/lens_OVERLAY.png index 873f4b8e59..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/plate.png index 5e8d61ab07..7d04a95123 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/rotor.png index db2ad859b2..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadMallet.png index 9c59203251..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadSoldering.png index 439aba4d33..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed.png index 86905a2424..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushedPurified.png index a8b71e2a60..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed_OVERLAY.png index b23d7ca7e2..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/gem.png index 5b6b746841..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/handleMallet.png index 36654323a6..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/lens_OVERLAY.png index 873f4b8e59..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/plate.png index 5e8d61ab07..7d04a95123 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/rotor.png index db2ad859b2..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadMallet.png index 9c59203251..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadSoldering.png index 439aba4d33..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed.png index 86905a2424..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushedPurified.png index a8b71e2a60..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed_OVERLAY.png index b23d7ca7e2..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/gem.png index 5b6b746841..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/handleMallet.png index 36654323a6..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/lens_OVERLAY.png index 873f4b8e59..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/rotor.png index db2ad859b2..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadMallet.png index 9c59203251..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadSoldering.png index 439aba4d33..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed.png index 86905a2424..a5c4a1e355 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushedPurified.png index a8b71e2a60..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed_OVERLAY.png index 9823450a43..3d2114ff84 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/gem.png index 5b6b746841..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/handleMallet.png index 36654323a6..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/lens_OVERLAY.png index 873f4b8e59..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/plate.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/plate.png index 5e8d61ab07..7d04a95123 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/plate.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/plate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/rotor.png index db2ad859b2..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadMallet.png index 9c59203251..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadSoldering.png index 439aba4d33..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SAND/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed.png index 86905a2424..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushedPurified.png index a8b71e2a60..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed_OVERLAY.png index b23d7ca7e2..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/gem.png index e2f9a68637..151fc3302a 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/handleMallet.png index 36654323a6..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/lens_OVERLAY.png index 873f4b8e59..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/rotor.png index db2ad859b2..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadMallet.png index 9c59203251..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadSoldering.png index 439aba4d33..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHARDS/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed.png index 86905a2424..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushedPurified.png index a8b71e2a60..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed_OVERLAY.png index b23d7ca7e2..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/gem.png index 5b6b746841..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/handleMallet.png index 36654323a6..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/lens_OVERLAY.png index 873f4b8e59..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/rotor.png index db2ad859b2..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadMallet.png index 9c59203251..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadSoldering.png index 439aba4d33..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/SHINY/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/TURBINE_BLADE.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed.png index 86905a2424..a763f6b0df 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushedPurified.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushedPurified.png index a8b71e2a60..b2d4e2a476 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushedPurified.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushedPurified.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed_OVERLAY.png index b23d7ca7e2..a1600cad7c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/crushed_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/gem.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/gem.png index 5b6b746841..dd20d74f2c 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/gem.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/gem.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/handleMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/handleMallet.png index 36654323a6..c7bb0e6631 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/handleMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/handleMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingot.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingot.png index f894ebe14c..8525223c5e 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingot.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/ingot.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/lens_OVERLAY.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/lens_OVERLAY.png index 873f4b8e59..51cb4b73a0 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/lens_OVERLAY.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/lens_OVERLAY.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/rotor.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/rotor.png index db2ad859b2..6c6a16bfe5 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/rotor.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/rotor.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadMallet.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadMallet.png index 9c59203251..58a7522b4b 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadMallet.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadMallet.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadSoldering.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadSoldering.png index 439aba4d33..41545c8b38 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadSoldering.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/toolHeadSoldering.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade.png b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade.png index 2cbf99c535..a4a6bd742d 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade.png and b/src/main/resources/assets/gregtech/textures/items/materialicons/WOOD/turbineBlade.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png b/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png index 092a1db909..7b52d92dec 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png and b/src/main/resources/assets/gregtech/textures/items/modulararmor_boots.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png b/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png index ba55be99b6..13f6818a37 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png and b/src/main/resources/assets/gregtech/textures/items/modulararmor_chestplate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png index 9dc788e8a6..2ab5d64cd7 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png and b/src/main/resources/assets/gregtech/textures/items/modularelectric1_boots.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png index a232fe77a9..25f89678d6 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png and b/src/main/resources/assets/gregtech/textures/items/modularelectric1_chestplate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png b/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png index a0234ff9cf..de6df23dff 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png and b/src/main/resources/assets/gregtech/textures/items/modularelectric1_leggings.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png index afd2952bb4..4dc9d4cc11 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png and b/src/main/resources/assets/gregtech/textures/items/modularelectric2_boots.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png index 879a51e83e..ac560c1841 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png and b/src/main/resources/assets/gregtech/textures/items/modularelectric2_chestplate.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png b/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png index 1f5eeaed56..6cdda7024f 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png and b/src/main/resources/assets/gregtech/textures/items/modularelectric2_leggings.png differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png b/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png index b205f487cb..6048db9ddb 100644 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png and b/src/main/resources/assets/gregtech/textures/models/armor/basic_helmet_chest.png differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png b/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png index 7112bd28ee..841a7cbba6 100644 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png and b/src/main/resources/assets/gregtech/textures/models/armor/basic_leggings_boots.png differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png b/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png index 91f2950c30..287b037fff 100644 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png and b/src/main/resources/assets/gregtech/textures/models/armor/e1_helmet_chest.png differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png b/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png index c5ed20bdb4..83333001b7 100644 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png and b/src/main/resources/assets/gregtech/textures/models/armor/e1_leggings_boots.png differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png b/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png index 92aa1ec09d..b03c26c716 100644 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png and b/src/main/resources/assets/gregtech/textures/models/armor/e2_helmet_chest.png differ diff --git a/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png b/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png index d0addeda89..8c37fe80c2 100644 Binary files a/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png and b/src/main/resources/assets/gregtech/textures/models/armor/e2_leggings_boots.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.3.png index 785e360927..85f00bed5d 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.4.png index 8c7aea3001..266112faa5 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Argentia.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bauxia.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bauxia.2.png index 785e360927..3280ff2d94 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bauxia.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bauxia.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.1.png index b9a997e219..5f00e80bb8 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.2.png index 4689dd67b3..cb4bb4d17b 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.3.png index 540ae5e297..96c6a64acf 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.4.png index 15eacefcfe..eaa8da6432 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Bobsyeruncleranks.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png index 785e360927..3280ff2d94 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png index 785e360927..3280ff2d94 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png index 785e360927..3280ff2d94 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Diareed.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Diareed.4.png index ba7ec45b14..3582f9be78 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Diareed.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Diareed.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.3.png index 698cf83ef3..8a4786d37a 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.4.png index 4c2f4737db..b22fa2d779 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Evil Ore.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Fertilia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Fertilia.3.png index f155504354..26da0cceb7 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Fertilia.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Fertilia.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.1.png index 78969a1966..131fd33c02 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.2.png index aabcf09383..f54e4f31dd 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.3.png index bd75452424..e9216ac272 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.4.png index 4538630798..664d516f55 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Flax.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.2.png index 785e360927..85f00bed5d 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.3.png index 8c7aea3001..266112faa5 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Galvania.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.5.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.5.png index 72c6f1da64..125a90aa29 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.5.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.5.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.6.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.6.png index 8f4efd1e2b..30761a3cce 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.6.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Glowheat.6.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.3.png index f155504354..26da0cceb7 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.4.png index ee0be53f55..6dc0654031 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.God of Thunder.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png index 785e360927..3280ff2d94 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.3.png index c5437ae8bf..818ad8561f 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.4.png index 68e1818ad1..da460f6e6d 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Indigo.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.1.png index 78969a1966..131fd33c02 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.2.png index aabcf09383..f54e4f31dd 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.3.png index bd75452424..e9216ac272 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.4.png index 738c9882ad..cb7327069f 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lazulia.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png index 785e360927..3280ff2d94 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.1.png index b9a997e219..5f00e80bb8 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.2.png index 4689dd67b3..cb4bb4d17b 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.3.png index 540ae5e297..96c6a64acf 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.4.png index ee0cb00401..bd7dc62e44 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Liveroots.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Milkwart.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Milkwart.3.png index 29ae12c5fd..e127c56d28 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Milkwart.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Milkwart.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.2.png index 785e360927..85f00bed5d 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.3.png index 8c7aea3001..266112faa5 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Nickelback.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.1.png index be4dda5125..a04b4d9da7 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.2.png index b67f3c4116..f2b9e03431 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.3.png index 035808183b..1c6947c937 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.4.png index 025a64c75c..3b471a55a1 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Oilberries.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.1.png index b9a997e219..5f00e80bb8 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.2.png index 4689dd67b3..cb4bb4d17b 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.3.png index 540ae5e297..96c6a64acf 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.4.png index 15eacefcfe..eaa8da6432 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Olivia.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png index 785e360927..3280ff2d94 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.3.png index 785e360927..85f00bed5d 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.4.png index 8c7aea3001..266112faa5 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Platina.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.3.png index 785e360927..3280ff2d94 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.4.png index dd05620a95..8e77350686 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Plumbilia.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.2.png index 785e360927..85f00bed5d 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.3.png index 8c7aea3001..266112faa5 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Pyrolusium.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.3.png index fb7772fd2a..b2c0bc35e2 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.4.png index c171136394..e2a8214493 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Quantaria.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png index 78969a1966..131fd33c02 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png index aabcf09383..f54e4f31dd 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png index bd75452424..e9216ac272 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.3.png index 43ac650087..a9d1a67e77 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.4.png index a5c7e23848..b7a10dbc1b 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Reactoria.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.1.png index b9a997e219..5f00e80bb8 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.2.png index 4689dd67b3..cb4bb4d17b 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.3.png index 540ae5e297..96c6a64acf 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.4.png index 75679369b1..c966bf4f14 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Sapphirum.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.2.png index 785e360927..85f00bed5d 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.3.png index 8c7aea3001..266112faa5 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Scheelinium.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.3.png index 988f477185..4367864a3a 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.4.png index b6df5bb258..b57f14ee6e 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Slimeplant.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.1.png index 9dccc70d1d..3f7fd9b070 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.2.png index 919d5070a4..e3445eabbb 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.3.png index 7771401d23..61d498303e 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.4.png index a7975c3828..70f0aeceeb 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Stargatium.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Starwart.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Starwart.3.png index 29ae12c5fd..e127c56d28 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Starwart.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Starwart.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.1.png index b9a997e219..5f00e80bb8 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.2.png index 4689dd67b3..cb4bb4d17b 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.3.png index 540ae5e297..96c6a64acf 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.4.png index f7018d2757..953f83859b 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Steeleafranks.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png index 785e360927..3280ff2d94 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tine.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tine.3.png index 698cf83ef3..8a4786d37a 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tine.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tine.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Titania.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Titania.2.png index 785e360927..3280ff2d94 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Titania.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Titania.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png index 785e360927..3280ff2d94 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.1.png index be4dda5125..a04b4d9da7 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.2.png index b67f3c4116..f2b9e03431 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.3.png index 035808183b..1c6947c937 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.3.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.3.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.4.png index 10dc544a97..d4b0fa390f 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Transformium.4.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.1.png index d813125bf4..19f2013815 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.1.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.2.png index ba7ec45b14..3582f9be78 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.2.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.5.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.5.png index 04614d06de..f973b02919 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.5.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Trollplant.5.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Withereed.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Withereed.4.png index 1b4ccf9e36..2794684fb9 100644 Binary files a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Withereed.4.png and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Withereed.4.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/cloakingdevice_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/cloakingdevice_layer_1.png index 179f239b92..8a988d8c0f 100644 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/cloakingdevice_layer_1.png and b/src/main/resources/assets/minecraft/textures/models/armor/cloakingdevice_layer_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/lapotronpack_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/lapotronpack_layer_1.png index 4eceaf83d3..d74d183d70 100644 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/lapotronpack_layer_1.png and b/src/main/resources/assets/minecraft/textures/models/armor/lapotronpack_layer_1.png differ diff --git a/src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack_layer_1.png index fbf0f6abcd..6a3a7cae3c 100644 Binary files a/src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack_layer_1.png and b/src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack_layer_1.png differ -- cgit From 3544842aeeb8857b1a904fbfa88be9829793f376 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Sat, 15 Jun 2019 21:04:08 +0200 Subject: +adjusted HP solar boiler to match the tooltip +re-added solar GUI --- .../boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java | 12 ++++++------ .../assets/gregtech/textures/gui/SolarHPBoiler.png | Bin 0 -> 2243 bytes 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/gui/SolarHPBoiler.png (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java index d1b2e571b1..376ce4784c 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java @@ -13,22 +13,22 @@ import net.minecraft.entity.player.InventoryPlayer; public class GT_MetaTileEntity_Boiler_Solar_Steel extends GT_MetaTileEntity_Boiler_Solar { public GT_MetaTileEntity_Boiler_Solar_Steel(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); - basicOutput = 300; - basicMaxOuput = 100; + basicOutput = 450; + basicMaxOuput = 120; basicTemperatureMod = 3; } public GT_MetaTileEntity_Boiler_Solar_Steel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); - basicOutput = 300; - basicMaxOuput = 100; + basicOutput = 450; + basicMaxOuput = 120; basicTemperatureMod = 3; } public GT_MetaTileEntity_Boiler_Solar_Steel(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); - basicOutput = 300; - basicMaxOuput = 100; + basicOutput = 450; + basicMaxOuput = 120; basicTemperatureMod = 3; } diff --git a/src/main/resources/assets/gregtech/textures/gui/SolarHPBoiler.png b/src/main/resources/assets/gregtech/textures/gui/SolarHPBoiler.png new file mode 100644 index 0000000000..8f5324aeff Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/SolarHPBoiler.png differ -- cgit From 910c285123f0eb2cdd9e1b09453c9d15497b85e4 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Thu, 25 Jul 2019 13:23:33 +0200 Subject: suggestion: molds for pipes #4869 https://github.com/GTNewHorizons/NewHorizons/issues/4869 --- src/main/java/gregtech/api/enums/ItemList.java | 5 +++++ .../gregtech/common/items/GT_MetaGenerated_Item_01.java | 6 +++++- .../loaders/oreprocessing/ProcessingShaping.java | 7 ++++++- .../gregtech/textures/items/gt.metaitem.01/326.png | Bin 0 -> 3060 bytes .../gregtech/textures/items/gt.metaitem.01/327.png | Bin 0 -> 3065 bytes .../gregtech/textures/items/gt.metaitem.01/328.png | Bin 0 -> 3073 bytes .../gregtech/textures/items/gt.metaitem.01/329.png | Bin 0 -> 3079 bytes .../gregtech/textures/items/gt.metaitem.01/330.png | Bin 0 -> 3091 bytes 8 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/326.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/327.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/328.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/329.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/330.png (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 82a826c390..99452607d4 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -151,6 +151,11 @@ public enum ItemList implements IItemContainer { Shape_Mold_Rod_Long, Shape_Mold_Rotor, Shape_Mold_Turbine_Blade, + Shape_Mold_Pipe_Tiny, + Shape_Mold_Pipe_Small, + Shape_Mold_Pipe_Medium, + Shape_Mold_Pipe_Large, + Shape_Mold_Pipe_Huge, Shape_Slicer_Flat, Shape_Slicer_Stripes, Shape_Extruder_Bottle, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index d61e89dfac..ef17e4f433 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -186,7 +186,11 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Shape_Mold_Rod_Long.set(addItem(tLastID = 323, "Mold (Long Rod)", "Mold for making Long Rods", new Object[0])); ItemList.Shape_Mold_Rotor.set(addItem(tLastID = 324, "Mold (Rotor)", "Mold for making a Rotor", new Object[0])); ItemList.Shape_Mold_Turbine_Blade.set(addItem(tLastID = 325, "Mold (Turbine Blade)", "Mold for making a Turbine Blade", new Object[0])); - + ItemList.Shape_Mold_Pipe_Tiny.set(addItem(tLastID = 326, "Mold (Tiny Pipe)", "Mold for making tiny Pipes", new Object[0])); + ItemList.Shape_Mold_Pipe_Small.set(addItem(tLastID = 327, "Mold (Small Pipe)", "Mold for making small Pipes", new Object[0])); + ItemList.Shape_Mold_Pipe_Medium.set(addItem(tLastID = 328, "Mold (Normal Pipe)", "Mold for making Pipes", new Object[0])); + ItemList.Shape_Mold_Pipe_Large.set(addItem(tLastID = 329, "Mold (Large Pipe)", "Mold for making large Pipes", new Object[0])); + ItemList.Shape_Mold_Pipe_Huge.set(addItem(tLastID = 330, "Mold (Huge Pipe)", "Mold for making full Block Pipes", new Object[0])); GT_ModHandler.removeRecipe(new ItemStack[]{new ItemStack(Blocks.glass), null, new ItemStack(Blocks.glass), null, new ItemStack(Blocks.glass)}); //GT_ModHandler.addCraftingRecipe(ItemList.Shape_Mold_Credit.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"h ", aTextShape, aTextEmptyRow, 'P', ItemList.Shape_Empty}); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 1bb32ef462..d31fffc5de 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -55,7 +55,12 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Round.get(0L, new Object[0]), aMaterial.getMolten(18L), GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), 50, 2 * tVoltageMultiplier); GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Rod_Long.get(0L, new Object[0]), aMaterial.getMolten(144L), GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), 300, 8 * tVoltageMultiplier); GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Turbine_Blade.get(0L, new Object[0]), aMaterial.getMolten(864L), GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), 400, 8 * tVoltageMultiplier); - } + GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Pipe_Tiny.get(0L, new Object[0]), aMaterial.getMolten(72L), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, aMaterial, 1L), 20, 30 * tVoltageMultiplier); + GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Pipe_Small.get(0L, new Object[0]), aMaterial.getMolten(144L), GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 1L), 40, 30 * tVoltageMultiplier); + GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Pipe_Medium.get(0L, new Object[0]), aMaterial.getMolten(432L), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1L), 80, 30 * tVoltageMultiplier); + GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Pipe_Large.get(0L, new Object[0]), aMaterial.getMolten(864L), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, aMaterial, 1L), 160, 30 * tVoltageMultiplier); + GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Pipe_Huge.get(0L, new Object[0]), aMaterial.getMolten(1728L), GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial, 1L), 320, 30 * tVoltageMultiplier); + } if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), ItemList.Shape_Extruder_Rod.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), 6 * tVoltageMultiplier); if (tAmount * 2 <= 64) diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/326.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/326.png new file mode 100644 index 0000000000..089269786b Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/326.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/327.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/327.png new file mode 100644 index 0000000000..b24aff76d5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/327.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/328.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/328.png new file mode 100644 index 0000000000..d68e415e06 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/328.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/329.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/329.png new file mode 100644 index 0000000000..fd3d72cb06 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/329.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/330.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/330.png new file mode 100644 index 0000000000..787b59c29a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/330.png differ -- cgit From 04829509b07c545bb85ef36a63b561f4174e425b Mon Sep 17 00:00:00 2001 From: Спартак Date: Tue, 3 Sep 2019 13:14:26 +0300 Subject: Add Space Coolant --- src/main/java/gregtech/api/enums/ItemList.java | 1 + src/main/java/gregtech/api/enums/Materials.java | 2 ++ .../loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 15 +++++++++++++++ .../textures/items/gt.1080k_Space_Coolantcell.png | Bin 0 -> 333 bytes .../textures/items/gt.180k_Space_Coolantcell.png | Bin 0 -> 306 bytes .../textures/items/gt.360k_Space_Coolantcell.png | Bin 0 -> 335 bytes .../textures/items/gt.540k_Space_Coolantcell.png | Bin 0 -> 330 bytes 7 files changed, 18 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.1080k_Space_Coolantcell.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.180k_Space_Coolantcell.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.360k_Space_Coolantcell.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.540k_Space_Coolantcell.png (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 99452607d4..ca5da1dadd 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -652,6 +652,7 @@ public enum ItemList implements IItemContainer { Neutron_Reflector, Reactor_Coolant_He_1, Reactor_Coolant_He_3, Reactor_Coolant_He_6, Reactor_Coolant_NaK_1, Reactor_Coolant_NaK_3, Reactor_Coolant_NaK_6,neutroniumHeatCapacitor, ThoriumCell_1, ThoriumCell_2, ThoriumCell_4, + Reactor_Coolant_Sp_1, Reactor_Coolant_Sp_2, Reactor_Coolant_Sp_3, Reactor_Coolant_Sp_6, FusionComputer_LuV, FusionComputer_ZPMV, FusionComputer_UV, Casing_Fusion_Coil, Casing_Fusion, Casing_Fusion2, Generator_Plasma_IV, Generator_Plasma_LuV, Generator_Plasma_ZPMV, diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index a3b262c6ca..ef06709e35 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -836,6 +836,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials SuperconductorUV = new Materials( -1, TextureSet.SET_SHINY , 1.0F, 0, 0, 0 , 224,210, 7, 0, "SuperconductorUV" , "Superconductor UV" , 0, 0, -1, -1, false, false, 1, 1, 1, Dyes.dyeYellow , Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 48))); public static Materials SuperconductorUHV = new Materials( -1, TextureSet.SET_SHINY , 1.0F, 0, 0, 0 , 255,255, 255, 0, "Superconductor" , "Superconductor UHV" , 0, 0, -1, -1, false, false, 1, 1, 1, Dyes.dyeWhite , Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 64))); + public static Materials SuperCoolant = new MaterialBuilder( -1, TextureSet.SET_DULL,"Super Coolant").setRGB(2, 91, 111).addFluid().constructMaterial().setLiquidTemperature(1); + /** * Materials which are renamed automatically */ diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 54be8d5a11..6308afdd14 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -109,6 +109,21 @@ public class GT_Loader_Item_Block_And_Fluid ItemList.Reactor_Coolant_NaK_6.set(GregTech_API.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000)); GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_NaK_6.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PCP", "PDP", "PCP", 'C', ItemList.Reactor_Coolant_NaK_3, 'P', OrePrefixes.plate.get(Materials.Tin), 'D', OrePrefixes.plateDense.get(Materials.Copper)}); + + ItemList.Reactor_Coolant_Sp_1.set(GregTech_API.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); + + ItemList.Reactor_Coolant_Sp_2.set(GregTech_API.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000)); + GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_Sp_2.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"CPC", 'C', ItemList.Reactor_Coolant_Sp_1, 'P', OrePrefixes.plateTriple.get(Materials.TungstenSteel)}); + + ItemList.Reactor_Coolant_Sp_3.set(GregTech_API.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000)); + GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_Sp_3.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PPP", "CCC", "PPP", 'C', ItemList.Reactor_Coolant_Sp_1, 'P', OrePrefixes.plate.get(Materials.TungstenSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_Sp_3.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PPP", "BPC", "PPP", 'C', ItemList.Reactor_Coolant_Sp_1, 'B', ItemList.Reactor_Coolant_Sp_2, 'P', OrePrefixes.plate.get(Materials.TungstenSteel)}); + GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_Sp_3.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PPP", "CPB", "PPP", 'C', ItemList.Reactor_Coolant_Sp_1, 'B', ItemList.Reactor_Coolant_Sp_2, 'P', OrePrefixes.plate.get(Materials.TungstenSteel)}); + + ItemList.Reactor_Coolant_Sp_6.set(GregTech_API.constructCoolantCellItem("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000)); + GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_Sp_6.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PCP", "PDP", "PCP", 'C', ItemList.Reactor_Coolant_Sp_3, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'D', OrePrefixes.plateDense.get(Materials.ElectrumFlux)}); + + if (!GregTech_API.mIC2Classic) { ItemList.neutroniumHeatCapacitor.set(GregTech_API.constructCoolantCellItem("neutroniumHeatCapacitor", "1G Neutronium Heat Capacitor", 1000000000)); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.1080k_Space_Coolantcell.png b/src/main/resources/assets/gregtech/textures/items/gt.1080k_Space_Coolantcell.png new file mode 100644 index 0000000000..69acf28925 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.1080k_Space_Coolantcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.180k_Space_Coolantcell.png b/src/main/resources/assets/gregtech/textures/items/gt.180k_Space_Coolantcell.png new file mode 100644 index 0000000000..72a605ec91 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.180k_Space_Coolantcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.360k_Space_Coolantcell.png b/src/main/resources/assets/gregtech/textures/items/gt.360k_Space_Coolantcell.png new file mode 100644 index 0000000000..f0edc59189 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.360k_Space_Coolantcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.540k_Space_Coolantcell.png b/src/main/resources/assets/gregtech/textures/items/gt.540k_Space_Coolantcell.png new file mode 100644 index 0000000000..7efb2df88e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.540k_Space_Coolantcell.png differ -- cgit From f44d4b0f320d51a34c9e21f35afa9bf198580304 Mon Sep 17 00:00:00 2001 From: Спартак Date: Wed, 4 Sep 2019 18:33:10 +0300 Subject: Delete recipes in crafting table (for new coolant) --- .../loaders/postload/GT_MachineRecipeLoader.java | 6 +++++- .../loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 11 +++-------- .../textures/items/gt.1080k_Space_Coolantcell.png | Bin 333 -> 312 bytes .../textures/items/gt.540k_Space_Coolantcell.png | Bin 330 -> 337 bytes 4 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 90910ed58f..a9b36e7262 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1578,7 +1578,11 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L), 1200, 480); GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L), 1200, 480); GT_Values.RA.addVacuumFreezerRecipe(GT_ModHandler.getIC2Item("airCell", 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L), 28, 480); - + GT_Values.RA.addVacuumFreezerRecipe(ItemList.Reactor_Coolant_Sp_1.getWildcard(1L), ItemList.Reactor_Coolant_Sp_1.get(1L), 1800); + GT_Values.RA.addVacuumFreezerRecipe(ItemList.Reactor_Coolant_Sp_2.getWildcard(1L), ItemList.Reactor_Coolant_Sp_2.get(1L), 3600); + GT_Values.RA.addVacuumFreezerRecipe(ItemList.Reactor_Coolant_Sp_3.getWildcard(1L), ItemList.Reactor_Coolant_Sp_3.get(1L), 5400); + GT_Values.RA.addVacuumFreezerRecipe(ItemList.Reactor_Coolant_Sp_6.getWildcard(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), 10800); + GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Pentacadmiummagnesiumhexaoxid, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Pentacadmiummagnesiumhexaoxid, 1L), 750, 480); GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Titaniumonabariumdecacoppereikosaoxid, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Titaniumonabariumdecacoppereikosaoxid, 1L), 750, 480); GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Uraniumtriplatinid, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Uraniumtriplatinid, 1L), 2000, 1920); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 6308afdd14..4f474da977 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -113,16 +113,11 @@ public class GT_Loader_Item_Block_And_Fluid ItemList.Reactor_Coolant_Sp_1.set(GregTech_API.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); ItemList.Reactor_Coolant_Sp_2.set(GregTech_API.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000)); - GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_Sp_2.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"CPC", 'C', ItemList.Reactor_Coolant_Sp_1, 'P', OrePrefixes.plateTriple.get(Materials.TungstenSteel)}); - + ItemList.Reactor_Coolant_Sp_3.set(GregTech_API.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000)); - GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_Sp_3.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PPP", "CCC", "PPP", 'C', ItemList.Reactor_Coolant_Sp_1, 'P', OrePrefixes.plate.get(Materials.TungstenSteel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_Sp_3.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PPP", "BPC", "PPP", 'C', ItemList.Reactor_Coolant_Sp_1, 'B', ItemList.Reactor_Coolant_Sp_2, 'P', OrePrefixes.plate.get(Materials.TungstenSteel)}); - GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_Sp_3.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PPP", "CPB", "PPP", 'C', ItemList.Reactor_Coolant_Sp_1, 'B', ItemList.Reactor_Coolant_Sp_2, 'P', OrePrefixes.plate.get(Materials.TungstenSteel)}); - + ItemList.Reactor_Coolant_Sp_6.set(GregTech_API.constructCoolantCellItem("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000)); - GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_Sp_6.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[]{"PCP", "PDP", "PCP", 'C', ItemList.Reactor_Coolant_Sp_3, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'D', OrePrefixes.plateDense.get(Materials.ElectrumFlux)}); - + if (!GregTech_API.mIC2Classic) { ItemList.neutroniumHeatCapacitor.set(GregTech_API.constructCoolantCellItem("neutroniumHeatCapacitor", "1G Neutronium Heat Capacitor", 1000000000)); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.1080k_Space_Coolantcell.png b/src/main/resources/assets/gregtech/textures/items/gt.1080k_Space_Coolantcell.png index 69acf28925..1c80a8fedd 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.1080k_Space_Coolantcell.png and b/src/main/resources/assets/gregtech/textures/items/gt.1080k_Space_Coolantcell.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.540k_Space_Coolantcell.png b/src/main/resources/assets/gregtech/textures/items/gt.540k_Space_Coolantcell.png index 7efb2df88e..12c2a303fc 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.540k_Space_Coolantcell.png and b/src/main/resources/assets/gregtech/textures/items/gt.540k_Space_Coolantcell.png differ -- cgit From 371dcdb8fd8a8ab17b887385981f5858a0f87af9 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Fri, 20 Sep 2019 06:28:56 +0200 Subject: fixed bee stuff with genetics +added mica crop +code improvements Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> --- build.properties | 2 +- src/main/java/gregtech/api/enums/ItemList.java | 2 +- src/main/java/gregtech/common/GT_Proxy.java | 18 +- .../java/gregtech/common/bees/GT_AlleleHelper.java | 18 +- .../java/gregtech/common/bees/GT_Bee_Mutation.java | 44 +- src/main/java/gregtech/common/items/CombType.java | 383 +++++--------- .../common/items/GT_MetaGenerated_Item_02.java | 551 +++++++++++---------- .../gregtech/loaders/misc/GT_BeeDefinition.java | 51 +- .../gregtech/loaders/postload/GT_CropLoader.java | 6 + .../loaders/postload/GT_MachineRecipeLoader.java | 2 + .../gregtech/textures/items/gt.metaitem.02/538.png | Bin 0 -> 555 bytes .../textures/blocks/crop/blockCrop.Micadia.1.png | Bin 0 -> 181 bytes .../textures/blocks/crop/blockCrop.Micadia.2.png | Bin 0 -> 367 bytes .../textures/blocks/crop/blockCrop.Micadia.3.png | Bin 0 -> 413 bytes 14 files changed, 484 insertions(+), 593 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/538.png create mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Micadia.1.png create mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Micadia.2.png create mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Micadia.3.png (limited to 'src/main/resources') diff --git a/build.properties b/build.properties index aecc636304..e6f4d322f7 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614-1.7.10 -gt.version=5.09.33.17 +gt.version=5.09.33.18 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 82a826c390..be8701319d 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -670,7 +670,7 @@ public enum ItemList implements IItemContainer { Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector_LV, Seismic_Prospector_MV, Seismic_Prospector_HV, Seismic_Prospector_Adv_LV, Seismic_Prospector_Adv_MV, Seismic_Prospector_Adv_HV, Seismic_Prospector_Adv_EV, OilDrill1, OilDrill2, OilDrill3, ConcreteBackfiller1, ConcreteBackfiller2, OreDrill1, OreDrill2, OreDrill3, OreDrill4, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite, Battery_Charger_4by4_ULV, Battery_Charger_4by4_LV, Battery_Charger_4by4_MV, Battery_Charger_4by4_HV, Battery_Charger_4by4_EV, Battery_Charger_4by4_IV, Battery_Charger_4by4_LuV, Battery_Charger_4by4_ZPM, Battery_Charger_4by4_UV, Battery_Charger_4by4_MAX, MicroTransmitter_HV, MicroTransmitter_EV, MicroTransmitter_IV, MicroTransmitter_LUV, MicroTransmitter_ZPM, MicroTransmitter_UV, - Crop_Drop_Bauxite, Crop_Drop_Ilmenite, Crop_Drop_Pitchblende, Crop_Drop_Uraninite, Crop_Drop_Thorium, Crop_Drop_Nickel, Crop_Drop_Zinc, Crop_Drop_Manganese, Crop_Drop_Scheelite, Crop_Drop_Platinum, Crop_Drop_Iridium, Crop_Drop_Osmium, Crop_Drop_Naquadah, Uraniumcell_1, Uraniumcell_2, Uraniumcell_4, Moxcell_1, Moxcell_2, Moxcell_4, + Crop_Drop_Bauxite, Crop_Drop_Ilmenite, Crop_Drop_Pitchblende, Crop_Drop_Uraninite, Crop_Drop_Thorium, Crop_Drop_Nickel, Crop_Drop_Zinc, Crop_Drop_Manganese, Crop_Drop_Scheelite, Crop_Drop_Platinum, Crop_Drop_Iridium, Crop_Drop_Osmium, Crop_Drop_Naquadah, Crop_Drop_Mica, Uraniumcell_1, Uraniumcell_2, Uraniumcell_4, Moxcell_1, Moxcell_2, Moxcell_4, ModularBasicHelmet, ModularBasicChestplate, ModularBasicLeggings, ModularBasicBoots, ModularElectric1Helmet, ModularElectric1Chestplate, ModularElectric1Leggings, ModularElectric1Boots, ModularElectric2Helmet, ModularElectric2Chestplate, ModularElectric2Leggings, ModularElectric2Boots, Block_Powderbarrel, GelledToluene, diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 6d50c6964a..f99d4083c9 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -86,15 +86,15 @@ import java.util.*; public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { private static final EnumSet PREVENTED_ORES = EnumSet.of(OreGenEvent.GenerateMinable.EventType.COAL, - new OreGenEvent.GenerateMinable.EventType[]{OreGenEvent.GenerateMinable.EventType.IRON, OreGenEvent.GenerateMinable.EventType.GOLD, - OreGenEvent.GenerateMinable.EventType.DIAMOND, OreGenEvent.GenerateMinable.EventType.REDSTONE, OreGenEvent.GenerateMinable.EventType.LAPIS, - OreGenEvent.GenerateMinable.EventType.QUARTZ}); + OreGenEvent.GenerateMinable.EventType.IRON, OreGenEvent.GenerateMinable.EventType.GOLD, + OreGenEvent.GenerateMinable.EventType.DIAMOND, OreGenEvent.GenerateMinable.EventType.REDSTONE, OreGenEvent.GenerateMinable.EventType.LAPIS, + OreGenEvent.GenerateMinable.EventType.QUARTZ); public final HashSet mRegisteredOres = new HashSet(10000); public final ArrayList mSoundNames = new ArrayList(); public final ArrayList mSoundItems = new ArrayList(); public final ArrayList mSoundCounts = new ArrayList(); private final Collection mEvents = new HashSet(); - private final Collection mIgnoredItems = new HashSet(Arrays.asList(new String[]{"itemGhastTear", "itemFlint", "itemClay", "itemBucketSaltWater", + private final Collection mIgnoredItems = new HashSet(Arrays.asList("itemGhastTear", "itemFlint", "itemClay", "itemBucketSaltWater", "itemBucketFreshWater", "itemBucketWater", "itemRock", "itemReed", "itemArrow", "itemSaw", "itemKnife", "itemHammer", "itemChisel", "itemRubber", "itemEssence", "itemIlluminatedPanel", "itemSkull", "itemRawRubber", "itemBacon", "itemJetpackAccelerator", "itemLazurite", "itemIridium", "itemTear", "itemClaw", "itemFertilizer", "itemTar", "itemSlimeball", "itemCoke", "itemBeeswax", "itemBeeQueen", "itemForcicium", "itemForcillium", @@ -104,8 +104,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { "itemCoal", "itemBoat", "itemHerbalMedicineCake", "itemCakeSponge", "itemFishandPumpkinCakeSponge", "itemSoulCleaver", "itemInstantCake", "itemWhippingCream", "itemGlisteningWhippingCream", "itemCleaver", "itemHerbalMedicineWhippingCream", "itemStrangeWhippingCream", "itemBlazeCleaver", "itemBakedCakeSponge", "itemMagmaCake", "itemGlisteningCake", "itemOgreCleaver", "itemFishandPumpkinCake", - "itemMagmaWhippingCream", "itemMultimeter", "itemSuperconductor"})); - private final Collection mIgnoredNames = new HashSet(Arrays.asList(new String[]{"grubBee", "chainLink", "candyCane", "bRedString", "bVial", + "itemMagmaWhippingCream", "itemMultimeter", "itemSuperconductor")); + private final Collection mIgnoredNames = new HashSet(Arrays.asList("grubBee", "chainLink", "candyCane", "bRedString", "bVial", "bFlask", "anorthositeSmooth", "migmatiteSmooth", "slateSmooth", "travertineSmooth", "limestoneSmooth", "orthogneissSmooth", "marbleSmooth", "honeyDrop", "lumpClay", "honeyEqualssugar", "flourEqualswheat", "bluestoneInsulated", "blockWaterstone", "blockSand", "blockTorch", "blockPumpkin", "blockClothRock", "blockStainedHardenedClay", "blockQuartzPillar", "blockQuartzChiselled", "blockSpawner", "blockCloth", "mobHead", @@ -122,8 +122,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { "unfinishedTank", "valvePart", "aquaRegia", "leatherSeal", "leatherSlimeSeal", "hambone", "slimeball", "clay", "enrichedUranium", "camoPaste", "antiBlock", "burntQuartz", "salmonRaw", "blockHopper", "blockEnderObsidian", "blockIcestone", "blockMagicWood", "blockEnderCore", "blockHeeEndium", "oreHeeEndPowder", "oreHeeStardust", "oreHeeIgneousRock", "oreHeeInstabilityOrb", "crystalPureFluix", "shardNether", "gemFluorite", - "stickObsidian", "caveCrystal", "shardCrystal", "dyeCrystal","shardFire","shardWater","shardAir","shardEarth","ingotRefinedIron","blockMarble","ingotUnstable"})); - private final Collection mInvalidNames = new HashSet(Arrays.asList(new String[]{"diamondShard", "redstoneRoot", "obsidianStick", "bloodstoneOre", + "stickObsidian", "caveCrystal", "shardCrystal", "dyeCrystal","shardFire","shardWater","shardAir","shardEarth","ingotRefinedIron","blockMarble","ingotUnstable")); + private final Collection mInvalidNames = new HashSet(Arrays.asList("diamondShard", "redstoneRoot", "obsidianStick", "bloodstoneOre", "universalCable", "bronzeTube", "ironTube", "netherTube", "obbyTube", "infiniteBattery", "eliteBattery", "advancedBattery", "10kEUStore", "blueDye", "MonazitOre", "quartzCrystal", "whiteLuminiteCrystal", "darkStoneIngot", "invisiumIngot", "demoniteOrb", "enderGem", "starconiumGem", "osmoniumIngot", "tapaziteGem", "zectiumIngot", "foolsRubyGem", "rubyGem", "meteoriteGem", "adamiteShard", "sapphireGem", "copperIngot", @@ -135,7 +135,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { "oilBucket", "petroleumOre", "dieselFuel", "diamondNugget", "planks", "wood", "stick", "sticks", "naquadah", "obsidianRod", "stoneRod", "thaumiumRod", "steelRod", "netherrackRod", "woodRod", "ironRod", "cactusRod", "flintRod", "copperRod", "cobaltRod", "alumiteRod", "blueslimeRod", "arditeRod", "manyullynRod", "bronzeRod", "boneRod", "slimeRod", "redalloyBundled", "bluestoneBundled", "infusedteslatiteInsulated", - "redalloyInsulated", "infusedteslatiteBundled"})); + "redalloyInsulated", "infusedteslatiteBundled")); private final DateFormat mDateFormat = DateFormat.getInstance(); public ArrayList mBufferedPlayerActivity = new ArrayList(); public boolean mHardcoreCables = false; diff --git a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java index 3431f96eb4..cb54f5d4a1 100644 --- a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java +++ b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java @@ -9,6 +9,8 @@ import forestry.core.config.Constants; import forestry.core.genetics.alleles.*; import forestry.core.utils.vect.IVect; import forestry.plugins.PluginManager; +import gregtech.GT_Mod; +import org.apache.commons.lang3.reflect.FieldUtils; import java.util.EnumMap; import java.util.HashMap; @@ -19,7 +21,7 @@ public class GT_AlleleHelper extends AlleleHelper { private static final String modId = Constants.ID; - private final Map> alleleMaps = new HashMap<>(); + private Map> alleleMaps = new HashMap<>(); public void init() { if (PluginManager.Module.APICULTURE.isEnabled()) { @@ -114,20 +116,28 @@ public class GT_AlleleHelper extends AlleleHelper { } public static void initialisation(){ - AlleleHelper.instance = new GT_AlleleHelper(); - AlleleHelper.instance.init(); - } + GT_AlleleHelper helper = new GT_AlleleHelper(); + try { + helper.alleleMaps = (Map>) FieldUtils.readField(FieldUtils.getField(AlleleHelper.class,"alleleMaps",true),AlleleHelper.instance,true); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + AlleleHelper.instance = helper; + //AlleleHelper.instance.init(); + } @Override public & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, IAllele allele) { if (allele == null) { + GT_Mod.GT_FML_LOGGER.info("Allele is null!"); return; } if (!chromosomeType.getAlleleClass().isInstance(allele)) { + GT_Mod.GT_FML_LOGGER.info("chromosomeType is not an instance of allele!"+allele.getName()); return; } diff --git a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java b/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java index a83b4c68f1..7b61505fc7 100644 --- a/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java +++ b/src/main/java/gregtech/common/bees/GT_Bee_Mutation.java @@ -8,6 +8,7 @@ import forestry.apiculture.genetics.BeeMutation; import forestry.core.genetics.mutations.Mutation; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import org.apache.commons.lang3.reflect.FieldUtils; import java.lang.reflect.Field; import java.util.List; @@ -15,9 +16,9 @@ import java.util.List; public class GT_Bee_Mutation extends BeeMutation { - private int split = 1; + private float split = 1; - public GT_Bee_Mutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance, int split) { + public GT_Bee_Mutation(IAlleleBeeSpecies bee0, IAlleleBeeSpecies bee1, IAllele[] result, int chance, float split) { super(bee0, bee1, result, chance); this.split = split; BeeManager.beeRoot.registerMutation(this); @@ -25,20 +26,19 @@ public class GT_Bee_Mutation extends BeeMutation { @Override public float getBaseChance() { - return ((float) ((float)super.getBaseChance() / ((float)split))); + return super.getBaseChance() / split; } @Override public float getChance(IBeeHousing housing, IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IBeeGenome genome0, IBeeGenome genome1) { - World world = housing.getWorld(); - ChunkCoordinates housingCoordinates = housing.getCoordinates(); - int x = housingCoordinates.posX; - int y = housingCoordinates.posY; - int z = housingCoordinates.posZ; + World world = housing != null ? housing.getWorld() : null; + ChunkCoordinates housingCoordinates = housing != null ? housing.getCoordinates() : null; + int x = housingCoordinates != null ? housingCoordinates.posX : 0; + int y = housingCoordinates != null ? housingCoordinates.posY : 0; + int z = housingCoordinates != null ? housingCoordinates.posZ : 0; float processedChance = getBasicChance(world, x, y, z, allele0, allele1, genome0, genome1); - if (processedChance <= 0f) { return 0f; } @@ -52,25 +52,27 @@ public class GT_Bee_Mutation extends BeeMutation { return processedChance; } - protected float getBasicChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { + private float getBasicChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) { float mutationChance = this.getBaseChance(); List mutationConditions = null; + Field f = FieldUtils.getDeclaredField(Mutation.class, "mutationConditions", true); + if (f == null) + f = FieldUtils.getField(Mutation.class, "mutationConditions", true); + if (f == null) + return mutationChance; try { - Field f = Mutation.class.getDeclaredField("mutationConditions"); - f.setAccessible(true); - Object o = f.get(this); - mutationConditions = o instanceof List ? (List) o : null ; - } catch (NoSuchFieldException | IllegalAccessException e) { + mutationConditions = f.get(this) instanceof List ? (List) f.get(this) : null; + } catch (IllegalAccessException e) { e.printStackTrace(); } if (mutationConditions != null) - for (IMutationCondition mutationCondition : mutationConditions) { - mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1); - if (mutationChance == 0) { - return 0; + for (IMutationCondition mutationCondition : mutationConditions) { + mutationChance *= mutationCondition.getChance(world, x, y, z, allele0, allele1, genome0, genome1); + if (mutationChance == 0) { + return 0; + } } - } return mutationChance; } -} +} \ No newline at end of file diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 0fac4b3af8..a4d67ebf86 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -5,292 +5,161 @@ import gregtech.api.util.GT_LanguageManager; public enum CombType { //Organic Line - LIGNIE("lignite", true, Materials.Lignite, 100), - COAL("coal", true, Materials.Coal, 100), - STICKY("stickyresin", true, Materials._NULL, 50), - OIL("oil", true, Materials._NULL, 100), - APATITE("apatite", true, Materials.Apatite, 100), - ASH("ash", true, Materials.Ash, 100), + LIGNIE("lignite", true, Materials.Lignite, 100,0x58300B, 0x906237), + COAL("coal", true, Materials.Coal, 100,0x525252, 0x666666), + STICKY("stickyresin", true, Materials._NULL, 50,0x2E8F5B, 0xDCC289), + OIL("oil", true, Materials._NULL, 100,0x333333, 0x4C4C4C), + APATITE("apatite", true, Materials.Apatite, 100,0xc1c1f6, 0x676784), + ASH("ash", true, Materials.Ash, 100,0x1e1a18, 0xc6c6c6), //IC2 Line - COOLANT("coolant", true, Materials._NULL, 100), - ENERGY("energy", true, Materials._NULL, 80), - LAPOTRON("lapotron", true, Materials._NULL, 60), - PYROTHEUM("pyrotheum", true, Materials.Pyrotheum, 50), - CRYOTHEUM("cryotheum", true, Materials.Pyrotheum, 50), + COOLANT("coolant", true, Materials._NULL, 100,0x144F5A, 0x2494A2), + ENERGY("energy", true, Materials._NULL, 80,0xC11F1F, 0xEBB9B9), + LAPOTRON("lapotron", true, Materials._NULL, 60,0x1414FF, 0x6478FF), + PYROTHEUM("pyrotheum", true, Materials.Pyrotheum, 50,0xffebc4, 0xe36400), + CRYOTHEUM("cryotheum", true, Materials.Pyrotheum, 50,0x2660ff, 0x5af7ff), //Alloy Line - REDALLOY("redalloy", true, Materials.RedAlloy, 100), - REDSTONEALLOY("redstonealloy", true, Materials.RedstoneAlloy, 90), - CONDUCTIVEIRON("conductiveiron", true, Materials.ConductiveIron, 80), - VIBRANTALLOY("vibrantalloy", true, Materials.VibrantAlloy, 50), - ENERGETICALLOY("energeticalloy", true, Materials.EnergeticAlloy, 70), - ELECTRICALSTEEL("electricalsteel", true, Materials.ElectricalSteel, 90), - DARKSTEEL("darksteel", true, Materials.DarkSteel, 80), - PULSATINGIRON("pulsatingiron", true, Materials.PulsatingIron, 80), - STAINLESSSTEEL("stainlesssteel", true, Materials.StainlessSteel, 75), - ENDERIUM("enderium", true, Materials.Enderium, 40), + REDALLOY("redalloy", true, Materials.RedAlloy, 100,0xE60000, 0xB80000), + REDSTONEALLOY("redstonealloy", true, Materials.RedstoneAlloy, 90,0xB80000, 0xA50808), + CONDUCTIVEIRON("conductiveiron", true, Materials.ConductiveIron, 80,0x817671, 0xCEADA3), + VIBRANTALLOY("vibrantalloy", true, Materials.VibrantAlloy, 50,0x86A12D, 0xC4F2AE), + ENERGETICALLOY("energeticalloy", true, Materials.EnergeticAlloy, 70,0xFF9933, 0xFFAD5C), + ELECTRICALSTEEL("electricalsteel", true, Materials.ElectricalSteel, 90,0x787878, 0xD8D8D8), + DARKSTEEL("darksteel", true, Materials.DarkSteel, 80,0x252525, 0x443B44), + PULSATINGIRON("pulsatingiron", true, Materials.PulsatingIron, 80,0x006600, 0x6DD284), + STAINLESSSTEEL("stainlesssteel", true, Materials.StainlessSteel, 75,0x778899, 0xC8C8DC), + ENDERIUM("enderium", true, Materials.Enderium, 40,0x2E8B57, 0x599087), //Thaumcraft Line - THAUMIUMDUST("thaumiumdust", true, Materials.Thaumium, 100), - THAUMIUMSHARD("thaumiumshard", true, Materials._NULL, 85), - AMBER("amber", true, Materials.Amber, 90), - QUICKSILVER("quicksilver", true, Materials.Mercury, 90), - SALISMUNDUS("salismundus", true, Materials._NULL, 75), - TAINTED("tainted", true, Materials._NULL, 80), - MITHRIL("mithril", true, Materials.Mithril, 70), - ASTRALSILVER("astralsilver", true, Materials.AstralSilver, 70), - THAUMINITE("thauminite", true, Materials._NULL, 50), - SHADOWMETAL("shadowmetal", true, Materials.Shadow, 50), - DIVIDED("divided", true, Materials.Unstable, 40), - SPARKELING("sparkling", true, Materials.NetherStar, 40), + THAUMIUMDUST("thaumiumdust", true, Materials.Thaumium, 100,0x7A007A, 0x5C005C), + THAUMIUMSHARD("thaumiumshard", true, Materials._NULL, 85,0x9966FF, 0xAD85FF), + AMBER("amber", true, Materials.Amber, 90,0x774B15, 0xEE7700), + QUICKSILVER("quicksilver", true, Materials.Mercury, 90,0xc7c7ea, 0xb5b3df), + SALISMUNDUS("salismundus", true, Materials._NULL, 75,0xF7ADDE, 0x592582), + TAINTED("tainted", true, Materials._NULL, 80,0x904BB8, 0xE800FF), + MITHRIL("mithril", true, Materials.Mithril, 70,0xF0E68C, 0xFFFFD2), + ASTRALSILVER("astralsilver", true, Materials.AstralSilver, 70,0xAFEEEE, 0xE6E6FF), + THAUMINITE("thauminite", true, Materials._NULL, 50,0x2E2D79, 0x7581E0), + SHADOWMETAL("shadowmetal", true, Materials.Shadow, 50,0x100322, 0x100342), + DIVIDED("divided", true, Materials.Unstable, 40,0xF0F0F0, 0xDCDCDC), + SPARKELING("sparkling", true, Materials.NetherStar, 40,0x7A007A, 0xFFFFFF), //Gem Line - STONE("stone", true, Materials._NULL, 70), - CERTUS("certus", true, Materials.CertusQuartz, 100), - FLUIX("fluix", true, Materials.Fluix, 100), - REDSTONE("redstone", true, Materials.Redstone, 100), - RAREEARTH("rareearth", true, Materials.RareEarth, 100), - LAPIS("lapis", true, Materials.Lapis, 100), - RUBY("ruby", true, Materials.Ruby, 100), - REDGARNET("redgarnet", true, Materials.GarnetRed,100), - YELLOWGARNET("yellowgarnet", true, Materials.GarnetYellow,100), - SAPPHIRE("sapphire", true, Materials.Sapphire, 100), - DIAMOND("diamond", true, Materials.Diamond, 100), - OLIVINE("olivine", true, Materials.Olivine, 100), - EMERALD("emerald", true, Materials.Emerald, 100), - PYROPE("pyrope", true, Materials.Pyrope, 100), - GROSSULAR("grossular", true, Materials.Grossular, 100), - FIRESTONE("firestone", true, Materials.Firestone, 100), + STONE("stone", true, Materials._NULL, 70,0x808080, 0x999999), + CERTUS("certus", true, Materials.CertusQuartz, 100,0x57CFFB, 0xBBEEFF), + FLUIX("fluix", true, Materials.Fluix, 100,0xA375FF, 0xB591FF), + REDSTONE("redstone", true, Materials.Redstone, 100,0x7D0F0F, 0xD11919), + RAREEARTH("rareearth", true, Materials.RareEarth, 100,0x555643, 0x343428), + LAPIS("lapis", true, Materials.Lapis, 100,0x1947D1, 0x476CDA), + RUBY("ruby", true, Materials.Ruby, 100,0xE6005C, 0xCC0052), + REDGARNET("redgarnet", true, Materials.GarnetRed,100,0xBD4C4C, 0xECCECE), + YELLOWGARNET("yellowgarnet", true, Materials.GarnetYellow,100,0xA3A341, 0xEDEDCE), + SAPPHIRE("sapphire", true, Materials.Sapphire, 100,0x0033CC, 0x00248F), + DIAMOND("diamond", true, Materials.Diamond, 100,0xCCFFFF, 0xA3CCCC), + OLIVINE("olivine", true, Materials.Olivine, 100,0x248F24, 0xCCFFCC), + EMERALD("emerald", true, Materials.Emerald, 100,0x248F24, 0x2EB82E), + PYROPE("pyrope", true, Materials.Pyrope, 100,0x763162, 0x8B8B8B), + GROSSULAR("grossular", true, Materials.Grossular, 100,0x9B4E00, 0x8B8B8B), + FIRESTONE("firestone", true, Materials.Firestone, 100,0xC00000, 0xFF0000), //Metals Line - SLAG("slag", true, Materials._NULL, 50), - COPPER("copper", true, Materials.Copper, 100), - TIN("tin", true, Materials.Tin, 100), - LEAD("lead", true, Materials.Lead, 100), - IRON("iron", true, Materials.Iron, 100), - STEEL("steel", true, Materials.Steel, 95), - NICKEL("nickel", true, Materials.Nickel, 100), - ZINC("zinc", true, Materials.Zinc, 100), - SILVER("silver", true, Materials.Silver, 100), - GOLD("gold", true, Materials.Gold, 100), - SULFUR("sulfur", true, Materials.Sulfur, 100), - GALLIUM ("gallium", true, Materials.Gallium, 75), - ARSENIC ("arsenic", true, Materials.Arsenic, 75), + SLAG("slag", true, Materials._NULL, 50,0xD4D4D4, 0x58300B), + COPPER("copper", true, Materials.Copper, 100,0xFF6600, 0xE65C00), + TIN("tin", true, Materials.Tin, 100,0xD4D4D4, 0xDDDDDD), + LEAD("lead", true, Materials.Lead, 100,0x666699, 0xA3A3CC), + IRON("iron", true, Materials.Iron, 100,0xDA9147, 0xDE9C59), + STEEL("steel", true, Materials.Steel, 95,0x808080, 0x999999), + NICKEL("nickel", true, Materials.Nickel, 100,0x8585AD, 0x9D9DBD), + ZINC("zinc", true, Materials.Zinc, 100,0xF0DEF0, 0xF2E1F2), + SILVER("silver", true, Materials.Silver, 100,0xC2C2D6, 0xCECEDE), + GOLD("gold", true, Materials.Gold, 100,0xE6B800, 0xCFA600), + SULFUR("sulfur", true, Materials.Sulfur, 100,0x6F6F01, 0x8B8B8B), + GALLIUM ("gallium", true, Materials.Gallium, 75,0x8B8B8B, 0xC5C5E4), + ARSENIC ("arsenic", true, Materials.Arsenic, 75,0x736C52, 0x292412), //Rare Metals Line - BAUXITE("bauxite", true, Materials.Bauxite, 85), - ALUMINIUM("aluminium", true, Materials.Aluminium, 60), - MANGANESE("manganese", true, Materials.Manganese, 30), - MAGNESIUM("magnesium", true, Materials.Magnesium, 75), - TITANIUM("titanium", true, Materials.Ilmenite, 100), - CHROME("chromium", true, Materials.Chrome, 50), - TUNGSTEN("tungsten", true, Materials.Tungstate, 100), - PLATINUM("platinum", true, Materials.Platinum, 40), - IRIDIUM("iridium", true, Materials.Iridium, 20), - MOLYBDENUM("molybdenum", true, Materials.Molybdenum, 20), - OSMIUM("osmium", true, Materials.Osmium, 15), - LITHIUM("lithium", true, Materials.Lithium, 75), - SALT("salt", true, Materials.Salt, 90), - ELECTROTINE("electrotine", true, Materials.Electrotine, 75), - ALMANDINE("almandine", true, Materials.Almandine, 85), + BAUXITE("bauxite", true, Materials.Bauxite, 85,0x6B3600, 0x8B8B8B), + ALUMINIUM("aluminium", true, Materials.Aluminium, 60,0x008AB8, 0xD6D6FF), + MANGANESE("manganese", true, Materials.Manganese, 30,0xD5D5D5, 0xAAAAAA), + MAGNESIUM("magnesium", true, Materials.Magnesium, 75,0xF1D9D9, 0x8B8B8B), + TITANIUM("titanium", true, Materials.Ilmenite, 100,0xCC99FF, 0xDBB8FF), + CHROME("chromium", true, Materials.Chrome, 50,0xEBA1EB, 0xF2C3F2), + TUNGSTEN("tungsten", true, Materials.Tungstate, 100,0x62626D, 0x161620), + PLATINUM("platinum", true, Materials.Platinum, 40,0xE6E6E6, 0xFFFFCC), + IRIDIUM("iridium", true, Materials.Iridium, 20,0xDADADA, 0xD1D1E0), + MOLYBDENUM("molybdenum", true, Materials.Molybdenum, 20,0xAEAED4, 0x8B8B8B), + OSMIUM("osmium", true, Materials.Osmium, 15,0x2B2BDA, 0x8B8B8B), + LITHIUM("lithium", true, Materials.Lithium, 75,0xF0328C, 0xE1DCFF), + SALT("salt", true, Materials.Salt, 90,0xF0C8C8, 0xFAFAFA), + ELECTROTINE("electrotine", true, Materials.Electrotine, 75,0x1E90FF, 0x3CB4C8), + ALMANDINE("almandine", true, Materials.Almandine, 85,0xC60000, 0x8B8B8B), //Radioactive Line - URANIUM("uranium", true, Materials.Uranium, 50), - PLUTONIUM("plutonium", true, Materials.Plutonium, 10), - NAQUADAH("naquadah", true, Materials.Naquadah, 10), - NAQUADRIA("naquadria", true, Materials.Naquadria, 5), - DOB("d-o-b", true, Materials._NULL, 50), - THORIUM("thorium", true, Materials.Thorium, 75), - LUTETIUM("lutetium", true, Materials.Lutetium, 10), - AMERICUM("americum", true, Materials.Americium, 5), - NEUTRONIUM("neutronium", true, Materials.Neutronium, 2), + URANIUM("uranium", true, Materials.Uranium, 50,0x19AF19, 0x169E16), + PLUTONIUM("plutonium", true, Materials.Plutonium, 10,0x240000, 0x570000), + NAQUADAH("naquadah", true, Materials.Naquadah, 10,0x000000, 0x004400), + NAQUADRIA("naquadria", true, Materials.Naquadria, 5,0x000000, 0x002400), + DOB("d-o-b", true, Materials._NULL, 50,0x007700, 0x002400), + THORIUM("thorium", true, Materials.Thorium, 75,0x001E00, 0x005000), + LUTETIUM("lutetium", true, Materials.Lutetium, 10,0xE6FFE6, 0xFFFFFF), + AMERICUM("americum", true, Materials.Americium, 5,0xE6E6FF, 0xC8C8C8), + NEUTRONIUM("neutronium", true, Materials.Neutronium, 2,0xFFF0F0, 0xFAFAFA), //Twilight - NAGA("naga", true, Materials._NULL, 100), - LICH("lich", true, Materials._NULL, 90), - HYDRA("hydra", true, Materials._NULL, 80), - URGHAST("urghast", true, Materials._NULL, 70), - SNOWQUEEN("snowqueen", true, Materials._NULL, 60), + NAGA("naga", true, Materials._NULL, 100,0x0D5A0D, 0x28874B), + LICH("lich", true, Materials._NULL, 90,0x5C605E, 0xC5C5C5), + HYDRA("hydra", true, Materials._NULL, 80,0x872836, 0xB8132C), + URGHAST("urghast", true, Materials._NULL, 70,0x7C0618, 0xA7041C), + SNOWQUEEN("snowqueen", true, Materials._NULL, 60,0x9C0018, 0xD02001), //Space - SPACE("space", true, Materials._NULL, 100), - METEORICIRON("meteoriciron",true, Materials.MeteoricIron, 100), - DESH("desh",true, Materials.Desh, 90), - LEDOX("ledox",true, Materials.Ledox, 75), - CALLISTOICE("callistoice",true, Materials.CallistoIce, 75), - MYTRYL("mytryl",true, Materials.Mytryl, 65), - QUANTIUM("quantium",true, Materials.Quantium, 50), - ORIHARUKON("oriharukon",true, Materials.Oriharukon, 50), - MYSTERIOUSCRYSTAL("mysteriouscrystal",true, Materials.MysteriousCrystal, 45), - BLACKPLUTONIUM("blackplutonium",true, Materials.Quantium, 25), - TRINIUM("trinium",true, Materials.Trinium, 25), + SPACE("space", true, Materials._NULL, 100,0x003366, 0xC0C0C0), + METEORICIRON("meteoriciron",true, Materials.MeteoricIron, 100,0x321928, 0x643250), + DESH("desh",true, Materials.Desh, 90,0x282828, 0x323232), + LEDOX("ledox",true, Materials.Ledox, 75,0x0000CD, 0x0074FF), + CALLISTOICE("callistoice",true, Materials.CallistoIce, 75,0x0074FF, 0x1EB1FF), + MYTRYL("mytryl",true, Materials.Mytryl, 65,0xDAA520, 0xF26404), + QUANTIUM("quantium",true, Materials.Quantium, 50,0x00FF00, 0x00D10B), + ORIHARUKON("oriharukon",true, Materials.Oriharukon, 50,0x228B22, 0x677D68), + MYSTERIOUSCRYSTAL("mysteriouscrystal",true, Materials.MysteriousCrystal, 45,0x3CB371, 0x16856C), + BLACKPLUTONIUM("blackplutonium",true, Materials.Quantium, 25,0x000000, 0x323232), + TRINIUM("trinium",true, Materials.Trinium, 25,0xB0E0E6, 0xC8C8D2), //Planet - MERCURY("mercury", true, Materials._NULL, 65), - VENUS("venus",true, Materials._NULL, 65), - MOON("moon",true, Materials._NULL, 90), - MARS("mars",true, Materials._NULL, 80), - JUPITER("jupiter",true, Materials._NULL, 75), - SATURN("saturn",true, Materials._NULL, 55), - URANUS("uranus",true, Materials._NULL, 45), - NEPTUN("neptun",true, Materials._NULL, 35), - PLUTO("pluto",true, Materials._NULL, 25), - HAUMEA("haumea",true, Materials._NULL, 20), - MAKEMAKE("makemake",true, Materials._NULL, 20), - CENTAURI("centauri",true, Materials._NULL, 15), - TCETI("tceti",true, Materials._NULL, 10), - BARNARDA("barnarda",true, Materials._NULL, 10), - VEGA("vega",true, Materials._NULL, 10), + MERCURY("mercury", true, Materials._NULL, 65,0x4A4033, 0xB5A288), + VENUS("venus",true, Materials._NULL, 65,0x120E07, 0x272010), + MOON("moon",true, Materials._NULL, 90,0x373735, 0x7E7E78), + MARS("mars",true, Materials._NULL, 80,0x220D05, 0x3A1505), + JUPITER("jupiter",true, Materials._NULL, 75,0x734B2E, 0xD0CBC4), + SATURN("saturn",true, Materials._NULL, 55,0xD2A472, 0xF8C37B), + URANUS("uranus",true, Materials._NULL, 45,0x75C0C9, 0x84D8EC), + NEPTUN("neptun",true, Materials._NULL, 35,0x334CFF, 0x576DFF), + PLUTO("pluto",true, Materials._NULL, 25,0x34271E, 0x69503D), + HAUMEA("haumea",true, Materials._NULL, 20,0x1C1413, 0x392B28), + MAKEMAKE("makemake",true, Materials._NULL, 20,0x301811, 0x120A07), + CENTAURI("centauri",true, Materials._NULL, 15,0x2F2A14, 0xB06B32), + TCETI("tceti",true, Materials._NULL, 10,0x46241A, 0x7B412F), + BARNARDA("barnarda",true, Materials._NULL, 10,0x0D5A0D, 0xE6C18D), + VEGA("vega",true, Materials._NULL, 10,0x1A2036, 0xB5C0DE), //Infinity - COSMICNEUTRONIUM("cosmicneutronium",true, Materials._NULL, 5), - INFINITYCATALYST("infinitycatalyst",true, Materials._NULL, 2), - INFINITY("infinity",true, Materials._NULL, 1); - - private static int[][] colours = new int[][]{ - //organic - {0x58300B, 0x906237}, - {0x525252, 0x666666}, - {0x2E8F5B, 0xDCC289}, - {0x333333, 0x4C4C4C}, - {0xc1c1f6, 0x676784}, - {0x1e1a18, 0xc6c6c6}, - //ic2 - {0x144F5A, 0x2494A2}, - {0xC11F1F, 0xEBB9B9}, - {0x1414FF, 0x6478FF}, - {0xffebc4, 0xe36400}, - {0x2660ff, 0x5af7ff}, - //alloy - {0xE60000, 0xB80000}, - {0xB80000, 0xA50808}, - {0x817671, 0xCEADA3}, - {0x86A12D, 0xC4F2AE}, - {0xFF9933, 0xFFAD5C}, - {0x787878, 0xD8D8D8}, - {0x252525, 0x443B44}, - {0x006600, 0x6DD284}, - {0x778899, 0xC8C8DC}, - {0x2E8B57, 0x599087}, - //Thaumcraft - {0x7A007A, 0x5C005C}, - {0x9966FF, 0xAD85FF}, - {0x774B15, 0xEE7700}, - {0xc7c7ea, 0xb5b3df}, - {0xF7ADDE, 0x592582}, - {0x904BB8, 0xE800FF}, - {0xF0E68C, 0xFFFFD2}, - {0xAFEEEE, 0xE6E6FF}, - {0x2E2D79, 0x7581E0}, - {0x100322, 0x100342}, - {0xF0F0F0, 0xDCDCDC}, - {0x7A007A, 0xFFFFFF}, - //gems - {0x808080, 0x999999}, - {0x57CFFB, 0xBBEEFF}, - {0xA375FF, 0xB591FF}, - {0x7D0F0F, 0xD11919}, - {0x555643, 0x343428}, - {0x1947D1, 0x476CDA}, - {0xE6005C, 0xCC0052}, - {0xBD4C4C, 0xECCECE}, - {0xA3A341, 0xEDEDCE}, - {0x0033CC, 0x00248F}, - {0xCCFFFF, 0xA3CCCC}, - {0x248F24, 0xCCFFCC}, - {0x248F24, 0x2EB82E}, - {0x763162, 0x8B8B8B}, - {0x9B4E00, 0x8B8B8B}, - {0xC00000, 0xFF0000}, - //Metals - {0xD4D4D4, 0x58300B}, - {0xFF6600, 0xE65C00}, - {0xD4D4D4, 0xDDDDDD}, - {0x666699, 0xA3A3CC}, - {0xDA9147, 0xDE9C59}, - {0x808080, 0x999999}, - {0x8585AD, 0x9D9DBD}, - {0xF0DEF0, 0xF2E1F2}, - {0xC2C2D6, 0xCECEDE}, - {0xE6B800, 0xCFA600}, - {0x6F6F01, 0x8B8B8B}, - {0x8B8B8B, 0xC5C5E4}, - {0x736C52, 0x292412}, - //Rare Metals - {0x6B3600, 0x8B8B8B}, - {0x008AB8, 0xD6D6FF}, - {0xD5D5D5, 0xAAAAAA}, - {0xF1D9D9, 0x8B8B8B}, - {0xCC99FF, 0xDBB8FF}, - {0xEBA1EB, 0xF2C3F2}, - {0x62626D, 0x161620}, - {0xE6E6E6, 0xFFFFCC}, - {0xDADADA, 0xD1D1E0}, - {0xAEAED4, 0x8B8B8B}, - {0x2B2BDA, 0x8B8B8B}, - {0xF0328C, 0xE1DCFF}, - {0xF0C8C8, 0xFAFAFA}, - {0x1E90FF, 0x3CB4C8}, - {0xC60000, 0x8B8B8B}, - //Radioactive Line - {0x19AF19, 0x169E16}, - {0x240000, 0x570000}, - {0x000000, 0x004400}, - {0x000000, 0x002400}, - {0x007700, 0x002400}, - {0x001E00, 0x005000}, - {0xE6FFE6, 0xFFFFFF}, - {0xE6E6FF, 0xC8C8C8}, - {0xFFF0F0, 0xFAFAFA}, - //Twilight - {0x0D5A0D, 0x28874B}, - {0x5C605E, 0xC5C5C5}, - {0x872836, 0xB8132C}, - {0x7C0618, 0xA7041C}, - {0x9C0018, 0xD02001}, - //space - {0x003366, 0xC0C0C0}, - {0x321928, 0x643250}, - {0x282828, 0x323232}, - {0x0000CD, 0x0074FF}, - {0x0074FF, 0x1EB1FF}, - {0xDAA520, 0xF26404}, - {0x00FF00, 0x00D10B}, - {0x228B22, 0x677D68}, - {0x3CB371, 0x16856C}, - {0x000000, 0x323232}, - {0xB0E0E6, 0xC8C8D2}, - //planets - {0x4A4033, 0xB5A288}, - {0x120E07, 0x272010}, - {0x373735, 0x7E7E78}, - {0x220D05, 0x3A1505}, - {0x734B2E, 0xD0CBC4}, - {0xD2A472, 0xF8C37B}, - {0x75C0C9, 0x84D8EC}, - {0x334CFF, 0x576DFF}, - {0x34271E, 0x69503D}, - {0x1C1413, 0x392B28}, - {0x301811, 0x120A07}, - {0x2F2A14, 0xB06B32}, - {0x46241A, 0x7B412F}, - {0x0D5A0D, 0xE6C18D}, - {0x1A2036, 0xB5C0DE}, - //infinity - {0x484848, 0x323232}, - {0xFFFFFF, 0xFFFFFF}, - {0xFFFFFF, 0xFFFFFF}, - }; + COSMICNEUTRONIUM("cosmicneutronium",true, Materials._NULL, 5,0x484848, 0x323232), + INFINITYCATALYST("infinitycatalyst",true, Materials._NULL, 2,0xFFFFFF, 0xFFFFFF), + INFINITY("infinity",true, Materials._NULL, 1,0xFFFFFF, 0xFFFFFF); public boolean showInList; public Materials material; public int chance; + private String name; - private CombType(String pName, boolean show, Materials material, int chance) { + private int[] color; + + CombType(String pName, boolean show, Materials material, int chance, int... color) { this.name = pName; this.material = material; this.chance = chance; this.showInList = show; + this.color=color; } public void setHidden() { @@ -303,6 +172,6 @@ public enum CombType { } public int[] getColours() { - return colours[this.ordinal()]; + return color == null || color.length != 2 ? new int[]{0,0} : color; } } \ No newline at end of file diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index 684506f2a0..e708ece935 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -4,11 +4,9 @@ import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.items.GT_MetaGenerated_Item_X32; import gregtech.api.objects.GT_CopiedBlockTexture; -import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.objects.ItemData; import gregtech.api.objects.MaterialStack; import gregtech.api.util.*; -import gregtech.common.covers.GT_Cover_SolarPanel; import gregtech.common.items.behaviors.Behaviour_Arrow; import net.minecraft.dispenser.IBlockSource; import net.minecraft.enchantment.Enchantment; @@ -30,312 +28,315 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { private final static String aTextCover = "Usable as Cover"; private final static String aTextForestry = "Forestry"; public GT_MetaGenerated_Item_02() { - super("metaitem.02", new OrePrefixes[]{OrePrefixes.toolHeadSword, OrePrefixes.toolHeadPickaxe, OrePrefixes.toolHeadShovel, OrePrefixes.toolHeadAxe, OrePrefixes.toolHeadHoe, OrePrefixes.toolHeadHammer, OrePrefixes.toolHeadFile, OrePrefixes.toolHeadSaw, OrePrefixes.toolHeadDrill, OrePrefixes.toolHeadChainsaw, OrePrefixes.toolHeadWrench, OrePrefixes.toolHeadUniversalSpade, OrePrefixes.toolHeadSense, OrePrefixes.toolHeadPlow, OrePrefixes.toolHeadArrow, OrePrefixes.toolHeadBuzzSaw, OrePrefixes.turbineBlade, null, OrePrefixes.itemCasing, OrePrefixes.wireFine, OrePrefixes.gearGtSmall, OrePrefixes.rotor, OrePrefixes.stickLong, OrePrefixes.springSmall, OrePrefixes.spring, OrePrefixes.arrowGtWood, OrePrefixes.arrowGtPlastic, OrePrefixes.gemChipped, OrePrefixes.gemFlawed, OrePrefixes.gemFlawless, OrePrefixes.gemExquisite, OrePrefixes.gearGt}); + super("metaitem.02", OrePrefixes.toolHeadSword, OrePrefixes.toolHeadPickaxe, OrePrefixes.toolHeadShovel, OrePrefixes.toolHeadAxe, OrePrefixes.toolHeadHoe, OrePrefixes.toolHeadHammer, OrePrefixes.toolHeadFile, OrePrefixes.toolHeadSaw, OrePrefixes.toolHeadDrill, OrePrefixes.toolHeadChainsaw, OrePrefixes.toolHeadWrench, OrePrefixes.toolHeadUniversalSpade, OrePrefixes.toolHeadSense, OrePrefixes.toolHeadPlow, OrePrefixes.toolHeadArrow, OrePrefixes.toolHeadBuzzSaw, OrePrefixes.turbineBlade, null, OrePrefixes.itemCasing, OrePrefixes.wireFine, OrePrefixes.gearGtSmall, OrePrefixes.rotor, OrePrefixes.stickLong, OrePrefixes.springSmall, OrePrefixes.spring, OrePrefixes.arrowGtWood, OrePrefixes.arrowGtPlastic, OrePrefixes.gemChipped, OrePrefixes.gemFlawed, OrePrefixes.gemFlawless, OrePrefixes.gemExquisite, OrePrefixes.gearGt); INSTANCE = this; int tLastID = 0; - ItemList.ThermosCan_Dark_Coffee.set(addItem(tLastID = 0, "Dark Coffee", "Coffee, dark, without anything else", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSpeed.id, 400, 1, 70, Potion.digSpeed.id, 400, 1, 70}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)})); - ItemList.ThermosCan_Dark_Cafe_au_lait.set(addItem(tLastID = 1, "Dark Coffee au lait", "Keeping you awake the whole night", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSpeed.id, 400, 2, 90, Potion.digSpeed.id, 400, 2, 90}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 3L)})); - ItemList.ThermosCan_Coffee.set(addItem(tLastID = 2, "Coffee", "Just the regular morning Coffee", new Object[]{new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSpeed.id, 400, 0, 50, Potion.digSpeed.id, 400, 0, 50}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)})); - ItemList.ThermosCan_Cafe_au_lait.set(addItem(tLastID = 3, "Cafe au lait", "Sweet Coffee", new Object[]{new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSpeed.id, 400, 1, 70, Potion.digSpeed.id, 400, 1, 70}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L)})); - ItemList.ThermosCan_Lait_au_cafe.set(addItem(tLastID = 4, "Lait au cafe", "You want Coffee to your Sugar?", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSpeed.id, 400, 2, 90, Potion.digSpeed.id, 400, 2, 90}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 3L)})); - ItemList.ThermosCan_Dark_Chocolate_Milk.set(addItem(tLastID = 5, "Dark Chocolate Milk", "A bit bitter, better add a bit Sugar", new Object[]{new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.regeneration.id, 50, 1, 60}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)})); - ItemList.ThermosCan_Chocolate_Milk.set(addItem(tLastID = 6, "Chocolate Milk", "Sweet Goodness", new Object[]{new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.regeneration.id, 50, 1, 90}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 2L)})); - ItemList.ThermosCan_Tea.set(addItem(tLastID = 7, "Tea", "Keep calm and carry on", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSlowdown.id, 300, 0, 50}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)})); - ItemList.ThermosCan_Sweet_Tea.set(addItem(tLastID = 8, "Sweet Tea", "How about a Tea Party? In Boston?", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)})); - ItemList.ThermosCan_Ice_Tea.set(addItem(tLastID = 9, "Ice Tea", "Better than this purple Junk Drink from failed Potions", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSlowdown.id, 300, 0, 50}), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L)})); - - ItemList.GelledToluene.set(addItem(tLastID = 10, "Gelled Toluene", "Raw Explosive", new Object[]{})); + ItemList.ThermosCan_Dark_Coffee.set(addItem(tLastID = 0, "Dark Coffee", "Coffee, dark, without anything else", new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSpeed.id, 400, 1, 70, Potion.digSpeed.id, 400, 1, 70), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L))); + ItemList.ThermosCan_Dark_Cafe_au_lait.set(addItem(tLastID = 1, "Dark Coffee au lait", "Keeping you awake the whole night", SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSpeed.id, 400, 2, 90, Potion.digSpeed.id, 400, 2, 90), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 3L))); + ItemList.ThermosCan_Coffee.set(addItem(tLastID = 2, "Coffee", "Just the regular morning Coffee", new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSpeed.id, 400, 0, 50, Potion.digSpeed.id, 400, 0, 50), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L))); + ItemList.ThermosCan_Cafe_au_lait.set(addItem(tLastID = 3, "Cafe au lait", "Sweet Coffee", new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSpeed.id, 400, 1, 70, Potion.digSpeed.id, 400, 1, 70), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 2L))); + ItemList.ThermosCan_Lait_au_cafe.set(addItem(tLastID = 4, "Lait au cafe", "You want Coffee to your Sugar?", SubTag.INVISIBLE, new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSpeed.id, 400, 2, 90, Potion.digSpeed.id, 400, 2, 90), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 3L))); + ItemList.ThermosCan_Dark_Chocolate_Milk.set(addItem(tLastID = 5, "Dark Chocolate Milk", "A bit bitter, better add a bit Sugar", new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.regeneration.id, 50, 1, 60), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); + ItemList.ThermosCan_Chocolate_Milk.set(addItem(tLastID = 6, "Chocolate Milk", "Sweet Goodness", new GT_FoodStat(3, 0.4F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.regeneration.id, 50, 1, 90), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 2L))); + ItemList.ThermosCan_Tea.set(addItem(tLastID = 7, "Tea", "Keep calm and carry on", new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSlowdown.id, 300, 0, 50), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L))); + ItemList.ThermosCan_Sweet_Tea.set(addItem(tLastID = 8, "Sweet Tea", "How about a Tea Party? In Boston?", SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L))); + ItemList.ThermosCan_Ice_Tea.set(addItem(tLastID = 9, "Ice Tea", "Better than this purple Junk Drink from failed Potions", new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.ThermosCan_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSlowdown.id, 300, 0, 50), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.GELUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L))); + + ItemList.GelledToluene.set(addItem(tLastID = 10, "Gelled Toluene", "Raw Explosive")); - ItemList.Bottle_Purple_Drink.set(addItem(tLastID = 100, "Purple Drink", "How about Lemonade. Or some Ice Tea? I got Purple Drink!", new Object[]{new GT_FoodStat(8, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.moveSlowdown.id, 400, 1, 90}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 1L)})); - ItemList.Bottle_Grape_Juice.set(addItem(tLastID = 101, "Grape Juice", "This has a cleaning effect on your internals.", new Object[]{new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.hunger.id, 400, 1, 60}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)})); - ItemList.Bottle_Wine.set(addItem(tLastID = 102, "Wine", "Ordinary", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 400, 1, 60, Potion.heal.id, 0, 0, 60, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)})); - ItemList.Bottle_Vinegar.set(addItem(tLastID = 103, "Vinegar", "Exquisite", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 400, 1, 90, Potion.heal.id, 0, 1, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)})); - ItemList.Bottle_Potato_Juice.set(addItem(tLastID = 104, "Potato Juice", "Ever seen Potato Juice in stores? No? That has a reason.", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(3, 0.3F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L)})); - ItemList.Bottle_Vodka.set(addItem(tLastID = 105, "Vodka", "Not to confuse with Water", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 500, 0, 60, Potion.damageBoost.id, 500, 1, 60, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L)})); - ItemList.Bottle_Leninade.set(addItem(tLastID = 106, "Leninade", "Let the Communism flow through you!", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 500, 1, 90, Potion.damageBoost.id, 500, 2, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 2L)})); - ItemList.Bottle_Mineral_Water.set(addItem(tLastID = 107, "Mineral Water", "The best Stuff you can drink to stay healthy", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.regeneration.id, 100, 1, 10}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)})); - ItemList.Bottle_Salty_Water.set(addItem(tLastID = 108, "Salty Water", "Like Sea Water but less dirty", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(1, 0.0F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.hunger.id, 400, 2, 95}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TEMPESTAS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Bottle_Reed_Water.set(addItem(tLastID = 109, "Reed Water", "I guess this tastes better when fermented", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)})); - ItemList.Bottle_Rum.set(addItem(tLastID = 110, "Rum", "A buddle o' rum", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(4, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 300, 0, 60, Potion.damageBoost.id, 300, 1, 60, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)})); - ItemList.Bottle_Pirate_Brew.set(addItem(tLastID = 111, "Pirate Brew", "Set the Sails, we are going to Torrentuga!", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(4, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 300, 1, 90, Potion.damageBoost.id, 300, 2, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 2L)})); - ItemList.Bottle_Hops_Juice.set(addItem(tLastID = 112, "Hops Juice", "Every Beer has a start", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L)})); - ItemList.Bottle_Dark_Beer.set(addItem(tLastID = 113, "Dark Beer", "Dark Beer, for the real Men", new Object[]{new GT_FoodStat(4, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 300, 1, 60, Potion.damageBoost.id, 300, 1, 60, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)})); - ItemList.Bottle_Dragon_Blood.set(addItem(tLastID = 114, "Dragon Blood", "FUS RO DAH!", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(4, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 300, 2, 90, Potion.damageBoost.id, 300, 2, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L)})); - ItemList.Bottle_Wheaty_Juice.set(addItem(tLastID = 115, "Wheaty Juice", "Is this liquefied Bread or what?", new Object[]{new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L)})); - ItemList.Bottle_Scotch.set(addItem(tLastID = 116, "Scotch", "Technically this is just a Whisky", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 400, 0, 60, Potion.resistance.id, 400, 1, 60, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L)})); - ItemList.Bottle_Glen_McKenner.set(addItem(tLastID = 117, "Glen McKenner", "Don't hand to easily surprised people, they will shatter it.", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 400, 1, 90, Potion.resistance.id, 400, 2, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 2L)})); - ItemList.Bottle_Wheaty_Hops_Juice.set(addItem(tLastID = 118, "Wheaty Hops Juice", "Also known as 'Duff-Lite'", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 2L)})); - ItemList.Bottle_Beer.set(addItem(tLastID = 119, "Beer", "Good old Beer", new Object[]{new GT_FoodStat(6, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 400, 0, 60, Potion.digSpeed.id, 400, 2, 60, Potion.poison.id, 100, 0, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L)})); - ItemList.Bottle_Chilly_Sauce.set(addItem(tLastID = 120, "Chilly Sauce", "Spicy", new Object[]{new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 1000, 0, 10, Potion.fireResistance.id, 1000, 0, 60}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Bottle_Hot_Sauce.set(addItem(tLastID = 121, "Hot Sauce", "Very Spicy, I guess?", new Object[]{new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 2000, 0, 30, Potion.fireResistance.id, 2000, 0, 70}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2L)})); - ItemList.Bottle_Diabolo_Sauce.set(addItem(tLastID = 122, "Diabolo Sauce", "As if the Devil made this Sauce", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 3000, 1, 50, Potion.fireResistance.id, 3000, 0, 80}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L)})); - ItemList.Bottle_Diablo_Sauce.set(addItem(tLastID = 123, "Diablo Sauce", "Diablo always comes back!", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 4000, 1, 70, Potion.fireResistance.id, 4000, 0, 90}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 4L)})); - ItemList.Bottle_Snitches_Glitch_Sauce.set(addItem(tLastID = 124, "Old Man Snitches glitched Diablo Sauce", "[Missing No]", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 9999, 2, 999, Potion.fireResistance.id, 9999, 9, 999}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 5L)})); - ItemList.Bottle_Apple_Juice.set(addItem(tLastID = 125, "Apple Juice", "Made of the Apples from our best Oak Farms", new Object[]{new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.hunger.id, 400, 0, 20}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)})); - ItemList.Bottle_Cider.set(addItem(tLastID = 126, "Cider", "If you have nothing better to do with your Apples", new Object[]{new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 400, 0, 60, Potion.resistance.id, 400, 1, 60, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L)})); - ItemList.Bottle_Golden_Apple_Juice.set(addItem(tLastID = 127, "Golden Apple Juice", "A golden Apple in liquid form", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.hunger.id, 400, 0, 20, Potion.field_76444_x.id, 2400, 0, 100, Potion.regeneration.id, 100, 1, 100}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)})); - ItemList.Bottle_Golden_Cider.set(addItem(tLastID = 128, "Golden Cider", "More Resistance, less Regeneration", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.confusion.id, 400, 0, 60, Potion.field_76444_x.id, 2400, 1, 95, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L)})); - ItemList.Bottle_Iduns_Apple_Juice.set(addItem(tLastID = 129, "Idun's Apple Juice", "So you got the Idea of using Notch Apples for a drink?", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.regeneration.id, 600, 4, 100, Potion.field_76444_x.id, 2400, 0, 100, Potion.resistance.id, 6000, 0, 100, Potion.fireResistance.id, 6000, 0, 100}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 9L)})); - ItemList.Bottle_Notches_Brew.set(addItem(tLastID = 130, "Notches Brew", "This is just overpowered", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.regeneration.id, 700, 4, 95, Potion.field_76444_x.id, 3000, 1, 95, Potion.resistance.id, 7000, 1, 95, Potion.fireResistance.id, 7000, 0, 95, Potion.harm.id, 0, 2, 20}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 9L)})); - ItemList.Bottle_Lemon_Juice.set(addItem(tLastID = 131, "Lemon Juice", "Maybe adding Sugar will make it less sour", new Object[]{new GT_FoodStat(2, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.digSpeed.id, 1200, 0, 60}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L)})); - ItemList.Bottle_Limoncello.set(addItem(tLastID = 132, "Limoncello", "An alcoholic Drink which tastes like Lemons", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.digSpeed.id, 1200, 0, 90, Potion.poison.id, 200, 1, 5}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L)})); - ItemList.Bottle_Lemonade.set(addItem(tLastID = 133, "Lemonade", "Cold and refreshing Lemonade", new Object[]{new GT_FoodStat(4, 0.3F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.digSpeed.id, 900, 1, 90}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L)})); - ItemList.Bottle_Alcopops.set(addItem(tLastID = 134, "Alcopops", "Don't let your Children drink this junk!", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.digSpeed.id, 900, 1, 90, Potion.poison.id, 300, 2, 20}), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 1L)})); - ItemList.Bottle_Cave_Johnsons_Grenade_Juice.set(addItem(tLastID = 135, "Cave Johnson's Grenade Juice", "When life gives you Lemons, make Life take them Lemons back!", new Object[]{SubTag.INVISIBLE, new GT_FoodStat(0, 0.0F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]).setExplosive(), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MORTUUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 1L)})); - ItemList.Bottle_Milk.set(addItem(tLastID = 136, "Milk", "Got Milk?", new Object[]{OrePrefixes.bottle.get(Materials.Milk), new GT_FoodStat(0, 0.0F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[0]).setMilk(), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)})); - ItemList.Bottle_Holy_Water.set(addItem(tLastID = 137, "Holy Water", "May the holy Planks be with you", new Object[]{OrePrefixes.bottle.get(Materials.HolyWater), new GT_FoodStat(0, 0.0F, EnumAction.drink, ItemList.Bottle_Empty.get(1L, new Object[0]), GregTech_API.sDrinksAlwaysDrinkable, false, false, new int[]{Potion.poison.id, 100, 1, 100}).setMilk(), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 1L)})); + ItemList.Bottle_Purple_Drink.set(addItem(tLastID = 100, "Purple Drink", "How about Lemonade. Or some Ice Tea? I got Purple Drink!", new GT_FoodStat(8, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.moveSlowdown.id, 400, 1, 90), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 1L))); + ItemList.Bottle_Grape_Juice.set(addItem(tLastID = 101, "Grape Juice", "This has a cleaning effect on your internals.", new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.hunger.id, 400, 1, 60), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); + ItemList.Bottle_Wine.set(addItem(tLastID = 102, "Wine", "Ordinary", new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 400, 1, 60, Potion.heal.id, 0, 0, 60, Potion.poison.id, 200, 1, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); + ItemList.Bottle_Vinegar.set(addItem(tLastID = 103, "Vinegar", "Exquisite", new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 400, 1, 90, Potion.heal.id, 0, 1, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); + ItemList.Bottle_Potato_Juice.set(addItem(tLastID = 104, "Potato Juice", "Ever seen Potato Juice in stores? No? That has a reason.", SubTag.INVISIBLE, new GT_FoodStat(3, 0.3F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L))); + ItemList.Bottle_Vodka.set(addItem(tLastID = 105, "Vodka", "Not to confuse with Water", SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 500, 0, 60, Potion.damageBoost.id, 500, 1, 60, Potion.poison.id, 200, 1, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 1L))); + ItemList.Bottle_Leninade.set(addItem(tLastID = 106, "Leninade", "Let the Communism flow through you!", SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 500, 1, 90, Potion.damageBoost.id, 500, 2, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 2L))); + ItemList.Bottle_Mineral_Water.set(addItem(tLastID = 107, "Mineral Water", "The best Stuff you can drink to stay healthy", new GT_FoodStat(1, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.regeneration.id, 100, 1, 10), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); + ItemList.Bottle_Salty_Water.set(addItem(tLastID = 108, "Salty Water", "Like Sea Water but less dirty", SubTag.INVISIBLE, new GT_FoodStat(1, 0.0F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.hunger.id, 400, 2, 95), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TEMPESTAS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Bottle_Reed_Water.set(addItem(tLastID = 109, "Reed Water", "I guess this tastes better when fermented", new GT_FoodStat(1, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); + ItemList.Bottle_Rum.set(addItem(tLastID = 110, "Rum", "A buddle o' rum", SubTag.INVISIBLE, new GT_FoodStat(4, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 300, 0, 60, Potion.damageBoost.id, 300, 1, 60, Potion.poison.id, 200, 1, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); + ItemList.Bottle_Pirate_Brew.set(addItem(tLastID = 111, "Pirate Brew", "Set the Sails, we are going to Torrentuga!", SubTag.INVISIBLE, new GT_FoodStat(4, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 300, 1, 90, Potion.damageBoost.id, 300, 2, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 2L))); + ItemList.Bottle_Hops_Juice.set(addItem(tLastID = 112, "Hops Juice", "Every Beer has a start", new GT_FoodStat(1, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L))); + ItemList.Bottle_Dark_Beer.set(addItem(tLastID = 113, "Dark Beer", "Dark Beer, for the real Men", new GT_FoodStat(4, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 300, 1, 60, Potion.damageBoost.id, 300, 1, 60, Potion.poison.id, 200, 1, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L))); + ItemList.Bottle_Dragon_Blood.set(addItem(tLastID = 114, "Dragon Blood", "FUS RO DAH!", SubTag.INVISIBLE, new GT_FoodStat(4, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 300, 2, 90, Potion.damageBoost.id, 300, 2, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L))); + ItemList.Bottle_Wheaty_Juice.set(addItem(tLastID = 115, "Wheaty Juice", "Is this liquefied Bread or what?", new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L))); + ItemList.Bottle_Scotch.set(addItem(tLastID = 116, "Scotch", "Technically this is just a Whisky", SubTag.INVISIBLE, new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 400, 0, 60, Potion.resistance.id, 400, 1, 60, Potion.poison.id, 200, 1, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L))); + ItemList.Bottle_Glen_McKenner.set(addItem(tLastID = 117, "Glen McKenner", "Don't hand to easily surprised people, they will shatter it.", SubTag.INVISIBLE, new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 400, 1, 90, Potion.resistance.id, 400, 2, 90, Potion.poison.id, 200, 2, 10, Potion.harm.id, 0, 2, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 2L))); + ItemList.Bottle_Wheaty_Hops_Juice.set(addItem(tLastID = 118, "Wheaty Hops Juice", "Also known as 'Duff-Lite'", new GT_FoodStat(1, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 2L))); + ItemList.Bottle_Beer.set(addItem(tLastID = 119, "Beer", "Good old Beer", new GT_FoodStat(6, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 400, 0, 60, Potion.digSpeed.id, 400, 2, 60, Potion.poison.id, 100, 0, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L))); + ItemList.Bottle_Chilly_Sauce.set(addItem(tLastID = 120, "Chilly Sauce", "Spicy", new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 1000, 0, 10, Potion.fireResistance.id, 1000, 0, 60), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Bottle_Hot_Sauce.set(addItem(tLastID = 121, "Hot Sauce", "Very Spicy, I guess?", new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 2000, 0, 30, Potion.fireResistance.id, 2000, 0, 70), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 2L))); + ItemList.Bottle_Diabolo_Sauce.set(addItem(tLastID = 122, "Diabolo Sauce", "As if the Devil made this Sauce", SubTag.INVISIBLE, new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 3000, 1, 50, Potion.fireResistance.id, 3000, 0, 80), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 3L))); + ItemList.Bottle_Diablo_Sauce.set(addItem(tLastID = 123, "Diablo Sauce", "Diablo always comes back!", SubTag.INVISIBLE, new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 4000, 1, 70, Potion.fireResistance.id, 4000, 0, 90), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 4L))); + ItemList.Bottle_Snitches_Glitch_Sauce.set(addItem(tLastID = 124, "Old Man Snitches glitched Diablo Sauce", "[Missing No]", SubTag.INVISIBLE, new GT_FoodStat(2, 0.1F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 9999, 2, 999, Potion.fireResistance.id, 9999, 9, 999), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 5L))); + ItemList.Bottle_Apple_Juice.set(addItem(tLastID = 125, "Apple Juice", "Made of the Apples from our best Oak Farms", new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.hunger.id, 400, 0, 20), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); + ItemList.Bottle_Cider.set(addItem(tLastID = 126, "Cider", "If you have nothing better to do with your Apples", new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 400, 0, 60, Potion.resistance.id, 400, 1, 60, Potion.poison.id, 200, 1, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L))); + ItemList.Bottle_Golden_Apple_Juice.set(addItem(tLastID = 127, "Golden Apple Juice", "A golden Apple in liquid form", SubTag.INVISIBLE, new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.hunger.id, 400, 0, 20, Potion.field_76444_x.id, 2400, 0, 100, Potion.regeneration.id, 100, 1, 100), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); + ItemList.Bottle_Golden_Cider.set(addItem(tLastID = 128, "Golden Cider", "More Resistance, less Regeneration", SubTag.INVISIBLE, new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.confusion.id, 400, 0, 60, Potion.field_76444_x.id, 2400, 1, 95, Potion.poison.id, 200, 1, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L))); + ItemList.Bottle_Iduns_Apple_Juice.set(addItem(tLastID = 129, "Idun's Apple Juice", "So you got the Idea of using Notch Apples for a drink?", SubTag.INVISIBLE, new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.regeneration.id, 600, 4, 100, Potion.field_76444_x.id, 2400, 0, 100, Potion.resistance.id, 6000, 0, 100, Potion.fireResistance.id, 6000, 0, 100), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 9L))); + ItemList.Bottle_Notches_Brew.set(addItem(tLastID = 130, "Notches Brew", "This is just overpowered", SubTag.INVISIBLE, new GT_FoodStat(4, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.regeneration.id, 700, 4, 95, Potion.field_76444_x.id, 3000, 1, 95, Potion.resistance.id, 7000, 1, 95, Potion.fireResistance.id, 7000, 0, 95, Potion.harm.id, 0, 2, 20), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 9L))); + ItemList.Bottle_Lemon_Juice.set(addItem(tLastID = 131, "Lemon Juice", "Maybe adding Sugar will make it less sour", new GT_FoodStat(2, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.digSpeed.id, 1200, 0, 60), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L))); + ItemList.Bottle_Limoncello.set(addItem(tLastID = 132, "Limoncello", "An alcoholic Drink which tastes like Lemons", SubTag.INVISIBLE, new GT_FoodStat(2, 0.4F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.digSpeed.id, 1200, 0, 90, Potion.poison.id, 200, 1, 5), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L))); + ItemList.Bottle_Lemonade.set(addItem(tLastID = 133, "Lemonade", "Cold and refreshing Lemonade", new GT_FoodStat(4, 0.3F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.digSpeed.id, 900, 1, 90), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 1L))); + ItemList.Bottle_Alcopops.set(addItem(tLastID = 134, "Alcopops", "Don't let your Children drink this junk!", SubTag.INVISIBLE, new GT_FoodStat(2, 0.2F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.digSpeed.id, 900, 1, 90, Potion.poison.id, 300, 2, 20), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 1L))); + ItemList.Bottle_Cave_Johnsons_Grenade_Juice.set(addItem(tLastID = 135, "Cave Johnson's Grenade Juice", "When life gives you Lemons, make Life take them Lemons back!", SubTag.INVISIBLE, new GT_FoodStat(0, 0.0F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false).setExplosive(), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MORTUUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 1L))); + ItemList.Bottle_Milk.set(addItem(tLastID = 136, "Milk", "Got Milk?", OrePrefixes.bottle.get(Materials.Milk), new GT_FoodStat(0, 0.0F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false).setMilk(), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); + ItemList.Bottle_Holy_Water.set(addItem(tLastID = 137, "Holy Water", "May the holy Planks be with you", OrePrefixes.bottle.get(Materials.HolyWater), new GT_FoodStat(0, 0.0F, EnumAction.drink, ItemList.Bottle_Empty.get(1L), GregTech_API.sDrinksAlwaysDrinkable, false, false, Potion.poison.id, 100, 1, 100).setMilk(), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 1L))); - ItemList.Food_Potato_On_Stick.set(addItem(tLastID = 200, "Potato on a Stick", "Totally looks like a Crab Claw", new Object[]{new GT_FoodStat(1, 0.3F, EnumAction.eat, new ItemStack(Items.stick, 1), false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); - ItemList.Food_Potato_On_Stick_Roasted.set(addItem(tLastID = 201, "Roasted Potato on a Stick", "Still looks like a Crab Claw", new Object[]{new GT_FoodStat(6, 0.6F, EnumAction.eat, new ItemStack(Items.stick, 1), false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Raw_Fries.set(addItem(tLastID = 202, "Potato Strips", "It's Potato in Stripe Form", new Object[]{new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)})); + ItemList.Food_Potato_On_Stick.set(addItem(tLastID = 200, "Potato on a Stick", "Totally looks like a Crab Claw", new GT_FoodStat(1, 0.3F, EnumAction.eat, new ItemStack(Items.stick, 1), false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); + ItemList.Food_Potato_On_Stick_Roasted.set(addItem(tLastID = 201, "Roasted Potato on a Stick", "Still looks like a Crab Claw", new GT_FoodStat(6, 0.6F, EnumAction.eat, new ItemStack(Items.stick, 1), false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Raw_Fries.set(addItem(tLastID = 202, "Potato Strips", "It's Potato in Stripe Form", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 16L); - ItemList.Food_Fries.set(addItem(tLastID = 203, "Fries", "Not to confuse with Fry the Delivery Boy", new Object[]{new GT_FoodStat(7, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_Fries.set(addItem(tLastID = 203, "Fries", "Not to confuse with Fry the Delivery Boy", new GT_FoodStat(7, 0.5F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 16L); - ItemList.Food_Packaged_Fries.set(addItem(tLastID = 204, "Fries", "Ketchup not included", new Object[]{new GT_FoodStat(7, 0.5F, EnumAction.eat, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 1L), false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Raw_PotatoChips.set(addItem(tLastID = 205, "Potato Chips (Raw)", "Just like a Potato", new Object[]{new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)})); + ItemList.Food_Packaged_Fries.set(addItem(tLastID = 204, "Fries", "Ketchup not included", new GT_FoodStat(7, 0.5F, EnumAction.eat, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 1L), false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Raw_PotatoChips.set(addItem(tLastID = 205, "Potato Chips (Raw)", "Just like a Potato", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 16L); - ItemList.Food_PotatoChips.set(addItem(tLastID = 206, "Potato Chips", "Crunchy", new Object[]{new GT_FoodStat(7, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_PotatoChips.set(addItem(tLastID = 206, "Potato Chips", "Crunchy", new GT_FoodStat(7, 0.5F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 16L); - ItemList.Food_ChiliChips.set(addItem(tLastID = 207, "Chili Chips", "Spicy", new Object[]{new GT_FoodStat(7, 0.6F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_ChiliChips.set(addItem(tLastID = 207, "Chili Chips", "Spicy", new GT_FoodStat(7, 0.6F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 16L); - ItemList.Food_Packaged_PotatoChips.set(addItem(tLastID = 208, "Bag of Potato Chips", "Full of delicious Air", new Object[]{new GT_FoodStat(7, 0.5F, EnumAction.eat, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1L), false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Packaged_ChiliChips.set(addItem(tLastID = 209, "Bag of Chili Chips", "Stop making noises Baj!", new Object[]{new GT_FoodStat(7, 0.6F, EnumAction.eat, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1L), false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Chum.set(addItem(tLastID = 210, "Chum", "Chum is Fum!", new Object[]{new GT_FoodStat(5, 0.2F, EnumAction.eat, null, true, false, true, new int[]{Potion.hunger.id, 1000, 4, 100, Potion.confusion.id, 300, 1, 80}), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Chum_On_Stick.set(addItem(tLastID = 211, "Chum on a Stick", "Don't forget to try our Chum-balaya", new Object[]{new GT_FoodStat(5, 0.2F, EnumAction.eat, new ItemStack(Items.stick, 1), true, false, true, new int[]{Potion.hunger.id, 1000, 4, 100, Potion.confusion.id, 300, 1, 80}), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Dough_Sugar.set(addItem(tLastID = 212, "Sugary Dough", "Don't eat the Dough before it is baken", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Food_Dough_Chocolate.set(addItem(tLastID = 213, "Chocolate Dough", "I said don't eat the Dough!", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Food_Raw_Cookie.set(addItem(tLastID = 214, "Cookie shaped Dough", "For baking Cookies", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - - ItemList.Food_Sliced_Buns.set(addItem(tLastID = 220, "Buns", "Pre Sliced", new Object[]{new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Burger_Veggie.set(addItem(tLastID = 221, "Veggieburger", "No matter how you call this, this is NOT a Burger!", new Object[]{new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Burger_Cheese.set(addItem(tLastID = 222, "Cheeseburger", "Cheesy!", new Object[]{new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new ItemData(Materials.Cheese, 907200L, new MaterialStack[0])})); - ItemList.Food_Burger_Meat.set(addItem(tLastID = 223, "Hamburger", "The Mc Burger Queen Burger", new Object[]{new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Burger_Chum.set(addItem(tLastID = 224, "Chumburger", "Fum is Chum!", new Object[]{new GT_FoodStat(5, 0.2F, EnumAction.eat, null, true, false, true, new int[]{Potion.hunger.id, 1000, 4, 100, Potion.confusion.id, 300, 1, 80}), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - - ItemList.Food_Sliced_Breads.set(addItem(tLastID = 230, "Breads", "Pre Sliced", new Object[]{new GT_FoodStat(5, 0.6F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Sandwich_Veggie.set(addItem(tLastID = 231, "Veggie Sandwich", "Meatless", new Object[]{new GT_FoodStat(7, 0.6F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_Packaged_PotatoChips.set(addItem(tLastID = 208, "Bag of Potato Chips", "Full of delicious Air", new GT_FoodStat(7, 0.5F, EnumAction.eat, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1L), false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Packaged_ChiliChips.set(addItem(tLastID = 209, "Bag of Chili Chips", "Stop making noises Baj!", new GT_FoodStat(7, 0.6F, EnumAction.eat, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 1L), false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Chum.set(addItem(tLastID = 210, "Chum", "Chum is Fum!", new GT_FoodStat(5, 0.2F, EnumAction.eat, null, true, false, true, Potion.hunger.id, 1000, 4, 100, Potion.confusion.id, 300, 1, 80), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Chum_On_Stick.set(addItem(tLastID = 211, "Chum on a Stick", "Don't forget to try our Chum-balaya", new GT_FoodStat(5, 0.2F, EnumAction.eat, new ItemStack(Items.stick, 1), true, false, true, Potion.hunger.id, 1000, 4, 100, Potion.confusion.id, 300, 1, 80), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Dough_Sugar.set(addItem(tLastID = 212, "Sugary Dough", "Don't eat the Dough before it is baken", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Food_Dough_Chocolate.set(addItem(tLastID = 213, "Chocolate Dough", "I said don't eat the Dough!", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Food_Raw_Cookie.set(addItem(tLastID = 214, "Cookie shaped Dough", "For baking Cookies", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + + ItemList.Food_Sliced_Buns.set(addItem(tLastID = 220, "Buns", "Pre Sliced", new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Burger_Veggie.set(addItem(tLastID = 221, "Veggieburger", "No matter how you call this, this is NOT a Burger!", new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Burger_Cheese.set(addItem(tLastID = 222, "Cheeseburger", "Cheesy!", new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new ItemData(Materials.Cheese, 907200L))); + ItemList.Food_Burger_Meat.set(addItem(tLastID = 223, "Hamburger", "The Mc Burger Queen Burger", new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Burger_Chum.set(addItem(tLastID = 224, "Chumburger", "Fum is Chum!", new GT_FoodStat(5, 0.2F, EnumAction.eat, null, true, false, true, Potion.hunger.id, 1000, 4, 100, Potion.confusion.id, 300, 1, 80), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + + ItemList.Food_Sliced_Breads.set(addItem(tLastID = 230, "Breads", "Pre Sliced", new GT_FoodStat(5, 0.6F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Sandwich_Veggie.set(addItem(tLastID = 231, "Veggie Sandwich", "Meatless", new GT_FoodStat(7, 0.6F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 32L); - ItemList.Food_Sandwich_Cheese.set(addItem(tLastID = 232, "Cheese Sandwich", "Say Cheese!", new Object[]{new GT_FoodStat(7, 0.6F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_Sandwich_Cheese.set(addItem(tLastID = 232, "Cheese Sandwich", "Say Cheese!", new GT_FoodStat(7, 0.6F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 32L); - ItemList.Food_Sandwich_Bacon.set(addItem(tLastID = 233, "Bacon Sandwich", "The best Sandwich ever!", new Object[]{new GT_FoodStat(10, 0.8F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_Sandwich_Bacon.set(addItem(tLastID = 233, "Bacon Sandwich", "The best Sandwich ever!", new GT_FoodStat(10, 0.8F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 32L); - ItemList.Food_Sandwich_Steak.set(addItem(tLastID = 234, "Steak Sandwich", "Not a 'Steam Sandwich'", new Object[]{new GT_FoodStat(10, 0.8F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_Sandwich_Steak.set(addItem(tLastID = 234, "Steak Sandwich", "Not a 'Steam Sandwich'", new GT_FoodStat(10, 0.8F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 32L); - ItemList.Food_Sliced_Baguettes.set(addItem(tLastID = 240, "Baguettes", "Pre Sliced", new Object[]{new GT_FoodStat(8, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Large_Sandwich_Veggie.set(addItem(tLastID = 241, "Large Veggie Sandwich", "Just not worth it", new Object[]{new GT_FoodStat(15, 0.8F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_Sliced_Baguettes.set(addItem(tLastID = 240, "Baguettes", "Pre Sliced", new GT_FoodStat(8, 0.5F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Large_Sandwich_Veggie.set(addItem(tLastID = 241, "Large Veggie Sandwich", "Just not worth it", new GT_FoodStat(15, 0.8F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 16L); - ItemList.Food_Large_Sandwich_Cheese.set(addItem(tLastID = 242, "Large Cheese Sandwich", "I need another cheesy tooltip for this", new Object[]{new GT_FoodStat(15, 0.8F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_Large_Sandwich_Cheese.set(addItem(tLastID = 242, "Large Cheese Sandwich", "I need another cheesy tooltip for this", new GT_FoodStat(15, 0.8F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 16L); - ItemList.Food_Large_Sandwich_Bacon.set(addItem(tLastID = 243, "Large Bacon Sandwich", "For Men! (and manly Women)", new Object[]{new GT_FoodStat(20, 1.0F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_Large_Sandwich_Bacon.set(addItem(tLastID = 243, "Large Bacon Sandwich", "For Men! (and manly Women)", new GT_FoodStat(20, 1.0F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 16L); - ItemList.Food_Large_Sandwich_Steak.set(addItem(tLastID = 244, "Large Steak Sandwich", "Yes, I once accidentially called it 'Steam Sandwich'", new Object[]{new GT_FoodStat(20, 1.0F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_Large_Sandwich_Steak.set(addItem(tLastID = 244, "Large Steak Sandwich", "Yes, I once accidentially called it 'Steam Sandwich'", new GT_FoodStat(20, 1.0F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); setFluidContainerStats(32000 + tLastID, 0L, 16L); - ItemList.Food_Raw_Pizza_Veggie.set(addItem(tLastID = 250, "Raw Veggie Pizza", "Into the Oven with it!", new Object[]{new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Raw_Pizza_Cheese.set(addItem(tLastID = 251, "Raw Cheese Pizza", "Into the Oven with it!", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Raw_Pizza_Meat.set(addItem(tLastID = 252, "Raw Mince Meat Pizza", "Into the Oven with it!", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_Raw_Pizza_Veggie.set(addItem(tLastID = 250, "Raw Veggie Pizza", "Into the Oven with it!", new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Raw_Pizza_Cheese.set(addItem(tLastID = 251, "Raw Cheese Pizza", "Into the Oven with it!", new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Raw_Pizza_Meat.set(addItem(tLastID = 252, "Raw Mince Meat Pizza", "Into the Oven with it!", new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - ItemList.Food_Baked_Pizza_Veggie.set(addItem(tLastID = 260, "Veggie Pizza", "The next they want is Gluten Free Pizzas...", new Object[]{new GT_FoodStat(3, 0.3F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Baked_Pizza_Cheese.set(addItem(tLastID = 261, "Cheese Pizza", "Pizza Magarita", new Object[]{new GT_FoodStat(4, 0.4F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Baked_Pizza_Meat.set(addItem(tLastID = 262, "Mince Meat Pizza", "Emo Pizza, it cuts itself!", new Object[]{new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); + ItemList.Food_Baked_Pizza_Veggie.set(addItem(tLastID = 260, "Veggie Pizza", "The next they want is Gluten Free Pizzas...", new GT_FoodStat(3, 0.3F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Baked_Pizza_Cheese.set(addItem(tLastID = 261, "Cheese Pizza", "Pizza Magarita", new GT_FoodStat(4, 0.4F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Baked_Pizza_Meat.set(addItem(tLastID = 262, "Mince Meat Pizza", "Emo Pizza, it cuts itself!", new GT_FoodStat(5, 0.5F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); - ItemList.Dye_Indigo.set(addItem(tLastID = 410, "Indigo Dye", "Blue Dye", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L), Dyes.dyeBlue})); + ItemList.Dye_Indigo.set(addItem(tLastID = 410, "Indigo Dye", "Blue Dye", new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L), Dyes.dyeBlue)); for (byte i = 0; i < 16; i = (byte) (i + 1)) { - ItemList.DYE_ONLY_ITEMS[i].set(addItem(tLastID = 414 + i, Dyes.get(i).mName + " Dye", "", new Object[]{Dyes.get(i).name(), new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L)})); + ItemList.DYE_ONLY_ITEMS[i].set(addItem(tLastID = 414 + i, Dyes.get(i).mName + " Dye", "", Dyes.get(i).name(), new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L))); } - ItemList.Plank_Oak.set(addItem(tLastID = 470, "Oak Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Oak.set(addItem(tLastID = 470, "Oak Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Spruce.set(addItem(tLastID = 471, "Spruce Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Spruce.set(addItem(tLastID = 471, "Spruce Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Birch.set(addItem(tLastID = 472, "Birch Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Birch.set(addItem(tLastID = 472, "Birch Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Jungle.set(addItem(tLastID = 473, "Jungle Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Jungle.set(addItem(tLastID = 473, "Jungle Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Acacia.set(addItem(tLastID = 474, "Acacia Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Acacia.set(addItem(tLastID = 474, "Acacia Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_DarkOak.set(addItem(tLastID = 475, "Dark Oak Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_DarkOak.set(addItem(tLastID = 475, "Dark Oak Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Larch.set(addItem(tLastID = 476, "Larch Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Larch.set(addItem(tLastID = 476, "Larch Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Teak.set(addItem(tLastID = 477, "Teak Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Teak.set(addItem(tLastID = 477, "Teak Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Acacia_Green.set(addItem(tLastID = 478, "Green Acacia Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Acacia_Green.set(addItem(tLastID = 478, "Green Acacia Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Lime.set(addItem(tLastID = 479, "Lime Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Lime.set(addItem(tLastID = 479, "Lime Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Chestnut.set(addItem(tLastID = 480, "Chestnut Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Chestnut.set(addItem(tLastID = 480, "Chestnut Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Wenge.set(addItem(tLastID = 481, "Wenge Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Wenge.set(addItem(tLastID = 481, "Wenge Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Baobab.set(addItem(tLastID = 482, "Baobab Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Baobab.set(addItem(tLastID = 482, "Baobab Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Sequoia.set(addItem(tLastID = 483, "Sequoia Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Sequoia.set(addItem(tLastID = 483, "Sequoia Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Kapok.set(addItem(tLastID = 484, "Kapok Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Kapok.set(addItem(tLastID = 484, "Kapok Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Ebony.set(addItem(tLastID = 485, "Ebony Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Ebony.set(addItem(tLastID = 485, "Ebony Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Mahagony.set(addItem(tLastID = 486, "Mahagony Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Mahagony.set(addItem(tLastID = 486, "Mahagony Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Balsa.set(addItem(tLastID = 487, "Balsa Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Balsa.set(addItem(tLastID = 487, "Balsa Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Willow.set(addItem(tLastID = 488, "Willow Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Willow.set(addItem(tLastID = 488, "Willow Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Walnut.set(addItem(tLastID = 489, "Walnut Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Walnut.set(addItem(tLastID = 489, "Walnut Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Greenheart.set(addItem(tLastID = 490, "Greenheart Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Greenheart.set(addItem(tLastID = 490, "Greenheart Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Cherry.set(addItem(tLastID = 491, "Cherry Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Cherry.set(addItem(tLastID = 491, "Cherry Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Mahoe.set(addItem(tLastID = 492, "Mahoe Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Mahoe.set(addItem(tLastID = 492, "Mahoe Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Poplar.set(addItem(tLastID = 493, "Poplar Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Poplar.set(addItem(tLastID = 493, "Poplar Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Palm.set(addItem(tLastID = 494, "Palm Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Palm.set(addItem(tLastID = 494, "Palm Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Papaya.set(addItem(tLastID = 495, "Papaya Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Papaya.set(addItem(tLastID = 495, "Papaya Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Pine.set(addItem(tLastID = 496, "Pine Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Pine.set(addItem(tLastID = 496, "Pine Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Plum.set(addItem(tLastID = 497, "Plum Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Plum.set(addItem(tLastID = 497, "Plum Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Maple.set(addItem(tLastID = 498, "Maple Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Maple.set(addItem(tLastID = 498, "Maple Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.Plank_Citrus.set(addItem(tLastID = 499, "Citrus Plank", aTextCover, new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + ItemList.Plank_Citrus.set(addItem(tLastID = 499, "Citrus Plank", aTextCover, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 75); - ItemList.SFMixture.set(addItem(tLastID = 270, "Super Fuel Binder", "Raw Material", new Object[]{})); - ItemList.MSFMixture.set(addItem(tLastID = 271, "Magic Super Fuel Binder", "Raw Material", new Object[]{})); + ItemList.SFMixture.set(addItem(tLastID = 270, "Super Fuel Binder", "Raw Material")); + ItemList.MSFMixture.set(addItem(tLastID = 271, "Magic Super Fuel Binder", "Raw Material")); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Oak.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 0)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Spruce.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Birch.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 2)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Jungle.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 3)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Acacia.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 4)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_DarkOak.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 5)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Larch.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 0)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Teak.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Acacia_Green.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 2)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Lime.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 3)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Chestnut.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 4)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Wenge.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 5)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Baobab.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 6)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Sequoia.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 7)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Kapok.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 0)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Ebony.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Mahagony.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 2)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Balsa.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 3)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Willow.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 4)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Walnut.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 5)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Greenheart.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 6)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Cherry.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 7)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Mahoe.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 0)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Poplar.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 1)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Palm.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 2)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Papaya.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 3)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Pine.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 4)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Plum.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 5)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Maple.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 6)}); - GT_ModHandler.addCraftingRecipe(ItemList.Plank_Citrus.get(2L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 7)}); - - GregTech_API.registerCover(ItemList.Plank_Oak.get(1L, new Object[0]), new GT_CopiedBlockTexture(Blocks.planks, 0, 0), null); - GregTech_API.registerCover(ItemList.Plank_Spruce.get(1L, new Object[0]), new GT_CopiedBlockTexture(Blocks.planks, 0, 1), null); - GregTech_API.registerCover(ItemList.Plank_Birch.get(1L, new Object[0]), new GT_CopiedBlockTexture(Blocks.planks, 0, 2), null); - GregTech_API.registerCover(ItemList.Plank_Jungle.get(1L, new Object[0]), new GT_CopiedBlockTexture(Blocks.planks, 0, 3), null); - GregTech_API.registerCover(ItemList.Plank_Acacia.get(1L, new Object[0]), new GT_CopiedBlockTexture(Blocks.planks, 0, 4), null); - GregTech_API.registerCover(ItemList.Plank_DarkOak.get(1L, new Object[0]), new GT_CopiedBlockTexture(Blocks.planks, 0, 5), null); - GregTech_API.registerCover(ItemList.Plank_Larch.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 0, new ItemStack(Blocks.planks, 1, 0))), 0, 0), null); - GregTech_API.registerCover(ItemList.Plank_Teak.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 1, new ItemStack(Blocks.planks, 1, 0))), 0, 1), null); - GregTech_API.registerCover(ItemList.Plank_Acacia_Green.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 2, new ItemStack(Blocks.planks, 1, 0))), 0, 2), null); - GregTech_API.registerCover(ItemList.Plank_Lime.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 3, new ItemStack(Blocks.planks, 1, 0))), 0, 3), null); - GregTech_API.registerCover(ItemList.Plank_Chestnut.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 4, new ItemStack(Blocks.planks, 1, 0))), 0, 4), null); - GregTech_API.registerCover(ItemList.Plank_Wenge.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 5, new ItemStack(Blocks.planks, 1, 0))), 0, 5), null); - GregTech_API.registerCover(ItemList.Plank_Baobab.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 6, new ItemStack(Blocks.planks, 1, 0))), 0, 6), null); - GregTech_API.registerCover(ItemList.Plank_Sequoia.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 7, new ItemStack(Blocks.planks, 1, 0))), 0, 7), null); - GregTech_API.registerCover(ItemList.Plank_Kapok.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 8, new ItemStack(Blocks.planks, 1, 0))), 0, 8), null); - GregTech_API.registerCover(ItemList.Plank_Ebony.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 9, new ItemStack(Blocks.planks, 1, 0))), 0, 9), null); - GregTech_API.registerCover(ItemList.Plank_Mahagony.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 10, new ItemStack(Blocks.planks, 1, 0))), 0, 10), null); - GregTech_API.registerCover(ItemList.Plank_Balsa.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 11, new ItemStack(Blocks.planks, 1, 0))), 0, 11), null); - GregTech_API.registerCover(ItemList.Plank_Willow.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 12, new ItemStack(Blocks.planks, 1, 0))), 0, 12), null); - GregTech_API.registerCover(ItemList.Plank_Walnut.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 13, new ItemStack(Blocks.planks, 1, 0))), 0, 13), null); - GregTech_API.registerCover(ItemList.Plank_Greenheart.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 14, new ItemStack(Blocks.planks, 1, 0))), 0, 14), null); - GregTech_API.registerCover(ItemList.Plank_Cherry.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 15, new ItemStack(Blocks.planks, 1, 0))), 0, 15), null); - GregTech_API.registerCover(ItemList.Plank_Mahoe.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 16, new ItemStack(Blocks.planks, 1, 0))), 0, 0), null); - GregTech_API.registerCover(ItemList.Plank_Poplar.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 17, new ItemStack(Blocks.planks, 1, 0))), 0, 1), null); - GregTech_API.registerCover(ItemList.Plank_Palm.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 18, new ItemStack(Blocks.planks, 1, 0))), 0, 2), null); - GregTech_API.registerCover(ItemList.Plank_Papaya.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 19, new ItemStack(Blocks.planks, 1, 0))), 0, 3), null); - GregTech_API.registerCover(ItemList.Plank_Pine.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 20, new ItemStack(Blocks.planks, 1, 0))), 0, 4), null); - GregTech_API.registerCover(ItemList.Plank_Plum.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 21, new ItemStack(Blocks.planks, 1, 0))), 0, 5), null); - GregTech_API.registerCover(ItemList.Plank_Maple.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 22, new ItemStack(Blocks.planks, 1, 0))), 0, 6), null); - GregTech_API.registerCover(ItemList.Plank_Citrus.get(1L, new Object[0]), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 23, new ItemStack(Blocks.planks, 1, 0))), 0, 7), null); - - ItemList.Crop_Drop_Plumbilia.set(addItem(tLastID = 500, "Plumbilia Leaf", "Source of Lead", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L)})); - ItemList.Crop_Drop_Argentia.set(addItem(tLastID = 501, "Argentia Leaf", "Source of Silver", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)})); - ItemList.Crop_Drop_Indigo.set(addItem(tLastID = 502, "Indigo Blossom", "Used for making Blue Dye", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L)})); - ItemList.Crop_Drop_Ferru.set(addItem(tLastID = 503, "Ferru Leaf", "Source of Iron", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L)})); - ItemList.Crop_Drop_Aurelia.set(addItem(tLastID = 504, "Aurelia Leaf", "Source of Gold", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)})); - ItemList.Crop_Drop_TeaLeaf.set(addItem(tLastID = 505, "Tea Leaf", "Source of Tea", new Object[]{"cropTea", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)})); - - ItemList.Crop_Drop_OilBerry.set(addItem(tLastID = 510, "Oil Berry", "Oil in Berry form", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)})); - ItemList.Crop_Drop_BobsYerUncleRanks.set(addItem(tLastID = 511, "Bobs-Yer-Uncle-Berry", "Source of Emeralds", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)})); - ItemList.Crop_Drop_UUMBerry.set(addItem(tLastID = 512, "UUM Berry", "UUM in Berry form", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)})); - ItemList.Crop_Drop_UUABerry.set(addItem(tLastID = 513, "UUA Berry", "UUA in Berry form", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)})); - - ItemList.Crop_Drop_MilkWart.set(addItem(tLastID = 520, "Milk Wart", "Source of Milk", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L)})); - - ItemList.Crop_Drop_Coppon.set(addItem(tLastID = 530, "Coppon Fiber", "ORANGE WOOOOOOOL!!!", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1L)})); - - ItemList.Crop_Drop_Tine.set(addItem(tLastID = 540, "Tine Twig", "Source of Tin", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L)})); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Oak.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 0)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Spruce.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Birch.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 2)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Jungle.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 3)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Acacia.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 4)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_DarkOak.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', new ItemStack(Blocks.wooden_slab, 1, 5)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Larch.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 0)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Teak.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Acacia_Green.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 2)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Lime.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 3)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Chestnut.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 4)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Wenge.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 5)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Baobab.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 6)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Sequoia.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs1", 1L, 7)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Kapok.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 0)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Ebony.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Mahagony.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 2)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Balsa.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 3)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Willow.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 4)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Walnut.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 5)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Greenheart.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 6)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Cherry.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs2", 1L, 7)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Mahoe.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 0)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Poplar.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 1)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Palm.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 2)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Papaya.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 3)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Pine.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 4)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Plum.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 5)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Maple.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 6)}); + GT_ModHandler.addCraftingRecipe(ItemList.Plank_Citrus.get(2L), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"s ", " P", 'P', GT_ModHandler.getModItem(aTextForestry, "slabs3", 1L, 7)}); + + GregTech_API.registerCover(ItemList.Plank_Oak.get(1L), new GT_CopiedBlockTexture(Blocks.planks, 0, 0), null); + GregTech_API.registerCover(ItemList.Plank_Spruce.get(1L), new GT_CopiedBlockTexture(Blocks.planks, 0, 1), null); + GregTech_API.registerCover(ItemList.Plank_Birch.get(1L), new GT_CopiedBlockTexture(Blocks.planks, 0, 2), null); + GregTech_API.registerCover(ItemList.Plank_Jungle.get(1L), new GT_CopiedBlockTexture(Blocks.planks, 0, 3), null); + GregTech_API.registerCover(ItemList.Plank_Acacia.get(1L), new GT_CopiedBlockTexture(Blocks.planks, 0, 4), null); + GregTech_API.registerCover(ItemList.Plank_DarkOak.get(1L), new GT_CopiedBlockTexture(Blocks.planks, 0, 5), null); + GregTech_API.registerCover(ItemList.Plank_Larch.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 0, new ItemStack(Blocks.planks, 1, 0))), 0, 0), null); + GregTech_API.registerCover(ItemList.Plank_Teak.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 1, new ItemStack(Blocks.planks, 1, 0))), 0, 1), null); + GregTech_API.registerCover(ItemList.Plank_Acacia_Green.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 2, new ItemStack(Blocks.planks, 1, 0))), 0, 2), null); + GregTech_API.registerCover(ItemList.Plank_Lime.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 3, new ItemStack(Blocks.planks, 1, 0))), 0, 3), null); + GregTech_API.registerCover(ItemList.Plank_Chestnut.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 4, new ItemStack(Blocks.planks, 1, 0))), 0, 4), null); + GregTech_API.registerCover(ItemList.Plank_Wenge.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 5, new ItemStack(Blocks.planks, 1, 0))), 0, 5), null); + GregTech_API.registerCover(ItemList.Plank_Baobab.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 6, new ItemStack(Blocks.planks, 1, 0))), 0, 6), null); + GregTech_API.registerCover(ItemList.Plank_Sequoia.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 7, new ItemStack(Blocks.planks, 1, 0))), 0, 7), null); + GregTech_API.registerCover(ItemList.Plank_Kapok.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 8, new ItemStack(Blocks.planks, 1, 0))), 0, 8), null); + GregTech_API.registerCover(ItemList.Plank_Ebony.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 9, new ItemStack(Blocks.planks, 1, 0))), 0, 9), null); + GregTech_API.registerCover(ItemList.Plank_Mahagony.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 10, new ItemStack(Blocks.planks, 1, 0))), 0, 10), null); + GregTech_API.registerCover(ItemList.Plank_Balsa.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 11, new ItemStack(Blocks.planks, 1, 0))), 0, 11), null); + GregTech_API.registerCover(ItemList.Plank_Willow.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 12, new ItemStack(Blocks.planks, 1, 0))), 0, 12), null); + GregTech_API.registerCover(ItemList.Plank_Walnut.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 13, new ItemStack(Blocks.planks, 1, 0))), 0, 13), null); + GregTech_API.registerCover(ItemList.Plank_Greenheart.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 14, new ItemStack(Blocks.planks, 1, 0))), 0, 14), null); + GregTech_API.registerCover(ItemList.Plank_Cherry.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 15, new ItemStack(Blocks.planks, 1, 0))), 0, 15), null); + GregTech_API.registerCover(ItemList.Plank_Mahoe.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 16, new ItemStack(Blocks.planks, 1, 0))), 0, 0), null); + GregTech_API.registerCover(ItemList.Plank_Poplar.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 17, new ItemStack(Blocks.planks, 1, 0))), 0, 1), null); + GregTech_API.registerCover(ItemList.Plank_Palm.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 18, new ItemStack(Blocks.planks, 1, 0))), 0, 2), null); + GregTech_API.registerCover(ItemList.Plank_Papaya.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 19, new ItemStack(Blocks.planks, 1, 0))), 0, 3), null); + GregTech_API.registerCover(ItemList.Plank_Pine.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 20, new ItemStack(Blocks.planks, 1, 0))), 0, 4), null); + GregTech_API.registerCover(ItemList.Plank_Plum.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 21, new ItemStack(Blocks.planks, 1, 0))), 0, 5), null); + GregTech_API.registerCover(ItemList.Plank_Maple.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 22, new ItemStack(Blocks.planks, 1, 0))), 0, 6), null); + GregTech_API.registerCover(ItemList.Plank_Citrus.get(1L), new GT_CopiedBlockTexture(GT_Utility.getBlockFromStack(GT_ModHandler.getModItem(aTextForestry, "planks", 1L, 23, new ItemStack(Blocks.planks, 1, 0))), 0, 7), null); + + ItemList.Crop_Drop_Plumbilia.set(addItem(tLastID = 500, "Plumbilia Leaf", "Source of Lead", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 1L))); + ItemList.Crop_Drop_Argentia.set(addItem(tLastID = 501, "Argentia Leaf", "Source of Silver", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); + ItemList.Crop_Drop_Indigo.set(addItem(tLastID = 502, "Indigo Blossom", "Used for making Blue Dye", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 1L))); + ItemList.Crop_Drop_Ferru.set(addItem(tLastID = 503, "Ferru Leaf", "Source of Iron", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L))); + ItemList.Crop_Drop_Aurelia.set(addItem(tLastID = 504, "Aurelia Leaf", "Source of Gold", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); + ItemList.Crop_Drop_TeaLeaf.set(addItem(tLastID = 505, "Tea Leaf", "Source of Tea", "cropTea", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); + + ItemList.Crop_Drop_OilBerry.set(addItem(tLastID = 510, "Oil Berry", "Oil in Berry form", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L))); + ItemList.Crop_Drop_BobsYerUncleRanks.set(addItem(tLastID = 511, "Bobs-Yer-Uncle-Berry", "Source of Emeralds", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); + ItemList.Crop_Drop_UUMBerry.set(addItem(tLastID = 512, "UUM Berry", "UUM in Berry form", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L))); + ItemList.Crop_Drop_UUABerry.set(addItem(tLastID = 513, "UUA Berry", "UUA in Berry form", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L))); + + ItemList.Crop_Drop_MilkWart.set(addItem(tLastID = 520, "Milk Wart", "Source of Milk", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 1L))); + + ItemList.Crop_Drop_Coppon.set(addItem(tLastID = 530, "Coppon Fiber", "ORANGE WOOOOOOOL!!!", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 1L))); + + ItemList.Crop_Drop_Tine.set(addItem(tLastID = 540, "Tine Twig", "Source of Tin", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); setBurnValue(32000 + tLastID, 100); - ItemList.Crop_Drop_Bauxite.set(addItem(tLastID = 521, "Bauxia Leaf", "Source of Aluminium", new Object[]{})); - ItemList.Crop_Drop_Ilmenite.set(addItem(tLastID = 522, "Titania Leaf", "Source of Titanium", new Object[]{})); - ItemList.Crop_Drop_Pitchblende.set(addItem(tLastID = 523, "Reactoria Leaf", "Source of Uranium", new Object[]{})); - ItemList.Crop_Drop_Uraninite.set(addItem(tLastID = 524, "Uranium Leaf", "Source of Uranite", new Object[]{})); - ItemList.Crop_Drop_Thorium.set(addItem(tLastID = 526, "Thunder Leaf", "Source of Thorium", new Object[]{})); - ItemList.Crop_Drop_Nickel.set(addItem(tLastID = 527, "Nickelback Leaf", "Source of Nickel", new Object[]{})); - ItemList.Crop_Drop_Zinc.set(addItem(tLastID = 528, "Galvania Leaf", "Source of Zinc", new Object[]{})); - ItemList.Crop_Drop_Manganese.set(addItem(tLastID = 529, "Pyrolusium Leaf", "Source of Manganese", new Object[]{})); - ItemList.Crop_Drop_Scheelite.set(addItem(tLastID = 531, "Scheelinium Leaf", "Source of Tungsten", new Object[]{})); - ItemList.Crop_Drop_Platinum.set(addItem(tLastID = 532, "Platina Leaf", "Source of Platinum", new Object[]{})); - ItemList.Crop_Drop_Iridium.set(addItem(tLastID = 533, "Quantaria Leaf", "Source of Iridium", new Object[]{})); - ItemList.Crop_Drop_Osmium.set(addItem(tLastID = 534, "Quantaria Leaf", "Source of Osmium", new Object[]{})); - ItemList.Crop_Drop_Naquadah.set(addItem(tLastID = 535, "Stargatium Leaf", "Source of Naquadah", new Object[]{})); - - ItemList.Crop_Drop_Chilly.set(addItem(tLastID = 550, "Chilly Pepper", "It is red and hot", new Object[]{"cropChilipepper", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false, new int[]{Potion.confusion.id, 200, 1, 40}), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Crop_Drop_Lemon.set(addItem(tLastID = 551, "Lemon", "Don't make Lemonade", new Object[]{"cropLemon", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Crop_Drop_Tomato.set(addItem(tLastID = 552, "Tomato", "Solid Ketchup", new Object[]{"cropTomato", new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Crop_Drop_MTomato.set(addItem(tLastID = 553, "Max Tomato", "Full Health in one Tomato", new Object[]{"cropTomato", new GT_FoodStat(9, 1.0F, EnumAction.eat, null, false, true, false, new int[]{Potion.regeneration.id, 100, 100, 100}), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Crop_Drop_Grapes.set(addItem(tLastID = 554, "Grapes", "Source of Wine", new Object[]{"cropGrape", new GT_FoodStat(2, 0.3F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Crop_Drop_Onion.set(addItem(tLastID = 555, "Onion", "Taking over the whole Taste", new Object[]{"cropOnion", new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Crop_Drop_Cucumber.set(addItem(tLastID = 556, "Cucumber", "Not a Sea Cucumber!", new Object[]{"cropCucumber", new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Crop_Drop_Rape.set(addItem(tLastID = 557, "Rape", "Time to oil up!", new Object[]{new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L)})); - - ItemList.Food_Cheese.set(addItem(tLastID = 558, "Cheese", "Click the Cheese", new Object[]{"foodCheese", new GT_FoodStat(3, 0.6F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L)})); - ItemList.Food_Dough.set(addItem(tLastID = 559, "Dough", "For making Breads", new Object[]{"foodDough", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Food_Flat_Dough.set(addItem(tLastID = 560, "Flattened Dough", "For making Pizza", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Food_Raw_Bread.set(addItem(tLastID = 561, "Dough", "In Bread Shape", new Object[]{new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Food_Raw_Bun.set(addItem(tLastID = 562, "Dough", "In Bun Shape", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Food_Raw_Baguette.set(addItem(tLastID = 563, "Dough", "In Baguette Shape", new Object[]{new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Food_Baked_Bun.set(addItem(tLastID = 564, "Bun", "Do not teleport Bread!", new Object[]{new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Baked_Baguette.set(addItem(tLastID = 565, "Baguette", "I teleported nothing BUT Bread!!!", new Object[]{new GT_FoodStat(8, 0.5F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Sliced_Bread.set(addItem(tLastID = 566, "Sliced Bread", "Just half a Bread", new Object[]{new GT_FoodStat(2, 0.3F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Sliced_Bun.set(addItem(tLastID = 567, "Sliced Bun", "Just half a Bun", new Object[]{new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Sliced_Baguette.set(addItem(tLastID = 568, "Sliced Baguette", "Just half a Baguette", new Object[]{new GT_FoodStat(4, 0.3F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L)})); - ItemList.Food_Raw_Cake.set(addItem(tLastID = 569, "Cake Bottom", "For making Cake", new Object[]{new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Food_Baked_Cake.set(addItem(tLastID = 570, "Baked Cake Bottom", "I know I promised you an actual Cake, but well...", new Object[]{new GT_FoodStat(3, 0.3F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); - ItemList.Food_Sliced_Lemon.set(addItem(tLastID = 571, "Lemon Slice", "Ideal to put on your Drink", new Object[]{new GT_FoodStat(1, 0.075F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)})); - ItemList.Food_Sliced_Tomato.set(addItem(tLastID = 572, "Tomato Slice", "Solid Ketchup", new Object[]{new GT_FoodStat(1, 0.05F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)})); - ItemList.Food_Sliced_Onion.set(addItem(tLastID = 573, "Onion Slice", "ONIONS, UNITE!", new Object[]{new GT_FoodStat(1, 0.05F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)})); - ItemList.Food_Sliced_Cucumber.set(addItem(tLastID = 574, "Cucumber Slice", "QUEWWW-CUMMM-BERRR!!!", new Object[]{new GT_FoodStat(1, 0.05F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L)})); - - ItemList.Food_Sliced_Cheese.set(addItem(tLastID = 576, "Cheese Slice", "ALIEN ATTACK!!!, throw the CHEEEEESE!!!", new Object[]{new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false, new int[0]), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L)})); + ItemList.Crop_Drop_Mica.set(addItem(tLastID = 538, "Micadia Twig", "Source of Mica", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.TUTAMEN, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 1L))); + setBurnValue(32000 + tLastID, 240); + + ItemList.Crop_Drop_Bauxite.set(addItem(tLastID = 521, "Bauxia Leaf", "Source of Aluminium")); + ItemList.Crop_Drop_Ilmenite.set(addItem(tLastID = 522, "Titania Leaf", "Source of Titanium")); + ItemList.Crop_Drop_Pitchblende.set(addItem(tLastID = 523, "Reactoria Leaf", "Source of Uranium")); + ItemList.Crop_Drop_Uraninite.set(addItem(tLastID = 524, "Uranium Leaf", "Source of Uranite")); + ItemList.Crop_Drop_Thorium.set(addItem(tLastID = 526, "Thunder Leaf", "Source of Thorium")); + ItemList.Crop_Drop_Nickel.set(addItem(tLastID = 527, "Nickelback Leaf", "Source of Nickel")); + ItemList.Crop_Drop_Zinc.set(addItem(tLastID = 528, "Galvania Leaf", "Source of Zinc")); + ItemList.Crop_Drop_Manganese.set(addItem(tLastID = 529, "Pyrolusium Leaf", "Source of Manganese")); + ItemList.Crop_Drop_Scheelite.set(addItem(tLastID = 531, "Scheelinium Leaf", "Source of Tungsten")); + ItemList.Crop_Drop_Platinum.set(addItem(tLastID = 532, "Platina Leaf", "Source of Platinum")); + ItemList.Crop_Drop_Iridium.set(addItem(tLastID = 533, "Quantaria Leaf", "Source of Iridium")); + ItemList.Crop_Drop_Osmium.set(addItem(tLastID = 534, "Quantaria Leaf", "Source of Osmium")); + ItemList.Crop_Drop_Naquadah.set(addItem(tLastID = 535, "Stargatium Leaf", "Source of Naquadah")); + + ItemList.Crop_Drop_Chilly.set(addItem(tLastID = 550, "Chilly Pepper", "It is red and hot", "cropChilipepper", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false, Potion.confusion.id, 200, 1, 40), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Crop_Drop_Lemon.set(addItem(tLastID = 551, "Lemon", "Don't make Lemonade", "cropLemon", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Crop_Drop_Tomato.set(addItem(tLastID = 552, "Tomato", "Solid Ketchup", "cropTomato", new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Crop_Drop_MTomato.set(addItem(tLastID = 553, "Max Tomato", "Full Health in one Tomato", "cropTomato", new GT_FoodStat(9, 1.0F, EnumAction.eat, null, false, true, false, Potion.regeneration.id, 100, 100, 100), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 3L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Crop_Drop_Grapes.set(addItem(tLastID = 554, "Grapes", "Source of Wine", "cropGrape", new GT_FoodStat(2, 0.3F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Crop_Drop_Onion.set(addItem(tLastID = 555, "Onion", "Taking over the whole Taste", "cropOnion", new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Crop_Drop_Cucumber.set(addItem(tLastID = 556, "Cucumber", "Not a Sea Cucumber!", "cropCucumber", new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Crop_Drop_Rape.set(addItem(tLastID = 557, "Rape", "Time to oil up!", new TC_Aspects.TC_AspectStack(TC_Aspects.MESSIS, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L))); + + ItemList.Food_Cheese.set(addItem(tLastID = 558, "Cheese", "Click the Cheese", "foodCheese", new GT_FoodStat(3, 0.6F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 2L))); + ItemList.Food_Dough.set(addItem(tLastID = 559, "Dough", "For making Breads", "foodDough", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Food_Flat_Dough.set(addItem(tLastID = 560, "Flattened Dough", "For making Pizza", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Food_Raw_Bread.set(addItem(tLastID = 561, "Dough", "In Bread Shape", new GT_FoodStat(1, 0.2F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Food_Raw_Bun.set(addItem(tLastID = 562, "Dough", "In Bun Shape", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Food_Raw_Baguette.set(addItem(tLastID = 563, "Dough", "In Baguette Shape", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Food_Baked_Bun.set(addItem(tLastID = 564, "Bun", "Do not teleport Bread!", new GT_FoodStat(3, 0.5F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Baked_Baguette.set(addItem(tLastID = 565, "Baguette", "I teleported nothing BUT Bread!!!", new GT_FoodStat(8, 0.5F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Sliced_Bread.set(addItem(tLastID = 566, "Sliced Bread", "Just half a Bread", new GT_FoodStat(2, 0.3F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Sliced_Bun.set(addItem(tLastID = 567, "Sliced Bun", "Just half a Bun", new GT_FoodStat(1, 0.3F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Sliced_Baguette.set(addItem(tLastID = 568, "Sliced Baguette", "Just half a Baguette", new GT_FoodStat(4, 0.3F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1L))); + ItemList.Food_Raw_Cake.set(addItem(tLastID = 569, "Cake Bottom", "For making Cake", new GT_FoodStat(2, 0.2F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Food_Baked_Cake.set(addItem(tLastID = 570, "Baked Cake Bottom", "I know I promised you an actual Cake, but well...", new GT_FoodStat(3, 0.3F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); + ItemList.Food_Sliced_Lemon.set(addItem(tLastID = 571, "Lemon Slice", "Ideal to put on your Drink", new GT_FoodStat(1, 0.075F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); + ItemList.Food_Sliced_Tomato.set(addItem(tLastID = 572, "Tomato Slice", "Solid Ketchup", new GT_FoodStat(1, 0.05F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); + ItemList.Food_Sliced_Onion.set(addItem(tLastID = 573, "Onion Slice", "ONIONS, UNITE!", new GT_FoodStat(1, 0.05F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); + ItemList.Food_Sliced_Cucumber.set(addItem(tLastID = 574, "Cucumber Slice", "QUEWWW-CUMMM-BERRR!!!", new GT_FoodStat(1, 0.05F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.HERBA, 1L))); + + ItemList.Food_Sliced_Cheese.set(addItem(tLastID = 576, "Cheese Slice", "ALIEN ATTACK!!!, throw the CHEEEEESE!!!", new GT_FoodStat(1, 0.1F, EnumAction.eat, null, false, true, false), new TC_Aspects.TC_AspectStack(TC_Aspects.FAMES, 1L))); GT_ModHandler.addExtractionRecipe(new ItemStack(Blocks.red_flower, 1, 0), new ItemStack(Items.dye, 2, 1)); GT_ModHandler.addExtractionRecipe(new ItemStack(Blocks.red_flower, 1, 1), new ItemStack(Items.dye, 2, 12)); @@ -351,29 +352,29 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_ModHandler.addExtractionRecipe(new ItemStack(Blocks.double_plant, 1, 1), new ItemStack(Items.dye, 3, 13)); GT_ModHandler.addExtractionRecipe(new ItemStack(Blocks.double_plant, 1, 4), new ItemStack(Items.dye, 3, 1)); GT_ModHandler.addExtractionRecipe(new ItemStack(Blocks.double_plant, 1, 5), new ItemStack(Items.dye, 3, 9)); - GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Plumbilia.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1L)); - GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Argentia.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1L)); - GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Indigo.get(1L, new Object[0]), ItemList.Dye_Indigo.get(1L, new Object[0])); - GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_MilkWart.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L)); - GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Coppon.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1L)); - GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Tine.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L)); - - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Coppon.get(4L, new Object[0]), new ItemStack(Blocks.wool, 1, 1)); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Plumbilia.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0])); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Argentia.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0])); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Indigo.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0])); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Ferru.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0])); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Aurelia.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0])); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_OilBerry.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0])); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_BobsYerUncleRanks.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0])); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Tine.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0])); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Rape.get(4L, new Object[0]), ItemList.IC2_PlantballCompressed.get(1L, new Object[0])); - GT_ModHandler.addCompressionRecipe(new ItemStack(Blocks.red_flower, 8, 32767), ItemList.IC2_PlantballCompressed.get(1L, new Object[0])); - GT_ModHandler.addCompressionRecipe(new ItemStack(Blocks.yellow_flower, 8, 32767), ItemList.IC2_PlantballCompressed.get(1L, new Object[0])); - - GT_ModHandler.addPulverisationRecipe(ItemList.Food_Sliced_Cheese.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cheese, 1L)); - GT_ModHandler.addPulverisationRecipe(ItemList.Dye_Cocoa.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)); - GT_ModHandler.addPulverisationRecipe(ItemList.Crop_Drop_Tine.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)); + GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Plumbilia.get(1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lead, 1L)); + GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Argentia.get(1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1L)); + GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Indigo.get(1L), ItemList.Dye_Indigo.get(1L)); + GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_MilkWart.get(1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L)); + GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Coppon.get(1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Copper, 1L)); + GT_ModHandler.addExtractionRecipe(ItemList.Crop_Drop_Tine.get(1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L)); + + GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Coppon.get(4L), new ItemStack(Blocks.wool, 1, 1)); + GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Plumbilia.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Argentia.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Indigo.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Ferru.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Aurelia.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_OilBerry.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_BobsYerUncleRanks.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Tine.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Rape.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe(new ItemStack(Blocks.red_flower, 8, 32767), ItemList.IC2_PlantballCompressed.get(1L)); + GT_ModHandler.addCompressionRecipe(new ItemStack(Blocks.yellow_flower, 8, 32767), ItemList.IC2_PlantballCompressed.get(1L)); + + GT_ModHandler.addPulverisationRecipe(ItemList.Food_Sliced_Cheese.get(1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Cheese, 1L)); + GT_ModHandler.addPulverisationRecipe(ItemList.Dye_Cocoa.get(1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L)); + GT_ModHandler.addPulverisationRecipe(ItemList.Crop_Drop_Tine.get(1L), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L)); GT_ModHandler.addPulverisationRecipe(new ItemStack(Items.reeds, 1), new ItemStack(Items.sugar, 1), null, 0, false); GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.melon_block, 1, 0), new ItemStack(Items.melon, 8, 0), new ItemStack(Items.melon_seeds, 1), 80, false); GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.pumpkin, 1, 0), new ItemStack(Items.pumpkin_seeds, 4, 0), null, 0, false); @@ -383,15 +384,15 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { GT_ModHandler.addPulverisationRecipe(new ItemStack(Items.stick, 1), GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Wood, 2L), null, 0, false); GT_ModHandler.addPulverisationRecipe(new ItemStack(Blocks.wool, 1, 32767), new ItemStack(Items.string, 2), new ItemStack(Items.string, 1), 50, false); try { - Object tCrop; - GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[13], "mDrop").set(tCrop, ItemList.Crop_Drop_Ferru.get(1L, new Object[0])); - GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[14], "mDrop").set(tCrop, ItemList.Crop_Drop_Aurelia.get(1L, new Object[0])); + ic2.api.crops.CropCard tCrop; + GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[13], "mDrop").set(tCrop, ItemList.Crop_Drop_Ferru.get(1L)); + GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[14], "mDrop").set(tCrop, ItemList.Crop_Drop_Aurelia.get(1L)); } catch (Throwable e) { if (GT_Values.D1) { e.printStackTrace(GT_Log.err); } } - ItemList.Display_ITS_FREE.set(addItem(tLastID = 766, "ITS FREE", "(or at least almost free)", new Object[]{SubTag.INVISIBLE, new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L)})); + ItemList.Display_ITS_FREE.set(addItem(tLastID = 766, "ITS FREE", "(or at least almost free)", SubTag.INVISIBLE, new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1L))); } public boolean onLeftClickEntity(ItemStack aStack, EntityPlayer aPlayer, Entity aEntity) { @@ -471,10 +472,10 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { return null; } if (aDamage < 32100) { - return ItemList.ThermosCan_Empty.get(1L, new Object[0]); + return ItemList.ThermosCan_Empty.get(1L); } if (aDamage < 32200) { - return ItemList.Bottle_Empty.get(1L, new Object[0]); + return ItemList.Bottle_Empty.get(1L); } return null; } diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 8cd1e4dc53..a0f46c1fa1 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -19,6 +19,7 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.common.bees.GT_AlleleBeeSpecies; @@ -132,7 +133,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 0), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STICKY), 0.15f); - beeSpecies.addSpecialty(ItemList.IC2_Resin.get(1, new Object[0]), 0.15f); + beeSpecies.addSpecialty(ItemList.IC2_Resin.get(1), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); } @@ -206,10 +207,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); - beeSpecies.addSpecialty(ItemList.Food_Sliced_Cucumber.get(1, new Object[0]), 0.05f); - beeSpecies.addSpecialty(ItemList.Food_Sliced_Onion.get(1, new Object[0]), 0.05f); - beeSpecies.addSpecialty(ItemList.Food_Sliced_Tomato.get(1, new Object[0]), 0.05f); - beeSpecies.addSpecialty(ItemList.Food_Sliced_Cheese.get(1, new Object[0]), 0.05f); + beeSpecies.addSpecialty(ItemList.Food_Sliced_Cucumber.get(1), 0.05f); + beeSpecies.addSpecialty(ItemList.Food_Sliced_Onion.get(1), 0.05f); + beeSpecies.addSpecialty(ItemList.Food_Sliced_Tomato.get(1), 0.05f); + beeSpecies.addSpecialty(ItemList.Food_Sliced_Cheese.get(1), 0.05f); beeSpecies.addSpecialty(new ItemStack(Items.cooked_porkchop, 1, 0), 0.05f); beeSpecies.addSpecialty(new ItemStack(Items.cooked_beef, 1, 0), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); @@ -288,8 +289,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addProduct(GT_ModHandler.getModItem("ExtraBees", "honeyComb", 1, 9), 0.15f); beeSpecies.addSpecialty(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1), 0.2f); beeSpecies.addSpecialty(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1), 0.2f); - beeSpecies.addSpecialty(ItemList.FR_Fertilizer.get(1, new Object[0]), 0.3f); - beeSpecies.addSpecialty(ItemList.IC2_Fertilizer.get(1, new Object[0]), 0.3f); + beeSpecies.addSpecialty(ItemList.FR_Fertilizer.get(1), 0.3f); + beeSpecies.addSpecialty(ItemList.IC2_Fertilizer.get(1), 0.3f); beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.WARM); } @@ -3134,7 +3135,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { String uid = "gregtech.bee.species" + species; String description = "for.description." + species; String name = "for.bees.species." + lowercaseName; - + GT_LanguageManager.addStringLocalization("for.bees.species." + lowercaseName,species,true); this.branch = branch; this.species = new GT_AlleleBeeSpecies(uid, dominant, name, "GTNH", description, branch.getBranch(), binomial, primary, secondary); @@ -3152,11 +3153,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { protected static IAlleleBeeEffect getEffect(byte modid, String name) { String s; switch(modid) { - case EXTRABEES: s = new StringBuilder().append("extrabees.effect.").append(name).toString();break; - case GENDUSTRY: s = new StringBuilder().append("gendustry.effect.").append(name).toString();break; - case MAGICBEES: s = new StringBuilder().append("magicbees.effect").append(name).toString();break; - case GREGTECH: s = new StringBuilder().append("gregtech.effect").append(name).toString();break; - default: s = new StringBuilder().append("forestry.effect").append(name).toString();break; + case EXTRABEES: s = "extrabees.effect." + name;break; + case GENDUSTRY: s = "gendustry.effect." + name;break; + case MAGICBEES: s = "magicbees.effect" + name;break; + case GREGTECH: s = "gregtech.effect" + name;break; + default: s = "forestry.effect" + name;break; } return (IAlleleBeeEffect) AlleleManager.alleleRegistry.getAllele(s); @@ -3165,11 +3166,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { protected static IAlleleFlowers getFlowers(byte modid, String name) { String s; switch(modid) { - case EXTRABEES: s = new StringBuilder().append("extrabees.flower.").append(name).toString();break; - case GENDUSTRY: s = new StringBuilder().append("gendustry.flower.").append(name).toString();break; - case MAGICBEES: s = new StringBuilder().append("magicbees.flower").append(name).toString();break; - case GREGTECH: s = new StringBuilder().append("gregtech.flower").append(name).toString();break; - default: s = new StringBuilder().append("forestry.flowers").append(name).toString();break; + case EXTRABEES: s = "extrabees.flower." + name;break; + case GENDUSTRY: s = "gendustry.flower." + name;break; + case MAGICBEES: s = "magicbees.flower" + name;break; + case GREGTECH: s = "gregtech.flower" + name;break; + default: s = "forestry.flowers" + name;break; } return (IAlleleFlowers) AlleleManager.alleleRegistry.getAllele(s); @@ -3178,11 +3179,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { protected static IAlleleBeeSpecies getSpecies(byte modid, String name) { String s; switch(modid) { - case EXTRABEES: s = new StringBuilder().append("extrabees.species.").append(name).toString();break; - case GENDUSTRY: s = new StringBuilder().append("gendustry.bee.").append(name).toString();break; - case MAGICBEES: s = new StringBuilder().append("magicbees.species").append(name).toString();break; - case GREGTECH: s = new StringBuilder().append("gregtech.species").append(name).toString();break; - default: s = new StringBuilder().append("forestry.species").append(name).toString();break; + case EXTRABEES: s = "extrabees.species." + name;break; + case GENDUSTRY: s = "gendustry.bee." + name;break; + case MAGICBEES: s = "magicbees.species" + name;break; + case GREGTECH: s = "gregtech.species" + name;break; + default: s = "forestry.species" + name;break; } IAlleleBeeSpecies ret = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele(s); @@ -3213,7 +3214,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { } protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance) { - return new GT_Bee_Mutation(parent1,parent2,this.getTemplate(),chance,1); + return new GT_Bee_Mutation(parent1,parent2,this.getTemplate(),chance,1f); } /** @@ -3225,7 +3226,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { * @param chancedivider * @return */ - protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance, int chancedivider) { + protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance, float chancedivider) { return new GT_Bee_Mutation(parent1,parent2,this.getTemplate(),chance,chancedivider); } diff --git a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java b/src/main/java/gregtech/loaders/postload/GT_CropLoader.java index 4b55fd825b..8ec6bc85bb 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CropLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CropLoader.java @@ -380,6 +380,12 @@ public class GT_CropLoader "Yellow", "Oil" }, ItemList.Crop_Drop_Rape.get(1), null); + new GT_BaseCrop(179, "Micadia", "bartimaeusnek", null, 9, 3, 0, 2, 3, 2, 0, 3, 0, 0, new String[] { + "Metal", + "Pine", + "Mica", + "Bush" + }, Materials.Mica, ItemList.Crop_Drop_Mica.get(1L), null); } catch (Throwable e) { GT_Log.err.println("GT_Mod: Failed to register Crops to IC2."); e.printStackTrace(GT_Log.err); diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 6886fbef2d..c149b905cc 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -2100,6 +2100,8 @@ public class GT_MachineRecipeLoader implements Runnable { tCrop = ItemList.Crop_Drop_Aurelia.get(1); this.addProcess(tCrop, Materials.Gold, 100, true); this.addProcess(tCrop, Materials.Magnetite, Materials.Gold, 100, false); + tCrop = ItemList.Crop_Drop_Mica.get(1); + this.addProcess(tCrop,Materials.Mica,75, true); // Rare Metals Line tCrop = ItemList.Crop_Drop_Bauxite.get(1); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/538.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/538.png new file mode 100644 index 0000000000..e94c4a8599 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/538.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Micadia.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Micadia.1.png new file mode 100644 index 0000000000..609fd453f0 Binary files /dev/null and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Micadia.1.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Micadia.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Micadia.2.png new file mode 100644 index 0000000000..fa28ba1ed8 Binary files /dev/null and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Micadia.2.png differ diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Micadia.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Micadia.3.png new file mode 100644 index 0000000000..579d1303e9 Binary files /dev/null and b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Micadia.3.png differ -- cgit From 70c3eff28a457c7b6a4122780ddcf3586f4f64ec Mon Sep 17 00:00:00 2001 From: Bass Date: Tue, 26 Nov 2019 09:19:34 +0000 Subject: Additional fluid textures Added animated fluid textures for liquid nitrogen and liquid oxygen based on liquid mercury --- .../textures/blocks/fluids/fluid.liquidnitrogen.png | Bin 0 -> 3567 bytes .../blocks/fluids/fluid.liquidnitrogen.png.mcmeta | 5 +++++ .../textures/blocks/fluids/fluid.liquidoxygen.png | Bin 0 -> 3275 bytes .../textures/blocks/fluids/fluid.liquidoxygen.png.mcmeta | 5 +++++ 4 files changed, 10 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png.mcmeta (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png new file mode 100644 index 0000000000..eba51f9556 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png new file mode 100644 index 0000000000..22eb9e5220 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file -- cgit From 4311ea108d502e522ad326608d8a33b3fb47b9a1 Mon Sep 17 00:00:00 2001 From: Bass Date: Tue, 26 Nov 2019 09:28:03 +0000 Subject: Improved Fluid Textures Adds animated textures for the following fluids: Deuterium Gas Natural Gas Sulphuric Gas Helium Helium-3 Hydrogen Methane Nitrogen Nitrogen Dioxide Oxygen Radon Trinium Liquid Air --- .../textures/blocks/fluids/fluid.deuterium.png | Bin 144 -> 1061 bytes .../textures/blocks/fluids/fluid.deuterium.png.mcmeta | 5 +++++ .../gregtech/textures/blocks/fluids/fluid.gas_gas.png | Bin 145 -> 1061 bytes .../textures/blocks/fluids/fluid.gas_gas.png.mcmeta | 5 +++++ .../textures/blocks/fluids/fluid.gas_natural_gas.png | Bin 145 -> 1061 bytes .../blocks/fluids/fluid.gas_natural_gas.png.mcmeta | 5 +++++ .../textures/blocks/fluids/fluid.gas_sulfuricgas.png | Bin 145 -> 1061 bytes .../blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta | 5 +++++ .../textures/blocks/fluids/fluid.helium-3.png | Bin 145 -> 1061 bytes .../textures/blocks/fluids/fluid.helium-3.png.mcmeta | 5 +++++ .../gregtech/textures/blocks/fluids/fluid.helium.png | Bin 145 -> 1061 bytes .../textures/blocks/fluids/fluid.helium.png.mcmeta | 5 +++++ .../textures/blocks/fluids/fluid.hydrogen.png | Bin 144 -> 1061 bytes .../textures/blocks/fluids/fluid.hydrogen.png.mcmeta | 5 +++++ .../textures/blocks/fluids/fluid.liquidair.png | Bin 2809 -> 1695 bytes .../textures/blocks/fluids/fluid.liquidair.png.mcmeta | 5 +++++ .../gregtech/textures/blocks/fluids/fluid.methane.png | Bin 144 -> 1061 bytes .../textures/blocks/fluids/fluid.methane.png.mcmeta | 5 +++++ .../textures/blocks/fluids/fluid.nitrogen.png | Bin 144 -> 1061 bytes .../textures/blocks/fluids/fluid.nitrogen.png.mcmeta | 5 +++++ .../textures/blocks/fluids/fluid.nitrogendioxide.png | Bin 144 -> 1061 bytes .../blocks/fluids/fluid.nitrogendioxide.png.mcmeta | 5 +++++ .../gregtech/textures/blocks/fluids/fluid.oxygen.png | Bin 144 -> 1061 bytes .../textures/blocks/fluids/fluid.oxygen.png.mcmeta | 5 +++++ .../gregtech/textures/blocks/fluids/fluid.radon.png | Bin 103 -> 1061 bytes .../textures/blocks/fluids/fluid.radon.png.mcmeta | 5 +++++ .../gregtech/textures/blocks/fluids/fluid.tritium.png | Bin 144 -> 1061 bytes .../textures/blocks/fluids/fluid.tritium.png.mcmeta | 5 +++++ 28 files changed, 70 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png.mcmeta (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png index 113af76626..58c1d841b3 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png index e5045f627d..6679d79b1e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png index e5045f627d..6679d79b1e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png index e5045f627d..6679d79b1e 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png index 395e438872..66110ea4b8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png index 2ead95048c..66110ea4b8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png index 0300ee2b72..9e71a23276 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png index afff0ed587..2dfe46e980 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png index 5f8e539e8a..052e6249bd 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png index 55cde5b4d8..548573da0a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png index e7323cb129..425fc3ef91 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png index 9886fa1442..5bd434c49a 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png index 2bd83db3c4..dbf6df92c3 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png index 495cdb1bba..cea29054db 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file -- cgit From f5590e287c0c76e8b138d23b7249823f2cd5cc01 Mon Sep 17 00:00:00 2001 From: Ethryan Date: Thu, 12 Dec 2019 10:26:18 +0100 Subject: Regulator-Fix --- .../gregtech/textures/items/gt.metaitem.01/666.png | Bin 3228 -> 3221 bytes .../gregtech/textures/items/gt.metaitem.01/667.png | Bin 3221 -> 3228 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png index 025faa6a97..72648106ec 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png index 72648106ec..025faa6a97 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.png differ -- cgit From 50aabbf4187131f9b60a54325782ad7762e68d0e Mon Sep 17 00:00:00 2001 From: Richard Hendricks Date: Fri, 3 Jan 2020 00:58:14 -0600 Subject: Add radius to scanner output. Fixed issue with pump radius not resetting pump queue. Added localization for some infos. --- .../machines/basic/GT_MetaTileEntity_Miner.java | 13 ++++++++++++- .../machines/basic/GT_MetaTileEntity_Pump.java | 20 ++++++++++++++++++-- .../multi/GT_MetaTileEntity_OilDrillBase.java | 13 ++++++++++++- .../GT_MetaTileEntity_OreDrillingPlantBase.java | 13 ++++++++++++- src/main/resources/assets/gregtech/lang/en_US.lang | 11 +++++++++++ 5 files changed, 65 insertions(+), 5 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java index b1fe243374..9757974cee 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java @@ -18,6 +18,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.FakePlayer; import java.util.ArrayList; @@ -104,7 +106,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine { if (radiusConfig > RADIUS[mTier]) radiusConfig = 0; } - GT_Utility.sendChatToPlayer(aPlayer, "Work area set to " + (radiusConfig * 2 + 1) + "x" + (radiusConfig * 2 + 1));//TODO Add translation support + GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.machines.workareaset") + " " + (radiusConfig * 2 + 1) + "x" + (radiusConfig * 2 + 1));//TODO Add translation support } } @@ -275,5 +277,14 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine { } return mFakePlayer; } + + @Override + public String[] getInfoData() { + return new String[]{ + EnumChatFormatting.BLUE+StatCollector.translateToLocal("GT5U.machines.miner")+EnumChatFormatting.RESET, + StatCollector.translateToLocal("GT5U.machines.workarea")+": " + EnumChatFormatting.GREEN + (radiusConfig * 2 + 1)+ + EnumChatFormatting.RESET+" " + StatCollector.translateToLocal("GT5U.machines.blocks") + }; + } } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java index d5c4d6a482..e4a2ffe771 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java @@ -18,6 +18,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import net.minecraft.world.ChunkPosition; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; @@ -123,7 +125,9 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { if (radiusConfig > max) radiusConfig = 0; } - GT_Utility.sendChatToPlayer(aPlayer, "Pumping area set to " + (radiusConfig * 2 + 1) + "x" + (radiusConfig * 2 + 1));//TODO Add translation support + GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.machines.workareaset") + " " + (radiusConfig * 2 + 1) + "x" + (radiusConfig * 2 + 1));//TODO Add translation support + + clearQueue(false); } @@ -516,7 +520,10 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { @Override public ArrayList getSpecialDebugInfo(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, int aLogLevel, ArrayList aList) { - aList.addAll(Arrays.asList("Primary pumping fluid: " + (this.mPrimaryPumpedBlock != null ? this.mPrimaryPumpedBlock.getLocalizedName() : "None"), + aList.addAll(Arrays.asList( EnumChatFormatting.BLUE+StatCollector.translateToLocal("GT5U.machines.pump")+EnumChatFormatting.RESET, + StatCollector.translateToLocal("GT5U.machines.workarea")+": " + EnumChatFormatting.GREEN + (radiusConfig * 2 + 1)+ + EnumChatFormatting.RESET+" " + StatCollector.translateToLocal("GT5U.machines.blocks"), + "Primary pumping fluid: " + (this.mPrimaryPumpedBlock != null ? this.mPrimaryPumpedBlock.getLocalizedName() : "None"), "Secondary pumping fluid: " + (this.mSecondaryPumpedBlock != null ? this.mSecondaryPumpedBlock.getLocalizedName() : "None"), "Pumps below: " + mPumpCountBelow, "Queue size: " + mPumpList.size(), @@ -643,4 +650,13 @@ public class GT_MetaTileEntity_Pump extends GT_MetaTileEntity_Hatch { mFakePlayer.setPosition(aBaseTile.getXCoord(), aBaseTile.getYCoord(), aBaseTile.getZCoord()); return mFakePlayer; } + + @Override + public String[] getInfoData() { + return new String[]{ + EnumChatFormatting.BLUE+StatCollector.translateToLocal("GT5U.machines.pump")+EnumChatFormatting.RESET, + StatCollector.translateToLocal("GT5U.machines.workarea")+": " + EnumChatFormatting.GREEN + (radiusConfig * 2 + 1)+ + EnumChatFormatting.RESET+" " + StatCollector.translateToLocal("GT5U.machines.blocks") + }; + } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java index 9f3e03b99c..76f8e7f87f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java @@ -8,6 +8,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -91,7 +93,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D if (chunkRangeConfig > getRangeInChunks()) chunkRangeConfig = 1; } - GT_Utility.sendChatToPlayer(aPlayer, "Set to work on " + chunkRangeConfig + "x" + chunkRangeConfig + " chunks");//TODO Add translation support + GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.machines.workareaset") + " " + chunkRangeConfig + "x" + chunkRangeConfig + StatCollector.translateToLocal("GT5U.machines.chunks"));//TODO Add translation support } @Override @@ -231,4 +233,13 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D } return tOil.amount == 0 ? null : tOil; } + + @Override + public String[] getInfoData() { + return new String[]{ + EnumChatFormatting.BLUE+StatCollector.translateToLocal("GT5U.machines.oilfluidpump")+EnumChatFormatting.RESET, + StatCollector.translateToLocal("GT5U.machines.workarea")+": " + EnumChatFormatting.GREEN + (chunkRangeConfig)+ " x " + (chunkRangeConfig) + + EnumChatFormatting.RESET+" " + StatCollector.translateToLocal("GT5U.machines.chunks") + }; + } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java index fba143d5f2..a95c0a04c5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java @@ -20,6 +20,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.ChunkPosition; import net.minecraftforge.fluids.FluidStack; @@ -81,7 +83,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile if (chunkRadiusConfig > getRadiusInChunks()) chunkRadiusConfig = 1; } - GT_Utility.sendChatToPlayer(aPlayer, "Set to mine in a " + (chunkRadiusConfig << 4) + " radius");//TODO Add translation support + GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.machines.workareaset") + " " + (chunkRadiusConfig << 4) + StatCollector.translateToLocal("GT5U.machines.workareaset"));//TODO Add translation support } @Override @@ -331,4 +333,13 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile "Maximum radius is " + (getRadiusInChunks() << 4) + " blocks", "Fortune bonus of " + (mTier + 3)}; } + + @Override + public String[] getInfoData() { + return new String[]{ + EnumChatFormatting.BLUE+StatCollector.translateToLocal("GT5U.machines.minermulti")+EnumChatFormatting.RESET, + StatCollector.translateToLocal("GT5U.machines.workarea")+": " + EnumChatFormatting.GREEN + (chunkRadiusConfig * 2 + 1)+ + EnumChatFormatting.RESET+" " + StatCollector.translateToLocal("GT5U.machines.chunks") + }; + } } diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index f294afa83b..7113455fda 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -30,6 +30,17 @@ GT5U.EBF.heat=Heat capacity GT5U.MS.multismelting=Multi smelting GT5U.machines.tier=Tier +GT5U.machines.workarea=Work Area +GT5U.machines.blocks=Blocks +GT5U.machines.chunks=Chunks +GT5U.machines.miner=Miner +GT5U.machines.pump=Pump +GT5U.machines.pumpareaset=Pumping area set to +GT5U.machines.oilfluidpump=Oil/Fluid Pump +GT5U.machines.minermulti=Multiblock Miner + + + GT5U.multiblock.pollution=Pollution reduced to GT5U.multiblock.energy=Stored Energy -- cgit From e97ebab2132f21f3943c887119f0159a2b31df6f Mon Sep 17 00:00:00 2001 From: Richard Hendricks Date: Fri, 3 Jan 2020 01:59:42 -0600 Subject: missed translation setup. --- .../machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java | 2 +- src/main/resources/assets/gregtech/lang/en_US.lang | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java index a95c0a04c5..098872e785 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java @@ -83,7 +83,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile if (chunkRadiusConfig > getRadiusInChunks()) chunkRadiusConfig = 1; } - GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.machines.workareaset") + " " + (chunkRadiusConfig << 4) + StatCollector.translateToLocal("GT5U.machines.workareaset"));//TODO Add translation support + GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.machines.workareaset") + " " + (chunkRadiusConfig << 4) + StatCollector.translateToLocal("GT5U.machines.radius"));//TODO Add translation support } @Override diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 7113455fda..c98ef9c660 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -31,6 +31,8 @@ GT5U.MS.multismelting=Multi smelting GT5U.machines.tier=Tier GT5U.machines.workarea=Work Area +GT5U.machines.workareaset=Work Area set to +GT5U.machines.radius=radius GT5U.machines.blocks=Blocks GT5U.machines.chunks=Chunks GT5U.machines.miner=Miner -- cgit From 169d4bcc93d5928234d151fdd41a428556fc0068 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Fri, 3 Jan 2020 20:08:37 +0100 Subject: Can't breed firestone bees #5271 https://github.com/GTNewHorizons/NewHorizons/issues/5271 --- src/main/java/gregtech/api/enums/Textures.java | 5 +++-- .../java/gregtech/api/util/GT_Assemblyline_Server.java | 3 ++- .../loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 1 + .../textures/blocks/iconsets/BLOCK_FIRESTONE.png | Bin 0 -> 3406 bytes 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FIRESTONE.png (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 1c1aaa3bd8..f7a0409b8c 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -29,7 +29,7 @@ public class Textures { MACHINE_CASING_TANK_5, MACHINE_CASING_TANK_6, MACHINE_CASING_TANK_7, MACHINE_CASING_TANK_8, MACHINE_CASING_TANK_9, MACHINE_CASING_TANK_10,MACHINE_CASING_TANK_11,MACHINE_CASING_TANK_12, MACHINE_CASING_TANK_13,MACHINE_CASING_TANK_14,MACHINE_CASING_TANK_15,MACHINE_CASING_TANK_0, - BLOCK_STEELEAF, BLOCK_ICHORIUM, + BLOCK_STEELEAF, BLOCK_ICHORIUM, BLOCK_FIRESTONE, OVERLAY_ENERGY_IN_POWER,OVERLAY_ENERGY_OUT_POWER,OVERLAY_AUTOMAINTENANCE,OVERLAY_AUTOMAINTENANCE_IDLE,OVERLAY_TELEPORTER_SIDES, // VOID // The Empty Texture @@ -521,7 +521,8 @@ public class Textures { BLOCK_HSSE, BLOCK_HSSS, BLOCK_STEELEAF, - BLOCK_ICHORIUM + BLOCK_ICHORIUM, + BLOCK_FIRESTONE }, STORAGE_BLOCKS9 = new IIconContainer[]{ BLOCK_AERCRYSTAL, diff --git a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java index 2a89b9c71b..fa93e4f80e 100644 --- a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java +++ b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java @@ -262,7 +262,8 @@ public class GT_Assemblyline_Server { Materials.HSSE, Materials.HSSS, Materials.Steeleaf, - Materials.Ichorium + Materials.Ichorium, + Materials.Firestone }; break; } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 4f474da977..0cb410eee5 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -379,6 +379,7 @@ public class GT_Loader_Item_Block_And_Fluid Materials.HSSS, Materials.Steeleaf, Materials.Ichorium, + Materials.Firestone, }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS8); GregTech_API.sBlockGem1 = new GT_Block_Metal("gt.blockgem1", new Materials[]{ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FIRESTONE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FIRESTONE.png new file mode 100644 index 0000000000..bfb78ae3d1 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FIRESTONE.png differ -- cgit From 631750c2786359d3c9e79cf1a37063f55e939364 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Fri, 17 Jan 2020 22:57:35 +0100 Subject: Fluxed electrum no mixer recipe, only shapeless #5366 https://github.com/GTNewHorizons/NewHorizons/issues/5366 --- .../api/interfaces/internal/IGT_RecipeAdder.java | 3 +++ src/main/java/gregtech/api/util/GT_Recipe.java | 2 +- src/main/java/gregtech/common/GT_RecipeAdder.java | 8 ++++++-- .../loaders/preload/GT_Loader_MetaTileEntities.java | 4 ++-- .../gregtech/textures/gui/basicmachines/Mixer2.png | Bin 0 -> 5733 bytes 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer2.png (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java index 5bb3545d8d..40a30ebf8a 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -614,6 +614,9 @@ public interface IGT_RecipeAdder { public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt); public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, ItemStack aInput5, ItemStack aInput6, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt); + + public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, ItemStack aInput5, ItemStack aInput6, ItemStack aInput7, ItemStack aInput8, ItemStack aInput9, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt); + /** * Adds a Recipe for the Laser Engraver */ diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 17f54b6f53..5c2d895ee2 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -546,7 +546,7 @@ public class GT_Recipe implements Comparable { public static final GT_Recipe_Map sSifterRecipes = new GT_Recipe_Map(new HashSet(105), "gt.recipe.sifter", "Sifter", null, RES_PATH_GUI + "basicmachines/Sifter", 1, 9, 1, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sPressRecipes = new GT_Recipe_Map_FormingPress(new HashSet(300), "gt.recipe.press", "Forming Press", null, RES_PATH_GUI + "basicmachines/Press", 2, 1, 2, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sLaserEngraverRecipes = new GT_Recipe_Map(new HashSet(810), "gt.recipe.laserengraver", "Precision Laser Engraver", null, RES_PATH_GUI + "basicmachines/LaserEngraver", 2, 1, 2, 0, 1, E, 1, E, true, true); - public static final GT_Recipe_Map sMixerRecipes = new GT_Recipe_Map(new HashSet(900), "gt.recipe.mixer", "Mixer", null, RES_PATH_GUI + "basicmachines/Mixer", 6, 1, 1, 0, 1, E, 1, E, true, true); + public static final GT_Recipe_Map sMixerRecipes = new GT_Recipe_Map(new HashSet(900), "gt.recipe.mixer", "Mixer", null, RES_PATH_GUI + "basicmachines/Mixer2", 9, 1, 1, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sAutoclaveRecipes = new GT_Recipe_Map(new HashSet(300), "gt.recipe.autoclave", "Autoclave", null, RES_PATH_GUI + "basicmachines/Autoclave", 1, 1, 1, 1, 1, E, 1, E, true, true); public static final GT_Recipe_Map sElectroMagneticSeparatorRecipes = new GT_Recipe_Map(new HashSet(50), "gt.recipe.electromagneticseparator", "Electromagnetic Separator", null, RES_PATH_GUI + "basicmachines/ElectromagneticSeparator", 1, 3, 1, 0, 1, E, 1, E, true, true); public static final GT_Recipe_Map sPolarizerRecipes = new GT_Recipe_Map(new HashSet(300), "gt.recipe.polarizer", "Electromagnetic Polarizer", null, RES_PATH_GUI + "basicmachines/Polarizer", 1, 1, 1, 0, 1, E, 1, E, true, true); diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 4a1a3e0ceb..49c891e91f 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -998,10 +998,14 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt) { - return addMixerRecipe(aInput1, aInput2, aInput3, aInput4, null, null, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt); + return addMixerRecipe(aInput1, aInput2, aInput3, aInput4, null, null, null, null, null, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt); } public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, ItemStack aInput5, ItemStack aInput6, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt) { + return addMixerRecipe(aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, null, null, null, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt); + + } + public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, ItemStack aInput5, ItemStack aInput6, ItemStack aInput7, ItemStack aInput8,ItemStack aInput9, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt) { if (((aInput1 == null) && (aFluidInput == null)) || ((aOutput == null) && (aFluidOutput == null))) { return false; } @@ -1011,7 +1015,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("mixer", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) { return false; } - GT_Recipe.GT_Recipe_Map.sMixerRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2, aInput3, aInput4, aInput5, aInput6}, new ItemStack[]{aOutput}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); + GT_Recipe.GT_Recipe_Map.sMixerRecipes.addRecipe(true, new ItemStack[]{aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9}, new ItemStack[]{aOutput}, null, null, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0); return true; } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 886d48af30..b4f43475ed 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -940,8 +940,8 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.Machine_LV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(581, "basicmachine.mixer.tier.01", "Basic Mixer", 1, "Will it Blend?", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 6, 1, 16000, 0, 1, "Mixer.png", "", aBoolConst_0, aBoolConst_0, 0, "MIXER", new Object[]{"GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); ItemList.Machine_MV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(582, "basicmachine.mixer.tier.02", "Advanced Mixer", 2, "Will it Blend?", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 6, 1, 32000, 0, 1, "Mixer.png", "", aBoolConst_0, aBoolConst_0, 0, "MIXER", new Object[]{"GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); ItemList.Machine_HV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(583, "basicmachine.mixer.tier.03", "Advanced Mixer II", 3, "Will it Blend?", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 6, 1, 48000, 0, 1, "Mixer.png", "", aBoolConst_0, aBoolConst_0, 0, "MIXER", new Object[]{"GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); - ItemList.Machine_EV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(584, "basicmachine.mixer.tier.04", "Advanced Mixer III", 4, "Will it Blend?", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 6, 1, 64000, 0, 1, "Mixer.png", "", aBoolConst_0, aBoolConst_0, 0, "MIXER", new Object[]{"GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); - ItemList.Machine_IV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(585, "basicmachine.mixer.tier.05", "Advanced Mixer IV", 5, "Will it Blend?", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 6, 1, 64000, 0, 1, "Mixer.png", "", aBoolConst_0, aBoolConst_0, 0, "MIXER", new Object[]{"GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); + ItemList.Machine_EV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(584, "basicmachine.mixer.tier.04", "Advanced Mixer III", 4, "Will it Blend?", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 9, 1, 64000, 0, 1, "Mixer2.png", "", aBoolConst_0, aBoolConst_0, 0, "MIXER", new Object[]{"GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); + ItemList.Machine_IV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(585, "basicmachine.mixer.tier.05", "Advanced Mixer IV", 5, "Will it Blend?", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 9, 1, 64000, 0, 1, "Mixer2.png", "", aBoolConst_0, aBoolConst_0, 0, "MIXER", new Object[]{"GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); //ItemList.Machine_LuV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(586, "basicmachine.mixer.tier.06", "Advanced Mixer V", 6, "Will it Blend?", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 1, 8000, 0, 1, "Mixer.png", "", aBoolConst_0, aBoolConst_0, 0, "MIXER", new Object[]{"GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); //ItemList.Machine_ZPM_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(587, "basicmachine.mixer.tier.07", "Advanced Mixer VI", 7, "Will it Blend?", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 1, 8000, 0, 1, "Mixer.png", "", aBoolConst_0, aBoolConst_0, 0, "MIXER", new Object[]{"GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); //ItemList.Machine_UV_Mixer.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(588, "basicmachine.mixer.tier.08", "Advanced Mixer VII", 8, "Will it Blend?", GT_Recipe.GT_Recipe_Map.sMixerRecipes, 4, 1, 8000, 0, 1, "Mixer.png", "", aBoolConst_0, aBoolConst_0, 0, "MIXER", new Object[]{"GRG", "GEG", aTextCableHull, 'M', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL, 'E', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR, 'R', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR, 'C', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT, 'G', GT_MetaTileEntity_BasicMachine_GT_Recipe.X.GLASS}).getStackForm(1L)); diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer2.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer2.png new file mode 100644 index 0000000000..bb61207929 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer2.png differ -- cgit From c16a4ec67c47f9a8ca119940f5df6e52d3e3875a Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Wed, 29 Jan 2020 21:22:54 +0100 Subject: New GT Mixer texture need to be corrected #5467 https://github.com/GTNewHorizons/NewHorizons/issues/5467 --- .../gregtech/textures/gui/basicmachines/Mixer2.png | Bin 5733 -> 5686 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer2.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer2.png index bb61207929..7dfa79d2ee 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer2.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer2.png differ -- cgit From 16cce84a1de9f354cfc6e435aa10578bdf6d262e Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 8 Mar 2020 16:12:20 +0100 Subject: Question: Phobos bee flower type #5674 https://github.com/GTNewHorizons/NewHorizons/issues/5674 added missing Localizers for Bees --- src/main/resources/assets/gregtech/lang/en_US.lang | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index c98ef9c660..38e04bc0fe 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -992,4 +992,15 @@ for.bees.species.infinity=Infinity for.mutation.condition.biomeid=Required Biome for.mutation.condition.dim=Required Dimension -itemGroup.GTtools=Prebuild Tools \ No newline at end of file +itemGroup.GTtools=Prebuild Tools + +gregtech.fertilitySterile=No Fertility +gregtech.fertilityMultiply=Super Fertility +gregtech.floweringNonpollinating=Non pollinating +gregtech.floweringNaturalistic=Naturalistic +gregtech.areaLethargic=No Territory 1x1 +gregtech.areaExploratory=Super Territory 32x16 +gregtech.speedUnproductive=No work +gregtech.speedAccelerated=Super Speed +gregtech.lifeBlink=Blink Life +gregtech.lifeEon=Super Life \ No newline at end of file -- cgit From 64f23ece55b8838c4e3403aba7686086df4cb4ea Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 8 Mar 2020 16:14:30 +0100 Subject: thanks @Zoko061602 --- src/main/resources/assets/gregtech/lang/en_US.lang | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 38e04bc0fe..676e8ca17b 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -994,13 +994,13 @@ for.mutation.condition.dim=Required Dimension itemGroup.GTtools=Prebuild Tools -gregtech.fertilitySterile=No Fertility -gregtech.fertilityMultiply=Super Fertility +gregtech.fertilitySterile=Sterile +gregtech.fertilityMultiply=Multiply gregtech.floweringNonpollinating=Non pollinating gregtech.floweringNaturalistic=Naturalistic -gregtech.areaLethargic=No Territory 1x1 -gregtech.areaExploratory=Super Territory 32x16 -gregtech.speedUnproductive=No work -gregtech.speedAccelerated=Super Speed -gregtech.lifeBlink=Blink Life -gregtech.lifeEon=Super Life \ No newline at end of file +gregtech.areaLethargic=Lethargic +gregtech.areaExploratory=Exploratory +gregtech.speedUnproductive=Unproductive +gregtech.speedAccelerated=Accelerated +gregtech.lifeBlink=Blink +gregtech.lifeEon=Eon \ No newline at end of file -- cgit From 065652f1d4865557dd26035cd26a61044ccb90cf Mon Sep 17 00:00:00 2001 From: botn365 Date: Wed, 11 Mar 2020 10:40:48 +0100 Subject: add a option to separate PA input busses --- .../multi/GT_MetaTileEntity_ProcessingArray.java | 54 +++++++++++++++++++--- src/main/resources/assets/gregtech/lang/en_US.lang | 1 + 2 files changed, 49 insertions(+), 6 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index 82dcdc905f..3d125f3960 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -19,12 +19,15 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; @@ -35,6 +38,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl private GT_Recipe mLastRecipe; private int tTier = 0; private int mMult = 0; + private boolean mseparate = false; public GT_MetaTileEntity_ProcessingArray(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -59,6 +63,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl "1x Energy Hatch (Any casing)", "Robust Tungstensteel Machine Casings for the rest (14 at least!)", "Place up to 64 Single Block GT Machines into the Controller Inventory", + "Use screwdriver to enable separate input busses", "Maximal overclockedness of machines inside: Tier 9"}; } @@ -204,7 +209,6 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl } GT_Recipe.GT_Recipe_Map map = getRecipeMap(); if (map == null) return false; - ArrayList tInputList = getStoredInputs(); if (mInventory[1].getUnlocalizedName().endsWith("10")) { tTier = 9; @@ -252,12 +256,32 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl if (!mMachine.equals(mInventory[1].getUnlocalizedName())) mLastRecipe = null; mMachine = mInventory[1].getUnlocalizedName(); - ItemStack[] tInputs = (ItemStack[]) tInputList.toArray(new ItemStack[tInputList.size()]); - + ArrayList tFluidList = getStoredFluids(); - FluidStack[] tFluids = (FluidStack[]) tFluidList.toArray(new FluidStack[tFluidList.size()]); - if (tInputList.size() > 0 || tFluids.length > 0) { + if (mseparate) { + ArrayList tInputList = new ArrayList(); + for (GT_MetaTileEntity_Hatch_InputBus tHatch : mInputBusses) { + for (int i = tHatch.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) { + if (tHatch.getBaseMetaTileEntity().getStackInSlot(i) != null) + tInputList.add(tHatch.getBaseMetaTileEntity().getStackInSlot(i)); + } + ItemStack[] tInputs = (ItemStack[]) tInputList.toArray(new ItemStack[tInputList.size()]); + if (processRecipe(tInputs, tFluids, map)) + return true; + else + tInputList.clear(); + } + } else { + ArrayList tInputList = getStoredInputs(); + ItemStack[] tInputs = (ItemStack[]) tInputList.toArray(new ItemStack[tInputList.size()]); + return processRecipe(tInputs, tFluids, map); + } + return false; + } + + public boolean processRecipe(ItemStack[] tInputs, FluidStack[] tFluids, GT_Recipe.GT_Recipe_Map map) { + if (tInputs.length > 0 || tFluids.length > 0) { GT_Recipe tRecipe = map.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs); if (tRecipe != null) { if (GT_Mod.gregtechproxy.mLowGravProcessing && tRecipe.mSpecialValue == -100 && @@ -344,7 +368,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl ...remoteRecipeCheck() }*/ } - return false; + return false; } public static ItemStack[] clean(final ItemStack[] v) { @@ -380,6 +404,24 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl } return tAmount >= 14; } + + @Override + public void saveNBTData(NBTTagCompound aNBT) { + super.saveNBTData(aNBT); + aNBT.setBoolean("mseparate", mseparate); + } + + @Override + public void loadNBTData(final NBTTagCompound aNBT) { + super.loadNBTData(aNBT); + mseparate = aNBT.getBoolean("mseparate"); + } + + @Override + public final void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + mseparate = !mseparate; + GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.machines.separatebus") +" "+mseparate); + } public int getMaxEfficiency(ItemStack aStack) { return 10000; diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index c98ef9c660..647dbc4c3e 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -37,6 +37,7 @@ GT5U.machines.blocks=Blocks GT5U.machines.chunks=Chunks GT5U.machines.miner=Miner GT5U.machines.pump=Pump +GT5U.machines.separatebus=Input busses are separated GT5U.machines.pumpareaset=Pumping area set to GT5U.machines.oilfluidpump=Oil/Fluid Pump GT5U.machines.minermulti=Multiblock Miner -- cgit From 113dc732b2d25c3ed302bf6ee4c673a49405fc6b Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Mon, 23 Mar 2020 12:17:09 +0100 Subject: First attemp to add Ore drilling Plant Luv and ZPM --- src/main/java/gregtech/api/enums/ItemList.java | 4 ++ src/main/java/gregtech/api/enums/Textures.java | 2 + .../gregtech/common/blocks/GT_Block_Casings8.java | 8 +++ .../multi/GT_MetaTileEntity_OreDrillingPlant5.java | 58 +++++++++++++++++++++ .../multi/GT_MetaTileEntity_OreDrillingPlant6.java | 58 +++++++++++++++++++++ .../loaders/postload/GT_MachineRecipeLoader.java | 2 + .../preload/GT_Loader_MetaTileEntities.java | 8 +++ .../MACHINE_CASING_MINING_BLACKPLUTONIUM.png | Bin 0 -> 2957 bytes .../iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png | Bin 0 -> 3025 bytes 9 files changed, 140 insertions(+) create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant5.java create mode 100644 src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index bfd455034b..a02e4bbf64 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -780,6 +780,8 @@ public enum ItemList implements IItemContainer { Casing_CleanStainlessSteel, Casing_StableTitanium, Casing_Firebox_Titanium, + Casing_MiningNeutronium, + Casing_MiningBlackPlutonium, Hull_ULV, Hull_LV, @@ -1486,6 +1488,8 @@ public enum ItemList implements IItemContainer { OreDrill2, OreDrill3, OreDrill4, + OreDrill5, + OreDrill6, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 1905c5c5cc..f02a8c5d7f 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -212,6 +212,8 @@ public class Textures { MACHINE_CASING_CLEAN_STAINLESSSTEEL, MACHINE_CASING_STABLE_TITANIUM, MACHINE_CASING_MINING_OSMIRIDIUM, + MACHINE_CASING_MINING_NEUTRONIUM, + MACHINE_CASING_MINING_BLACKPLUTONIUM, MACHINE_CASING_FIREBOX_TITANIUM, MACHINE_CASING_FUSION_COIL, diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java index 093373bde4..42e3b2d9b4 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java @@ -20,9 +20,13 @@ public class GT_Block_Casings8 } GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemically Inert Machine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "PTFE Pipe Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Mining Neutronium Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Mining Black Plutonium Casing"); ItemList.Casing_Chemically_Inert.set(new ItemStack(this, 1, 0)); ItemList.Casing_Pipe_Polytetrafluoroethylene.set(new ItemStack(this, 1, 1)); + ItemList.Casing_MiningNeutronium.set(new ItemStack(this, 1, 2)); + ItemList.Casing_MiningBlackPlutonium.set(new ItemStack(this, 1, 3)); } @Override @@ -33,6 +37,10 @@ public class GT_Block_Casings8 return Textures.BlockIcons.MACHINE_CASING_CHEMICALLY_INERT.getIcon(); case 1: return Textures.BlockIcons.MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.getIcon(); + case 2: + return Textures.BlockIcons.MACHINE_CASING_MINING_NEUTRONIUM.getIcon(); + case 3: + return Textures.BlockIcons.MACHINE_CASING_MINING_BLACKPLUTONIUM.getIcon(); } return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant5.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant5.java new file mode 100644 index 0000000000..aa23b9caf7 --- /dev/null +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant5.java @@ -0,0 +1,58 @@ +package gregtech.common.tileentities.machines.multi; + +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + +public class GT_MetaTileEntity_OreDrillingPlant5 extends GT_MetaTileEntity_OreDrillingPlantBase { + public GT_MetaTileEntity_OreDrillingPlant5(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional); + mTier=5; + } + + public GT_MetaTileEntity_OreDrillingPlant5(String aName) { + super(aName); + mTier=5; + } + + @Override + public String[] getDescription() { + return getDescriptionInternal("LuV"); + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_OreDrillingPlant5(mName); + } + + @Override + protected ItemList getCasingBlockItem() { + return ItemList.Casing_MiningNeutronium; + } + + @Override + protected Materials getFrameMaterial() { + return Materials.Neutronium; + } + + @Override + protected int getCasingTextureIndex() { + return 50; + } + + @Override + protected int getRadiusInChunks() { + return 12; + } + + @Override + protected int getMinTier() { + return 6; + } + + @Override + protected int getBaseProgressTime() { + return 320; + } +} diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java new file mode 100644 index 0000000000..55f56c17f4 --- /dev/null +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java @@ -0,0 +1,58 @@ +package gregtech.common.tileentities.machines.multi; + +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; + +public class GT_MetaTileEntity_OreDrillingPlant6 extends GT_MetaTileEntity_OreDrillingPlantBase { + public GT_MetaTileEntity_OreDrillingPlant6(int aID, String aName, String aNameRegional) { + super(aID, aName, aNameRegional); + mTier=5; + } + + public GT_MetaTileEntity_OreDrillingPlant6(String aName) { + super(aName); + mTier=5; + } + + @Override + public String[] getDescription() { + return getDescriptionInternal("ZPM"); + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_OreDrillingPlant6(mName); + } + + @Override + protected ItemList getCasingBlockItem() { + return ItemList.Casing_MiningBlackPlutonium; + } + + @Override + protected Materials getFrameMaterial() { + return Materials.BlackPlutonium; + } + + @Override + protected int getCasingTextureIndex() { + return 51; + } + + @Override + protected int getRadiusInChunks() { + return 15; + } + + @Override + protected int getMinTier() { + return 7; + } + + @Override + protected int getBaseProgressTime() { + return 160; + } +} diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index ba7495b6a4..f070b11ec8 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1760,6 +1760,8 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 6L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1L), ItemList.Casing_CleanStainlessSteel.get(1L), 50, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1L), ItemList.Casing_StableTitanium.get(1L), 50, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 6L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 1L), ItemList.Casing_MiningOsmiridium.get(1L), 50, 16); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1L), ItemList.Casing_MiningNeutronium.get(1L), 50, 16); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackPlutonium, 6L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 1L), ItemList.Casing_MiningBlackPlutonium.get(1L), 50, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 4L), ItemList.Casing_LuV.get(1L), Materials.HSSG.getMolten(288), ItemList.Casing_Fusion.get(1L), 100, 7680); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 4L), ItemList.Casing_Fusion.get(1L), Materials.NaquadahAlloy.getMolten(288), ItemList.Casing_Fusion2.get(1L), 200, 30720); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Magnalium, 6L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1L), ItemList.Casing_Turbine.get(1L), 50, 16); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index b4f43475ed..7dc1c5f166 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -57,6 +57,8 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI GT_ModHandler.addCraftingRecipe(ItemList.Casing_CleanStainlessSteel.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'F', OrePrefixes.frameGt.get(Materials.StainlessSteel)}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_RobustTungstenSteel.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel)}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_MiningOsmiridium.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Osmiridium), 'F', OrePrefixes.frameGt.get(Materials.Osmiridium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_MiningNeutronium.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Neutronium), 'F', OrePrefixes.frameGt.get(Materials.Neutronium)}); + GT_ModHandler.addCraftingRecipe(ItemList.Casing_MiningBlackPlutonium.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.BlackPlutonium), 'F', OrePrefixes.frameGt.get(Materials.BlackPlutonium)}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Magnalium), 'F', OrePrefixes.frameGt.get(Materials.BlueSteel)}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine1.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'F', ItemList.Casing_Turbine}); GT_ModHandler.addCraftingRecipe(ItemList.Casing_Turbine2.get(1L), bits, new Object[]{"PhP", "PFP", aTextPlateWrench, 'P', OrePrefixes.plate.get(Materials.Titanium), 'F', ItemList.Casing_Turbine}); @@ -1235,6 +1237,12 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.OreDrill4.set(new GT_MetaTileEntity_OreDrillingPlant4(1179, "multimachine.oredrill4", "Ore Drilling Plant IV").getStackForm(1)); GT_ModHandler.addCraftingRecipe(ItemList.OreDrill4.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill3, 'W', OrePrefixes.frameGt.get(Materials.Tritanium), 'E', OrePrefixes.circuit.get(Materials.Ultimate), 'C', ItemList.Electric_Motor_ZPM}); + ItemList.OreDrill5.set(new GT_MetaTileEntity_OreDrillingPlant5(1167, "multimachine.oredrill5", "Ore Drilling Plant V").getStackForm(1)); + GT_ModHandler.addCraftingRecipe(ItemList.OreDrill5.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill4, 'W', OrePrefixes.frameGt.get(Materials.Neutronium), 'E', OrePrefixes.circuit.get(Materials.Infinite), 'C', ItemList.Electric_Motor_UV}); + + ItemList.OreDrill6.set(new GT_MetaTileEntity_OreDrillingPlant6(1168, "multimachine.oredrill6", "Ore Drilling Plant VI").getStackForm(1)); + GT_ModHandler.addCraftingRecipe(ItemList.OreDrill6.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill5, 'W', OrePrefixes.frameGt.get(Materials.BlackPlutonium), 'E', OrePrefixes.circuit.get(Materials.Bio), 'C', ItemList.Electric_Motor_UHV}); + ItemList.PyrolyseOven.set(new GT_MetaTileEntity_PyrolyseOven(1159, "multimachine.pyro", "Pyrolyse Oven").getStackForm(1)); GT_ModHandler.addCraftingRecipe(ItemList.PyrolyseOven.get(1L), bitsd, new Object[]{"WEP", "EME", "WCP", 'M', ItemList.Hull_MV, 'W', ItemList.Electric_Piston_MV, 'P', OrePrefixes.wireGt04.get(Materials.Cupronickel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Pump_MV}); diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM.png new file mode 100644 index 0000000000..4f136f7916 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png new file mode 100644 index 0000000000..d47f496e1e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png differ -- cgit From 48bdd67b8bf48dfe5046b8ba5195bfe9ccd2d3b1 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Mon, 6 Apr 2020 17:33:25 +0200 Subject: fix texture fix tier from ore drill tier 6 bump version --- build.properties | 2 +- .../multi/GT_MetaTileEntity_OreDrillingPlant6.java | 4 ++-- .../iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png | Bin 3025 -> 3047 bytes 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/resources') diff --git a/build.properties b/build.properties index d158a562e0..78d8ff17da 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614-1.7.10 -gt.version=5.09.33.36 +gt.version=5.09.33.37-Ore-Drill ae2.version=rv3-beta-22 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java index 55f56c17f4..f3f768a8e8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlant6.java @@ -8,12 +8,12 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; public class GT_MetaTileEntity_OreDrillingPlant6 extends GT_MetaTileEntity_OreDrillingPlantBase { public GT_MetaTileEntity_OreDrillingPlant6(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); - mTier=5; + mTier=6; } public GT_MetaTileEntity_OreDrillingPlant6(String aName) { super(aName); - mTier=5; + mTier=6; } @Override diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png index d47f496e1e..2048b9cad5 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png differ -- cgit From 2c0c536e582e47939e5c8a380fae55ea7c8ed072 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Tue, 7 Apr 2020 11:21:39 +0200 Subject: change Texture of the Ore drill casings a bit --- .../iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM.png | Bin 2957 -> 3012 bytes .../iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png | Bin 3047 -> 3082 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM.png index 4f136f7916..06396d51e8 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png index 2048b9cad5..f97c631271 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MINING_NEUTRONIUM.png differ -- cgit From dcc6fd57abc2141310072ca29b06b036dbc89e47 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Thu, 9 Apr 2020 18:47:07 +0200 Subject: put all Oil and oredrill recipes to Assembler/assline --- .../loaders/postload/GT_MachineRecipeLoader.java | 36 +++++++++++++++++++++- .../preload/GT_Loader_MetaTileEntities.java | 15 --------- src/main/resources/assets/gregtech/lang/en_US.lang | 5 +++ 3 files changed, 40 insertions(+), 16 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index f070b11ec8..c9e359093d 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -1920,6 +1920,15 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 8L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Iridium, 4L), ItemList.neutroniumHeatCapacitor.get(1L), 100, 120000); + GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.Hull_MV.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 4L), ItemList.Electric_Motor_MV.get(6L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 6L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OilDrill1.get(1L), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.OilDrill1.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 8L), ItemList.Electric_Motor_HV.get(8L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 8L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OilDrill2.get(1L), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.OilDrill2.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 12L), ItemList.Electric_Motor_EV.get(10L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 10L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OilDrill3.get(1L), 400, 1920); + + GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.Hull_EV.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L), ItemList.Electric_Motor_EV.get(6L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 6L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OreDrill1.get(1L), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.OreDrill1.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 6L), ItemList.Electric_Motor_IV.get(8L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 8L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OreDrill2.get(1L), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.OreDrill2.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 8L), ItemList.Electric_Motor_LuV.get(10L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 10L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OreDrill3.get(1L), 400, 30720); + GT_Values.RA.addAssemblerRecipe(new ItemStack[] {ItemList.OreDrill3.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 10L), ItemList.Electric_Motor_ZPM.get(12L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 12L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.OreDrill4.get(1L), 400, 122880); + GT_ModHandler.removeRecipe(new ItemStack(Items.lava_bucket), ItemList.Cell_Empty.get(1L)); GT_ModHandler.removeRecipe(new ItemStack(Items.water_bucket), ItemList.Cell_Empty.get(1L)); @@ -2745,7 +2754,32 @@ public class GT_MachineRecipeLoader implements Runnable { Materials.ElectrumFlux.getMolten(1152L), }, ItemList.FusionComputer_UV.get(1), 1000, 90000); - if (GregTech_API.sThaumcraftCompat != null) { + GT_Values.RA.addAssemblylineRecipe(ItemList.OreDrill4.get(1L), 144000, new Object[]{ + ItemList.OreDrill4.get(1), + new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 3}, + new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 3}, + new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 3}, + new Object[]{OrePrefixes.circuit.get(Materials.Infinite), 3}, + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 14L), + ItemList.Electric_Motor_UV.get(14), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(1440), + }, ItemList.OreDrill5.get(1), 400, 500000); + + GT_Values.RA.addAssemblylineRecipe(ItemList.OreDrill5.get(1L), 288000, new Object[]{ + ItemList.OreDrill5.get(1), + new Object[]{OrePrefixes.circuit.get(Materials.Bio), 4}, + new Object[]{OrePrefixes.circuit.get(Materials.Bio), 4}, + new Object[]{OrePrefixes.circuit.get(Materials.Bio), 4}, + new Object[]{OrePrefixes.circuit.get(Materials.Bio), 4}, + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackPlutonium, 16L), + ItemList.Electric_Motor_UHV.get(16), + }, new FluidStack[]{ + Materials.SolderingAlloy.getMolten(2880), + }, ItemList.OreDrill6.get(1), 800, 2000000); + + + if (GregTech_API.sThaumcraftCompat != null) { String tKey = "GT_WOOD_TO_CHARCOAL"; GT_LanguageManager.addStringLocalization(GT_MachineRecipeLoader.aTextTCGTPage + tKey, "You have discovered a way of making charcoal magically instead of using regular ovens for this purpose.

To create charcoal from wood you first need an air-free environment, some vacuus essentia is needed for that, then you need to incinerate the wood using ignis essentia and wait until all the water inside the wood is burned away.

This method however doesn't create creosote oil as byproduct."); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 9b093fe5b9..4bc8883f59 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1219,9 +1219,6 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI ItemList.OilDrill1.set(new GT_MetaTileEntity_OilDrill1(1157, "multimachine.oildrill1", "Oil/Gas/Fluid Drilling Rig").getStackForm(1)); ItemList.OilDrill2.set(new GT_MetaTileEntity_OilDrill2(141, "multimachine.oildrill2", "Oil/Gas/Fluid Drilling Rig II").getStackForm(1)); ItemList.OilDrill3.set(new GT_MetaTileEntity_OilDrill3(142, "multimachine.oildrill3", "Oil/Gas/Fluid Drilling Rig III").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.OilDrill1.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.Hull_MV, 'W', OrePrefixes.frameGt.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Motor_MV}); - GT_ModHandler.addCraftingRecipe(ItemList.OilDrill2.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OilDrill1, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', ItemList.Electric_Motor_HV}); - GT_ModHandler.addCraftingRecipe(ItemList.OilDrill3.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OilDrill2, 'W', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV}); ItemList.ConcreteBackfiller1.set(new GT_MetaTileEntity_ConcreteBackfiller1(143, "multimachine.concretebackfiller1", "Concrete Backfiller").getStackForm(1)); ItemList.ConcreteBackfiller2.set(new GT_MetaTileEntity_ConcreteBackfiller2(144, "multimachine.concretebackfiller3", "Advanced Concrete Backfiller").getStackForm(1)); @@ -1229,27 +1226,15 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI GT_ModHandler.addCraftingRecipe(ItemList.ConcreteBackfiller2.get(1L), bitsd, new Object[]{"WPW", "EME", "CQC", 'M', ItemList.ConcreteBackfiller1, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', ItemList.Electric_Pump_EV}); ItemList.OreDrill1.set(new GT_MetaTileEntity_OreDrillingPlant1(1158, "multimachine.oredrill1", "Ore Drilling Plant").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.OreDrill1.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.Hull_EV, 'W', OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', ItemList.Electric_Motor_EV}); - ItemList.OreDrill2.set(new GT_MetaTileEntity_OreDrillingPlant2(1177, "multimachine.oredrill2", "Ore Drilling Plant II").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.OreDrill2.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill1, 'W', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'E', OrePrefixes.circuit.get(Materials.Elite), 'C', ItemList.Electric_Motor_IV}); - ItemList.OreDrill3.set(new GT_MetaTileEntity_OreDrillingPlant3(1178, "multimachine.oredrill3", "Ore Drilling Plant III").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.OreDrill3.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill2, 'W', OrePrefixes.frameGt.get(Materials.Osmiridium), 'E', OrePrefixes.circuit.get(Materials.Master), 'C', ItemList.Electric_Motor_LuV}); - ItemList.OreDrill4.set(new GT_MetaTileEntity_OreDrillingPlant4(1179, "multimachine.oredrill4", "Ore Drilling Plant IV").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.OreDrill4.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill3, 'W', OrePrefixes.frameGt.get(Materials.Tritanium), 'E', OrePrefixes.circuit.get(Materials.Ultimate), 'C', ItemList.Electric_Motor_ZPM}); - ItemList.OreDrill5.set(new GT_MetaTileEntity_OreDrillingPlant5(1167, "multimachine.oredrill5", "Ore Drilling Plant V").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.OreDrill5.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill4, 'W', OrePrefixes.frameGt.get(Materials.Neutronium), 'E', OrePrefixes.circuit.get(Materials.Infinite), 'C', ItemList.Electric_Motor_UV}); - ItemList.OreDrill6.set(new GT_MetaTileEntity_OreDrillingPlant6(1168, "multimachine.oredrill6", "Ore Drilling Plant VI").getStackForm(1)); - GT_ModHandler.addCraftingRecipe(ItemList.OreDrill6.get(1L), bitsd, new Object[]{"WWW", "EME", "CCC", 'M', ItemList.OreDrill5, 'W', OrePrefixes.frameGt.get(Materials.BlackPlutonium), 'E', OrePrefixes.circuit.get(Materials.Bio), 'C', ItemList.Electric_Motor_UHV}); ItemList.PyrolyseOven.set(new GT_MetaTileEntity_PyrolyseOven(1159, "multimachine.pyro", "Pyrolyse Oven").getStackForm(1)); GT_ModHandler.addCraftingRecipe(ItemList.PyrolyseOven.get(1L), bitsd, new Object[]{"WEP", "EME", "WCP", 'M', ItemList.Hull_MV, 'W', ItemList.Electric_Piston_MV, 'P', OrePrefixes.wireGt04.get(Materials.Cupronickel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Pump_MV}); - ItemList.OilCracker.set(new GT_MetaTileEntity_OilCracker(1160, "multimachine.cracker", "Oil Cracking Unit").getStackForm(1)); GT_ModHandler.addCraftingRecipe(ItemList.OilCracker.get(1L), bitsd, new Object[]{aTextWireCoil, "EME", aTextWireCoil, 'M', ItemList.Hull_HV, 'W', ItemList.Casing_Coil_Cupronickel, 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', ItemList.Electric_Pump_HV}); diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index ad329776db..3f447239ad 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -824,6 +824,11 @@ achievement.gt.blockmachines.multimachine.em.infuser.desc=Pickup this item to se achievement.gt.blockmachines.hatch.holder.tier.09=Object Holder achievement.gt.blockmachines.hatch.holder.tier.09.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.1167=Ore Drill Plant V +achievement.gt.blockmachines.1167.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.1168=Ore Drill Plant VI +achievement.gt.blockmachines.1168.desc=Pickup this item to see the recipe in NEI + achievement.item.StargateShieldingFoil=Stargate-Radiation-Containment-Plate achievement.item.StargateShieldingFoil.desc=Pickup this item to see the recipe in NEI achievement.item.StargateChevron=Stargate Chevron -- cgit From dbda3dd3cfaa024fd5ac280a2ebda6452b41c42c Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Thu, 9 Apr 2020 19:32:22 +0200 Subject: fix archivement ore drill 5 and 6 --- src/main/resources/assets/gregtech/lang/en_US.lang | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 3f447239ad..89b8f0ab02 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -824,10 +824,10 @@ achievement.gt.blockmachines.multimachine.em.infuser.desc=Pickup this item to se achievement.gt.blockmachines.hatch.holder.tier.09=Object Holder achievement.gt.blockmachines.hatch.holder.tier.09.desc=Pickup this item to see the recipe in NEI -achievement.gt.blockmachines.1167=Ore Drill Plant V -achievement.gt.blockmachines.1167.desc=Pickup this item to see the recipe in NEI -achievement.gt.blockmachines.1168=Ore Drill Plant VI -achievement.gt.blockmachines.1168.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.multimachine.oredrill5=Ore Drill Plant V +achievement.gt.blockmachines.multimachine.oredrill5.desc=Pickup this item to see the recipe in NEI +achievement.gt.blockmachines.multimachine.oredrill6=Ore Drill Plant VI +achievement.gt.blockmachines.multimachine.oredrill6.desc=Pickup this item to see the recipe in NEI achievement.item.StargateShieldingFoil=Stargate-Radiation-Containment-Plate achievement.item.StargateShieldingFoil.desc=Pickup this item to see the recipe in NEI -- cgit From 7fbe84d6d9904514137b066d8bd2a34e90e101fe Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Fri, 10 Apr 2020 16:59:07 +0200 Subject: remove archivents from ore drill V and VI --- src/main/resources/assets/gregtech/lang/en_US.lang | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 89b8f0ab02..ad329776db 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -824,11 +824,6 @@ achievement.gt.blockmachines.multimachine.em.infuser.desc=Pickup this item to se achievement.gt.blockmachines.hatch.holder.tier.09=Object Holder achievement.gt.blockmachines.hatch.holder.tier.09.desc=Pickup this item to see the recipe in NEI -achievement.gt.blockmachines.multimachine.oredrill5=Ore Drill Plant V -achievement.gt.blockmachines.multimachine.oredrill5.desc=Pickup this item to see the recipe in NEI -achievement.gt.blockmachines.multimachine.oredrill6=Ore Drill Plant VI -achievement.gt.blockmachines.multimachine.oredrill6.desc=Pickup this item to see the recipe in NEI - achievement.item.StargateShieldingFoil=Stargate-Radiation-Containment-Plate achievement.item.StargateShieldingFoil.desc=Pickup this item to see the recipe in NEI achievement.item.StargateChevron=Stargate Chevron -- cgit From fcca889bacbccd38f617cbcffcdf3dcb67c93238 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Fri, 10 Apr 2020 22:04:22 +0200 Subject: UHV fixes + updated tritanium color Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> --- src/main/java/gregtech/api/enums/Materials.java | 4 ++-- .../loaders/postload/GT_MachineRecipeLoader.java | 8 ++++---- .../gregtech/textures/items/gt.metaitem.03/149.png | Bin 2927 -> 1816 bytes 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 08ee6a14be..90a40e0fff 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -117,7 +117,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Thulium = new Materials( 76, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1|2 |8 |32 , 255, 255, 255, 0, "Thulium" , "Thulium" , 0, 0, 1818, 1818, true, false, 4, 1, 1, Dyes._NULL , Element.Tm , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))); public static Materials Tin = new Materials( 57, TextureSet.SET_DULL , 1.0F, 0, 3, 1|2 |8 |32 |128 , 220, 220, 220, 0, "Tin" , "Tin" , 0, 0, 505, 505, false, false, 3, 1, 1, Dyes.dyeWhite , Element.Sn , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.VITREUS, 1))); public static Materials Titanium = new Materials( 28, TextureSet.SET_METALLIC , 7.0F, 1600, 3, 1|2 |8 |32|64|128 , 220, 160, 240, 0, "Titanium" , "Titanium" , 0, 0, 1941, 1940, true, false, 5, 1, 1, Dyes.dyePurple , Element.Ti , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.TUTAMEN, 1))).disableAutoGeneratedBlastFurnaceRecipes(); - public static Materials Tritanium = new Materials( 329, TextureSet.SET_METALLIC , 20.0F,1435392, 6, 1|2 |64 , 255, 255, 255, 0, "Tritanium" , "Tritanium" , 0, 0, 9900, 9900, true, false, 1, 1, 1, Dyes.dyeWhite , Element.Tn ,Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ORDO, 2))); + public static Materials Tritanium = new Materials( 329, TextureSet.SET_METALLIC , 20.0F,1435392, 6, 1|2 |64 , 96, 0, 0, 0, "Tritanium" , "Tritanium" , 0, 0, 9900, 9900, true, false, 1, 1, 1, Dyes.dyeWhite , Element.Tn ,Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.ORDO, 2))); public static Materials Tritium = new Materials( 3, TextureSet.SET_METALLIC , 1.0F, 0, 2, 16|32 , 255, 0, 0, 240, "Tritium" , "Tritium" , 0, 0, 14, 0, false, true, 10, 1, 1, Dyes.dyeRed , Element.T , Arrays.asList(new TC_AspectStack(TC_Aspects.AQUA, 4))); public static Materials Tungsten = new Materials( 81, TextureSet.SET_METALLIC , 7.0F, 2560, 3, 1|2 |8 |32|64|128 , 50, 50, 50, 0, "Tungsten" , "Tungsten" , 0, 0, 3695, 3000, true, false, 4, 1, 1, Dyes.dyeBlack , Element.W , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 3), new TC_AspectStack(TC_Aspects.TUTAMEN, 1))).disableAutoGeneratedBlastFurnaceRecipes(); public static Materials Uranium = new Materials( 98, TextureSet.SET_METALLIC , 6.0F, 512, 3, 1|2 |8 |32|64 , 50, 240, 50, 0, "Uranium" , "Uranium 238" , 0, 0, 1405, 0, false, false, 4, 1, 1, Dyes.dyeGreen , Element.U , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.RADIO, 1))); @@ -833,7 +833,7 @@ public static Materials Shadow = new Materials( 368, TextureSet public static Materials Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid = new Materials( 991, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 153, 76, 0, 0, "Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid" , "Superconductor Base LuV" , 0, 0, 6000, 6000, true, false, 1, 1, 1, Dyes.dyeBrown , 1, Arrays.asList(new MaterialStack(Indium, 4), new MaterialStack(Tin, 2), new MaterialStack(Barium, 2), new MaterialStack(Titanium, 1), new MaterialStack(Copper, 7), new MaterialStack(Oxygen, 14)), Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 15))); public static Materials Tetranaquadahdiindiumhexaplatiumosminid = new Materials( 992, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 10, 10, 10, 0, "Tetranaquadahdiindiumhexaplatiumosminid" , "Superconductor Base ZPM" , 0, 0, 9000, 9000, true, false, 1, 1, 1, Dyes.dyeBlack , 1, Arrays.asList(new MaterialStack(Naquadah, 4), new MaterialStack(Indium, 2), new MaterialStack(Palladium, 6), new MaterialStack(Osmium, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 18))); public static Materials Longasssuperconductornameforuvwire = new Materials( 986, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 224,210, 7, 0, "Longasssuperconductornameforuvwire" , "Superconductor Base UV" , 0, 0, 9900, 9900, true, false, 1, 1, 1, Dyes.dyeYellow , 1, Arrays.asList(new MaterialStack(Naquadria, 4), new MaterialStack(Osmiridium, 3), new MaterialStack(Europium, 1), new MaterialStack(Samarium, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 21))); - public static Materials Longasssuperconductornameforuhvwire = new Materials( 985, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 255,255, 255, 0, "Longasssuperconductornameforuhvwire" , "Superconductor Base UHV" , 0, 0, 10800, 10800, true, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(DraconiumAwakened, 6), new MaterialStack(CosmicNeutronium, 7), new MaterialStack(InfinityCatalyst, 5), new MaterialStack(Americium, 6)), Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 24))); + public static Materials Longasssuperconductornameforuhvwire = new Materials( 985, TextureSet.SET_METALLIC , 1.0F, 0, 3, 1|2 , 255,255, 255, 0, "Longasssuperconductornameforuhvwire" , "Superconductor Base UHV" , 0, 0, 10800, 10800, true, false, 1, 1, 1, Dyes.dyeWhite , 1, Arrays.asList(new MaterialStack(Draconium, 6), new MaterialStack(CosmicNeutronium, 7), new MaterialStack(Tritanium, 5), new MaterialStack(Americium, 6)), Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 24))); public static Materials SuperconductorMV = new Materials( -1, TextureSet.SET_SHINY , 1.0F, 0, 0, 0 , 85, 85, 85, 0, "SuperconductorMV" , "Superconductor MV" , 0, 0, -1, -1, false, false, 1, 1, 1, Dyes.dyeGray , Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 6))); public static Materials SuperconductorHV = new Materials( -1, TextureSet.SET_SHINY , 1.0F, 0, 0, 0 , 51, 25, 0, 0, "SuperconductorHV" , "Superconductor HV" , 0, 0, -1, -1, false, false, 1, 1, 1, Dyes.dyeBrown , Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 12))); diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 300e8bd63b..fe84340bc7 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -876,7 +876,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, 15L), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Enderium, 10L), ItemList.Electric_Pump_LuV.get(1L), GT_Utility.getIntegratedCircuit(9)}, Materials.Helium.getGas(12000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15L), 700, 7680); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 18L), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 12L), ItemList.Electric_Pump_ZPM.get(1L), GT_Utility.getIntegratedCircuit(9)}, Materials.Helium.getGas(16000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18L), 800, 30720); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21L), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14L), ItemList.Electric_Pump_UV.get(1L), GT_Utility.getIntegratedCircuit(9)}, Materials.Helium.getGas(20000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21L), 1000, 122880); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24L), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.DraconiumAwakened, 16L), ItemList.Electric_Pump_UHV.get(1L), GT_Utility.getIntegratedCircuit(9)}, Materials.Helium.getGas(24000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24L), 1200, 1966080); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24L), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16L), ItemList.Electric_Pump_UHV.get(1L), GT_Utility.getIntegratedCircuit(9)}, Materials.Helium.getGas(24000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24L), 1200, 1966080); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lead, 16L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.ULV_Coil.get(1L), 200, 8); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 16L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.LV_Coil.get(1L), 200, 30); @@ -887,7 +887,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Osmiridium, 16L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.LuV_Coil.get(1L), 200, 30720); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 16L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.ZPM_Coil.get(1L), 200, 122880); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.ElectrumFlux, 16L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.UV_Coil.get(1L), 200, 500000); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.DraconiumAwakened, 16L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.UHV_Coil.get(1L), 200, 2000000); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 16L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.UHV_Coil.get(1L), 200, 2000000); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 6L), GT_Utility.getIntegratedCircuit(2)}, Materials.Glue.getFluid(10), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Wood, 2L), 200, 30); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 3L), GT_Utility.getIntegratedCircuit(4)}, Materials.Glue.getFluid(20), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Wood, 4L), 200, 30); @@ -1782,7 +1782,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2L), ItemList.Casing_LuV.get(1L), Materials.Polytetrafluoroethylene.getMolten(288), ItemList.Hull_LuV.get(1L), 50, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2L), ItemList.Casing_ZPM.get(1L), Materials.Polybenzimidazole.getMolten(288), ItemList.Hull_ZPM.get(1L), 50, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2L), ItemList.Casing_UV.get(1L), Materials.Polybenzimidazole.getMolten(288), ItemList.Hull_UV.get(1L), 50, 16); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 2L), ItemList.Casing_MAX.get(1L), Materials.Polybenzimidazole.getMolten(288), ItemList.Hull_MAX.get(1L), 50, 16); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 2L), ItemList.Casing_MAX.get(1L), Materials.Polybenzimidazole.getMolten(288), ItemList.Hull_MAX.get(1L), 50, 16); } else { GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 2L), ItemList.Casing_ULV.get(1L),ItemList.Hull_ULV.get(1L), 25, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 2L), ItemList.Casing_LV.get(1L),ItemList.Hull_LV.get(1L), 50, 16); @@ -1794,7 +1794,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2L), ItemList.Casing_LuV.get(1L), ItemList.Hull_LuV.get(1L), 50, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2L), ItemList.Casing_ZPM.get(1L), ItemList.Hull_ZPM.get(1L), 50, 16); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 2L), ItemList.Casing_UV.get(1L), ItemList.Hull_UV.get(1L), 50, 16); - GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 2L), ItemList.Casing_MAX.get(1L), ItemList.Hull_MAX.get(1L), 50, 16); + GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 2L), ItemList.Casing_MAX.get(1L), ItemList.Hull_MAX.get(1L), 50, 16); } GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 1L), Materials.Plastic.getMolten(144), ItemList.Battery_Hull_LV.get(1L), 800, 1); GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Copper, 2L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BatteryAlloy, 3L), Materials.Plastic.getMolten(432), ItemList.Battery_Hull_MV.get(1L), 1600, 2); diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png index f030991aee..688e3db584 100644 Binary files a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.png differ -- cgit From 6b59b9a697a32eb5b2332e478c51ff4d7bfb928d Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Sun, 19 Apr 2020 13:48:49 +0200 Subject: More Polybenzimidazole (PBI) Uses in Higher Tier Recipes #5928 https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/5928 --- src/main/java/gregtech/api/enums/ItemList.java | 4 ++++ .../gregtech/common/items/GT_MetaGenerated_Item_03.java | 5 ++++- .../assets/gregtech/textures/items/gt.metaitem.03/24.png | Bin 0 -> 3996 bytes .../assets/gregtech/textures/items/gt.metaitem.03/25.png | Bin 0 -> 3881 bytes .../assets/gregtech/textures/items/gt.metaitem.03/26.png | Bin 0 -> 4043 bytes .../assets/gregtech/textures/items/gt.metaitem.03/27.png | Bin 0 -> 4084 bytes 6 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/24.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/25.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/26.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/27.png (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 9e415b17dc..9b9c03f365 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1604,6 +1604,7 @@ public enum ItemList implements IItemContainer { Circuit_Parts_Resistor, Circuit_Parts_ResistorSMD, + Circuit_Parts_ResistorASMD, Circuit_Parts_Glass_Tube, Circuit_Parts_Reinforced_Glass_Tube, Circuit_Parts_Vacuum_Tube, @@ -1611,10 +1612,13 @@ public enum ItemList implements IItemContainer { Circuit_Parts_Coil, Circuit_Parts_Diode, Circuit_Parts_DiodeSMD, + Circuit_Parts_DiodeASMD, Circuit_Parts_Transistor, Circuit_Parts_TransistorSMD, + Circuit_Parts_TransistorASMD, Circuit_Parts_Capacitor, Circuit_Parts_CapacitorSMD, + Circuit_Parts_CapacitorASMD, Circuit_Parts_GlassFiber, Circuit_Parts_PetriDish, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 682f04bf57..f0cb4024d5 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -58,7 +58,10 @@ public class GT_MetaGenerated_Item_03 ItemList.Circuit_Parts_GlassFiber.set(addItem(tLastID = 21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o)); ItemList.Circuit_Parts_PetriDish.set(addItem(tLastID = 22, "Petri Dish", "For cultivating cells", o)); ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(tLastID = 23, "Reinforced Glass Tube", "", o)); -// + ItemList.Circuit_Parts_ResistorASMD.set(addItem(tLastID = 24, "Advanced SMD Resistor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_DiodeASMD.set(addItem(tLastID = 25, "Advanced SMD Diode", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_TransistorASMD.set(addItem(tLastID = 26, "Advanced SMD Transistor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_CapacitorASMD.set(addItem(tLastID = 27, "Advanced SMD Capacitor", "Advanced Electronic Component", o)); /** * ICs diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/24.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/24.png new file mode 100644 index 0000000000..cf6e98f0e0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/24.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/25.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/25.png new file mode 100644 index 0000000000..fadaf89d62 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/25.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/26.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/26.png new file mode 100644 index 0000000000..6c1b5bcb8d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/26.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/27.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/27.png new file mode 100644 index 0000000000..c5dedac4b5 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/27.png differ -- cgit From b1f29c6c04170c322cc2f7631147a4c8f86160cd Mon Sep 17 00:00:00 2001 From: moller21 <42100910+moller21@users.noreply.github.com> Date: Sun, 3 May 2020 23:55:23 +0200 Subject: Added cover guis for pump/filter --- src/main/java/gregtech/api/gui/GT_GUICover.java | 185 +++++++++++++++++++++ .../api/gui/widgets/GT_GuiFakeItemButton.java | 63 +++++++ .../java/gregtech/api/gui/widgets/GT_GuiIcon.java | 77 +++++++++ .../gregtech/api/gui/widgets/GT_GuiIconButton.java | 111 +++++++++++++ .../gregtech/api/gui/widgets/GT_GuiTooltip.java | 37 +++++ .../api/gui/widgets/GT_GuiTooltipManager.java | 71 ++++++++ .../java/gregtech/api/interfaces/IGuiScreen.java | 35 ++++ .../api/interfaces/tileentity/ICoverable.java | 5 + .../api/metatileentity/BaseMetaPipeEntity.java | 24 ++- .../api/metatileentity/BaseMetaTileEntity.java | 24 ++- .../api/net/GT_Packet_TileEntityCover.java | 99 +++++++++++ .../api/net/GT_Packet_TileEntityCoverGUI.java | 125 ++++++++++++++ .../java/gregtech/api/util/GT_CoverBehavior.java | 18 ++ src/main/java/gregtech/common/GT_Client.java | 2 +- src/main/java/gregtech/common/GT_Network.java | 2 +- src/main/java/gregtech/common/GT_Proxy.java | 20 ++- .../common/covers/GT_Cover_Fluidfilter.java | 173 ++++++++++++++++--- .../java/gregtech/common/covers/GT_Cover_Pump.java | 170 ++++++++++++++++--- .../assets/gregtech/textures/gui/GuiButtons.png | Bin 0 -> 9499 bytes .../assets/gregtech/textures/gui/GuiCover.png | Bin 0 -> 6998 bytes 20 files changed, 1187 insertions(+), 54 deletions(-) create mode 100644 src/main/java/gregtech/api/gui/GT_GUICover.java create mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java create mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java create mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java create mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java create mode 100644 src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java create mode 100644 src/main/java/gregtech/api/interfaces/IGuiScreen.java create mode 100644 src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java create mode 100644 src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java create mode 100644 src/main/resources/assets/gregtech/textures/gui/GuiButtons.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/GuiCover.png (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/api/gui/GT_GUICover.java b/src/main/java/gregtech/api/gui/GT_GUICover.java new file mode 100644 index 0000000000..760d888c02 --- /dev/null +++ b/src/main/java/gregtech/api/gui/GT_GUICover.java @@ -0,0 +1,185 @@ +package gregtech.api.gui; + +import gregtech.api.enums.Dyes; +import gregtech.api.gui.widgets.GT_GuiTooltip; +import gregtech.api.gui.widgets.GT_GuiTooltipManager; +import gregtech.api.gui.widgets.GT_GuiTooltipManager.GT_IToolTipRenderer; +import gregtech.api.interfaces.IGuiScreen; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import java.util.ArrayList; +import java.util.List; + +public abstract class GT_GUICover extends GuiScreen implements GT_IToolTipRenderer, IGuiScreen { + + protected GT_GuiTooltipManager ttManager = new GT_GuiTooltipManager(); + + protected int gui_width = 176; + protected int gui_height = 107; + protected int guiTop, guiLeft; + protected boolean drawButtons = true; + private GuiButton selectedButton; + + protected List elements = new ArrayList<>(); + + public GT_GUICover() { + } + + public GT_GUICover(int width, int height) { + this.gui_width = width; + this.gui_height = height; + } + + @Override + public void initGui() { + guiLeft = (this.width - this.gui_width) / 2; + guiTop = (this.height - this.gui_height) / 2; + + for (IGuiElement element : elements) { + element.onInit(); + + if (element instanceof GuiButton) + buttonList.add(element); + } + + onInitGui(guiLeft, guiTop, gui_width, gui_height); + } + + protected abstract void onInitGui(int guiLeft, int guiTop, int gui_width, int gui_height); + + @Override + public void drawScreen(int mouseX, int mouseY, float parTicks) { + drawDefaultBackground(); + + drawBackground(mouseX, mouseY, parTicks); + + RenderHelper.disableStandardItemLighting(); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_DEPTH_TEST); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + if (drawButtons) { + RenderHelper.enableGUIStandardItemLighting(); + for (IGuiElement e : elements) + e.draw(mouseX, mouseY, parTicks); + } + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + + GL11.glPushMatrix(); + GL11.glTranslatef(guiLeft, guiTop, 0.0F); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + GL11.glDisable(GL11.GL_LIGHTING); + drawForegroundLayer(mouseX, mouseY, parTicks); + GL11.glEnable(GL11.GL_LIGHTING); + + GL11.glPopMatrix(); + + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_DEPTH_TEST); + RenderHelper.enableStandardItemLighting(); + } + + public void drawForegroundLayer(int mouseX, int mouseY, float parTicks) { + drawExtras(mouseX, mouseY, parTicks); + ttManager.onTick(this, mouseX, mouseY); + } + + public void drawBackground(int mouseX, int mouseY, float parTicks) { + short[] color = Dyes.MACHINE_METAL.getRGBA(); + GL11.glColor3ub((byte) color[0], (byte) color[1], (byte) color[2]); + this.mc.renderEngine.bindTexture(new ResourceLocation("gregtech:textures/gui/GuiCover.png")); + drawTexturedModalRect(guiLeft, guiTop, 0,0, gui_width, gui_height); + } + + public void drawExtras(int mouseX, int mouseY, float parTicks) {} + + @Override + public boolean doesGuiPauseGame() + { + return false; + } + + public void keyTyped(char p_73869_1_, int p_73869_2_) { + if (p_73869_2_ == this.mc.gameSettings.keyBindInventory.getKeyCode()) { + this.mc.displayGuiScreen((GuiScreen) null); + this.mc.setIngameFocus(); + return; + } + super.keyTyped(p_73869_1_, p_73869_2_); + } + + @Override + public void addElement(IGuiElement element) { + if (elements.contains(element)) + return; + elements.add(element); + } + @Override + public boolean removeElement(IGuiElement element) { + return elements.remove(element); + } + + public void actionPerformed(GuiButton button) { + selectedButton = button; + } + + public void clearSelectedButton() { + selectedButton = null; + } + public GuiButton getSelectedButton(){return selectedButton;} + + public void buttonClicked(GuiButton button) { + + } + + public RenderItem getItemRenderer() { + return itemRender; + } + + /** + * GT_IToolTipRenderer + */ + @Override + public void drawHoveringText(List par1List, int par2, int par3, FontRenderer render) { + super.drawHoveringText(par1List, par2, par3, render); + } + @Override + public FontRenderer getFontRenderer() { + return super.fontRendererObj; + } + @Override + public void addToolTip(GT_GuiTooltip toolTip) { + ttManager.addToolTip(toolTip); + } + @Override + public boolean removeToolTip(GT_GuiTooltip toolTip) { + return ttManager.removeToolTip(toolTip); + } + + /** + * Junk + */ + @Override + public int getGuiTop() { + return guiTop; + } + @Override + public int getGuiLeft() { + return guiLeft; + } + @Override + public int getXSize() { + return gui_width; + } + @Override + public int getYSize() { + return gui_height; + } +} diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java new file mode 100644 index 0000000000..25af30965a --- /dev/null +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiFakeItemButton.java @@ -0,0 +1,63 @@ +package gregtech.api.gui.widgets; + +import gregtech.api.interfaces.IGuiScreen; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; + +import java.awt.*; + +public class GT_GuiFakeItemButton implements IGuiScreen.IGuiElement { + + private final GT_GuiIcon bgIcon; + private ItemStack item; + private IGuiScreen gui; + private int x0, y0, xPosition, yPosition; + private int width, height; + + public GT_GuiFakeItemButton(IGuiScreen gui, int x, int y, GT_GuiIcon bgIcon) { + this.gui = gui; + this.x0 = x; + this.y0 = y; + this.bgIcon = bgIcon; + item = null; + width = 18; + height = 18; + gui.addElement(this); + } + + public void setItem(ItemStack i) { + item = i; + } + + public ItemStack getItem(){ + return item; + } + + @Override + public void onInit() { + xPosition = x0 + gui.getGuiLeft(); + yPosition = y0 + gui.getGuiTop(); + } + + @Override + public void draw(int mouseX, int mouseY, float parTicks) { + GL11.glColor4f(1, 1, 1, 1); + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + if (bgIcon != null){ + GT_GuiIcon.render(bgIcon, xPosition-1, yPosition-1, 18, 18,0,true); + } + + if (item != null) + gui.getItemRenderer().renderItemAndEffectIntoGUI(gui.getFontRenderer(), Minecraft.getMinecraft().getTextureManager(), item, xPosition, yPosition); + + GL11.glPopAttrib(); + } + + public Rectangle getBounds() { + return new Rectangle(x0, y0, width, height); + } +} diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java new file mode 100644 index 0000000000..1c31462e62 --- /dev/null +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java @@ -0,0 +1,77 @@ +package gregtech.api.gui.widgets; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.ResourceLocation; + +public enum GT_GuiIcon { + BUTTON_NORMAL (0, 0, 0), + BUTTON_DOWN (0, 32, 0), + BUTTON_HIGHLIGHT (0, 32*2, 0), + BUTTON_HIGHLIGHT_DOWN (0, 32*3, 0), + BUTTON_DISABLED (0, 32*4, 0), + + DISABLE (0, 0, 32), + REDSTONE_OFF (0, 32, 32), + REDSTONE_ON (0, 32*2, 32), + CHECKMARK (0, 32*3, 32), + CROSS (0, 32*4, 32), + WHITELIST (0, 32*5, 32), + BLACKLIST (0, 32*6, 32), + + EXPORT (0, 0, 32*2), + IMPORT (0, 32, 32*2), + ALLOW_INPUT (0, 32*2, 32*2), + BLOCK_INPUT (0, 32*3, 32*2), + + SLOT_DARKGRAY (1, 176,0,18,18), + SLOT_GRAY (1, 176,18,18,18); + + private static final int T_SIZE = 256; + private static final ResourceLocation[] TEXTURES = { + new ResourceLocation("gregtech", "textures/gui/GuiButtons.png"), + new ResourceLocation("gregtech", "textures/gui/GuiCover.png") + }; + + public final int x, y, width, height; + public final GT_GuiIcon overlay; + private final int texID; + + GT_GuiIcon(int texID, int x, int y, int width, int height, GT_GuiIcon overlay) { + this.x = x; + this.y = y; + this.width = width; + this.height = height; + this.overlay = overlay; + this.texID = texID; + } + + GT_GuiIcon(int texID, int x, int y) { + this(texID, x, y,32,32,null); + } + GT_GuiIcon(int texID, int x, int y, int width, int height) { + this(texID, x, y, width, height,null); + } + + public static void render(GT_GuiIcon icon, double x, double y, double width, double height, double zLevel, boolean doDraw) { + Tessellator tess = Tessellator.instance; + if (doDraw) { + Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURES[icon.texID]); + tess.startDrawingQuads(); + } + double minU = (double) icon.x / T_SIZE; + double maxU = (double) (icon.x + icon.width) / T_SIZE; + double minV = (double) icon.y / T_SIZE; + double maxV = (double) (icon.y + icon.height) / T_SIZE; + tess.addVertexWithUV(x, y + height, zLevel, minU, maxV); + tess.addVertexWithUV(x + width, y + height, zLevel, maxU, maxV); + tess.addVertexWithUV(x + width, y + 0, zLevel, maxU, minV); + tess.addVertexWithUV(x, y + 0, zLevel, minU, minV); + + if (icon.overlay != null) + render(icon.overlay, x, y, width, height, zLevel, false); + + if (doDraw) + tess.draw(); + } +} diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java new file mode 100644 index 0000000000..bd1e921592 --- /dev/null +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIconButton.java @@ -0,0 +1,111 @@ +package gregtech.api.gui.widgets; + +import gregtech.api.interfaces.IGuiScreen; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import org.lwjgl.opengl.GL11; +import java.awt.Rectangle; + +public class GT_GuiIconButton extends GuiButton implements IGuiScreen.IGuiElement { + public static final int DEFAULT_WIDTH = 16; + public static final int DEFAULT_HEIGHT = 16; + + protected GT_GuiIcon icon; + private int x0, y0; + private IGuiScreen gui; + private String[] tooltipText; + + private GT_GuiTooltip tooltip; + + + public GT_GuiIconButton(IGuiScreen gui, int id, int x, int y, GT_GuiIcon icon) { + super(id, x, y, DEFAULT_WIDTH, DEFAULT_HEIGHT, ""); + this.gui = gui; + this.icon = icon; + this.x0 = x; + this.y0 = y; + gui.addElement(this); + } + + public void onInit() { + if (tooltip != null) + gui.addToolTip(tooltip); + xPosition = x0 + gui.getGuiLeft(); + yPosition = y0 + gui.getGuiTop(); + } + + @Override + public void draw(int mouseX, int mouseY, float parTicks) { + drawButton(Minecraft.getMinecraft(), mouseX, mouseY); + } + + public void drawButton(Minecraft mc, int mouseX, int mouseY) { + if (this.tooltip != null) + this.tooltip.enabled = true; + + if (this.visible) { + //moused over + this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + width && mouseY < this.yPosition + height; + + mouseDragged(mc, mouseX, mouseY); + + GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + int x = xPosition; + int y = yPosition; + if(!this.field_146123_n) { + GL11.glColor4f(160F/255F, 170F/255F, 1, 1); + } + else + GL11.glColor4f(1, 1, 1, 1); + + GT_GuiIcon.render(getButtonTexture(this.field_146123_n), x, y, width, height, 0, true); + + GL11.glColor4f(1, 1, 1, 1); + if (icon != null) { + GT_GuiIcon.render(icon, x, y, width, height , 0, true); + } + + GL11.glPopAttrib(); + } + } + + @Override + public void mouseReleased(int mouseX, int mouseY) { + this.gui.clearSelectedButton(); + if(mousePressed(Minecraft.getMinecraft(), mouseX, mouseY)) + this.gui.buttonClicked(this); + } + + public GT_GuiIcon getButtonTexture(boolean mouseOver) { + if (!enabled) + return GT_GuiIcon.BUTTON_DISABLED; + if (this.equals(this.gui.getSelectedButton())) + return mouseOver ? GT_GuiIcon.BUTTON_HIGHLIGHT_DOWN : GT_GuiIcon.BUTTON_DOWN; + else + return mouseOver ? GT_GuiIcon.BUTTON_HIGHLIGHT : GT_GuiIcon.BUTTON_NORMAL; + } + + public GT_GuiIcon getIcon() { + return icon; + } + + public GT_GuiTooltip getTooltip() { + return tooltip; + } + + public GT_GuiIconButton setTooltipText(String... text) { + if (tooltip == null) + tooltip = new GT_GuiTooltip(getBounds(), text); + else + tooltip.setToolTipText(text); + this.tooltipText = text; + return this; + } + + public Rectangle getBounds() { + return new Rectangle(x0, y0, width, height); + } +} diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java new file mode 100644 index 0000000000..d24437f018 --- /dev/null +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java @@ -0,0 +1,37 @@ +package gregtech.api.gui.widgets; + +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + +public class GT_GuiTooltip { + + protected Rectangle bounds; + private List text; + public boolean enabled = true; + + public GT_GuiTooltip(Rectangle bounds, String... text) { + this.bounds = bounds; + setToolTipText(text); + } + + protected void updateText() { + } + + public void setToolTipText(String... text) { + if (text != null) { + this.text = new ArrayList<>(text.length); + for (int i = 0; i < text.length; i++) { + if (i == 0) + this.text.add("\u00a7f" + text[i]); + else + this.text.add("\u00a77" + text[i]); + } + } else + this.text = new ArrayList<>(); + } + + public List getToolTipText() { + return text; + } +} diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java new file mode 100644 index 0000000000..d0e6964abc --- /dev/null +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltipManager.java @@ -0,0 +1,71 @@ +package gregtech.api.gui.widgets; + +import net.minecraft.client.gui.FontRenderer; + +import java.util.ArrayList; +import java.util.List; + +public class GT_GuiTooltipManager { + public interface GT_IToolTipRenderer { + int getGuiLeft(); + int getGuiTop(); + int getXSize(); + FontRenderer getFontRenderer(); + void drawHoveringText(List par1List, int par2, int par3, FontRenderer font); + } + + private static final long DELAY = 5; + private int mouseStopped; + private int lastMouseX = -1; + private int lastMouseY = -1; + private final List tips = new ArrayList<>(); + + public void addToolTip(GT_GuiTooltip tip) { + if (!tips.contains(tip)) tips.add(tip); + } + + public boolean removeToolTip(GT_GuiTooltip tip) { + return tips.remove(tip); + } + + public final void onTick(GT_IToolTipRenderer render, int mouseX, int mouseY) { + if ((Math.abs(mouseX-lastMouseX) < 2 ) && (Math.abs(mouseY-lastMouseY) < 2 )) + mouseStopped = Math.min(mouseStopped+1, 50); + else + mouseStopped = 0; + + lastMouseX = mouseX; + lastMouseY = mouseY; + + if (mouseStopped > DELAY) + mouseX -= render.getGuiLeft(); + mouseY -= render.getGuiTop(); + for (GT_GuiTooltip tip : tips) { + if(tip.enabled && tip.bounds.contains(mouseX, mouseY)){ + tip.updateText(); + drawTooltip(tip, mouseX, mouseY, render); + break; + } + } + } + + private void drawTooltip(GT_GuiTooltip tip, int mouseX, int mouseY, GT_IToolTipRenderer render) { + List text = tip.getToolTipText(); + if (text == null) + return; + + if (mouseX > render.getGuiLeft() + render.getXSize()/2) { + int maxWidth = 0; + for (String s : text) { + int w = render.getFontRenderer().getStringWidth(s); + if (w > maxWidth) { + maxWidth = w; + } + } + mouseX -= (maxWidth + 18); + } + + render.drawHoveringText(text, mouseX, mouseY, render.getFontRenderer()); + } + +} diff --git a/src/main/java/gregtech/api/interfaces/IGuiScreen.java b/src/main/java/gregtech/api/interfaces/IGuiScreen.java new file mode 100644 index 0000000000..d0089afbb8 --- /dev/null +++ b/src/main/java/gregtech/api/interfaces/IGuiScreen.java @@ -0,0 +1,35 @@ +package gregtech.api.interfaces; + +import gregtech.api.gui.widgets.GT_GuiTooltip; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.entity.RenderItem; + + +public interface IGuiScreen { + + interface IGuiElement { + void onInit(); + void draw(int mouseX, int mouseY, float parTicks); + } + + void addToolTip(GT_GuiTooltip toolTip); + + boolean removeToolTip(GT_GuiTooltip toolTip); + + GuiButton getSelectedButton(); + void clearSelectedButton(); + void buttonClicked(GuiButton button); + + int getGuiLeft(); + int getGuiTop(); + + int getXSize(); + int getYSize(); + + void addElement(IGuiElement element); + boolean removeElement(IGuiElement element); + + RenderItem getItemRenderer(); + FontRenderer getFontRenderer(); +} diff --git a/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java b/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java index 912dc554c0..76d121b8da 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java @@ -41,4 +41,9 @@ public interface ICoverable extends IRedstoneTileEntity, IHasInventory, IBasicEn * Sends 6 Integers to Client + causes @issueTextureUpdate() */ void issueCoverUpdate(byte aSide); + + /** + * Receiving a packet with cover data. + */ + void receiveCoverData(byte coverSide, int coverID, int coverData); } \ No newline at end of file diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index ae8fc7324d..439da50f24 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -461,6 +461,12 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE issueClientUpdate(); } + @Override + public void receiveCoverData(byte coverSide, int coverID, int coverData) { + if ((coverSide >= 0 && coverSide < 6) && (mCoverSides[coverSide] == coverID)) + setCoverDataAtSide(coverSide, coverData); + } + @Override public byte getStrongestRedstone() { return (byte) Math.max(getInternalInputRedstoneSignal((byte) 0), Math.max(getInternalInputRedstoneSignal((byte) 1), Math.max(getInternalInputRedstoneSignal((byte) 2), Math.max(getInternalInputRedstoneSignal((byte) 3), Math.max(getInternalInputRedstoneSignal((byte) 4), getInternalInputRedstoneSignal((byte) 5)))))); @@ -798,6 +804,15 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE return hasValidMetaTileEntity() && !isDead; } + public boolean shouldDisplayWrenchGrid(ItemStack heldItem, byte side) { + return (getCoverIDAtSide(side) == 0) && ( + GT_Utility.isStackInList(heldItem, GregTech_API.sCovers.keySet()) || + GT_Utility.isStackInList(heldItem, GregTech_API.sCrowbarList) || + GT_Utility.isStackInList(heldItem, GregTech_API.sWireCutterList) || + GT_Utility.isStackInList(heldItem, GregTech_API.sScrewdriverList) || + GT_Utility.isStackInList(heldItem, GregTech_API.sSolderingToolList)); + } + @Override public void doExplosion(long aAmount) { if (canAccessData()) { @@ -826,7 +841,14 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE @Override public boolean onRightclick(EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) { if (isClientSide()) { - if (getCoverBehaviorAtSide(aSide).onCoverRightclickClient(aSide, this, aPlayer, aX, aY, aZ)) return true; + byte tSide = aSide; + ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem(); + + if (shouldDisplayWrenchGrid(tCurrentItem, aSide)) { + tSide = GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ); + } + + if (getCoverBehaviorAtSide(tSide).onCoverRightclickClient(tSide, this, aPlayer, aX, aY, aZ)) return true; } if (isServerSide()) { ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem(); diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 1ae88ade41..52c010afbd 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -781,6 +781,12 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE issueClientUpdate(); } + @Override + public void receiveCoverData(byte coverSide, int coverID, int coverData) { + if ((coverSide >= 0 && coverSide < 6) && (mCoverSides[coverSide] == coverID)) + setCoverDataAtSide(coverSide, coverData); + } + @Override public byte getStrongestRedstone() { return (byte) Math.max(getInternalInputRedstoneSignal((byte) 0), Math.max(getInternalInputRedstoneSignal((byte) 1), Math.max(getInternalInputRedstoneSignal((byte) 2), Math.max(getInternalInputRedstoneSignal((byte) 3), Math.max(getInternalInputRedstoneSignal((byte) 4), getInternalInputRedstoneSignal((byte) 5)))))); @@ -1312,6 +1318,15 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE return (mMuffler ? 1 : 0) + (mLockUpgrade ? 1 : 0) + (mSteamConverter ? 1 : 0) + mOtherUpgrades; } + public boolean shouldDisplayWrenchGrid(ItemStack heldItem, byte side) { + return (getCoverIDAtSide(side) == 0) && ( + GT_Utility.isStackInList(heldItem, GregTech_API.sCovers.keySet()) || + GT_Utility.isStackInList(heldItem, GregTech_API.sCrowbarList) || + GT_Utility.isStackInList(heldItem, GregTech_API.sWireCutterList) || + GT_Utility.isStackInList(heldItem, GregTech_API.sScrewdriverList) || + GT_Utility.isStackInList(heldItem, GregTech_API.sSolderingToolList)); + } + @Override public boolean onRightclick(EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) { if (isClientSide()) { @@ -1397,10 +1412,11 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE return true; } - if (getCoverIDAtSide(aSide) == 0) { + byte tSide = GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ); + if (getCoverIDAtSide(tSide) == 0) { if (GregTech_API.sCovers.containsKey(new GT_ItemStack(tCurrentItem))) { - if (GregTech_API.getCoverBehavior(tCurrentItem).isCoverPlaceable(aSide, new GT_ItemStack(tCurrentItem), this) && mMetaTileEntity.allowCoverOnSide(aSide, new GT_ItemStack(tCurrentItem))) { - setCoverItemAtSide(aSide, tCurrentItem); + if (GregTech_API.getCoverBehavior(tCurrentItem).isCoverPlaceable(tSide, new GT_ItemStack(tCurrentItem), this) && mMetaTileEntity.allowCoverOnSide(aSide, new GT_ItemStack(tCurrentItem))) { + setCoverItemAtSide(tSide, tCurrentItem); if (!aPlayer.capabilities.isCreativeMode) tCurrentItem.stackSize--; GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, xCoord, yCoord, zCoord); } @@ -1410,7 +1426,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCrowbarList)) { if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) { GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(0), 1.0F, -1, xCoord, yCoord, zCoord); - dropCover(aSide, aSide, false); + dropCover(tSide, aSide, false); } return true; } diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java new file mode 100644 index 0000000000..bc688f47ed --- /dev/null +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCover.java @@ -0,0 +1,99 @@ +package gregtech.api.net; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; +import gregtech.api.interfaces.tileentity.ICoverable; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; + +/** + * Client -> Server: Update cover data + */ + +public class GT_Packet_TileEntityCover extends GT_Packet { + protected int mX; + protected short mY; + protected int mZ; + + protected byte side; + protected int coverID, coverData, dimID; + + public GT_Packet_TileEntityCover() { + super(true); + } + + public GT_Packet_TileEntityCover(int mX, short mY, int mZ, byte coverSide, int coverID, int coverData, int dimID) { + super(false); + this.mX = mX; + this.mY = mY; + this.mZ = mZ; + + this.side = coverSide; + this.coverID = coverID; + this.coverData = coverData; + + this.dimID = dimID; + } + public GT_Packet_TileEntityCover(byte coverSide, int coverID, int coverData, ICoverable tile) { + super(false); + this.mX = tile.getXCoord(); + this.mY = tile.getYCoord(); + this.mZ = tile.getZCoord(); + + this.side = coverSide; + this.coverID = coverID; + this.coverData = coverData; + + this.dimID = tile.getWorld().provider.dimensionId; + } + + @Override + public byte getPacketID() { + return 6; + } + + @Override + public byte[] encode() { + ByteArrayDataOutput tOut = ByteStreams.newDataOutput(4+2+4+1+4+4+4); + tOut.writeInt(mX); + tOut.writeShort(mY); + tOut.writeInt(mZ); + + tOut.writeByte(side); + tOut.writeInt(coverID); + tOut.writeInt(coverData); + + tOut.writeInt(dimID); + + return tOut.toByteArray(); + } + + @Override + public GT_Packet decode(ByteArrayDataInput aData) { + return new GT_Packet_TileEntityCover( + aData.readInt(), + aData.readShort(), + aData.readInt(), + + aData.readByte(), + aData.readInt(), + aData.readInt(), + + aData.readInt()); + } + + @Override + public void process(IBlockAccess aWorld) { + World world = DimensionManager.getWorld(dimID); + if (world != null) { + TileEntity tile = world.getTileEntity(mX, mY, mZ); + if (tile instanceof IGregTechTileEntity && !((IGregTechTileEntity) tile).isDead()) { + ((IGregTechTileEntity) tile).receiveCoverData(side, coverID, coverData); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java new file mode 100644 index 0000000000..58ebf95ac6 --- /dev/null +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java @@ -0,0 +1,125 @@ +package gregtech.api.net; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; +import gregtech.api.enums.GT_Values; +import gregtech.api.interfaces.tileentity.ICoverable; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.common.GT_Proxy; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +/** + * Server -> Client: Show GUI + */ + +public class GT_Packet_TileEntityCoverGUI extends GT_Packet { + protected int mX; + protected short mY; + protected int mZ; + + protected byte side; + protected int coverID, coverData, dimID, playerID; + + public GT_Packet_TileEntityCoverGUI() { + super(true); + } + + public GT_Packet_TileEntityCoverGUI(int mX, short mY, int mZ, byte coverSide, int coverID, int coverData, int dimID, int playerID) { + super(false); + this.mX = mX; + this.mY = mY; + this.mZ = mZ; + + this.side = coverSide; + this.coverID = coverID; + this.coverData = coverData; + + this.dimID = dimID; + this.playerID = playerID; + } + + + public GT_Packet_TileEntityCoverGUI(byte side, int coverID, int coverData, ICoverable tile, EntityPlayerMP aPlayer) { + super(false); + + this.mX = tile.getXCoord(); + this.mY = tile.getYCoord(); + this.mZ = tile.getZCoord(); + + this.side = side; + this.coverID = coverID; + this.coverData = coverData; + + this.dimID = tile.getWorld().provider.dimensionId; + this.playerID = aPlayer.getEntityId(); + } + + public GT_Packet_TileEntityCoverGUI(byte coverSide, int coverID, int coverData, IGregTechTileEntity tile) { + super(false); + this.mX = tile.getXCoord(); + this.mY = tile.getYCoord(); + this.mZ = tile.getZCoord(); + + this.side = coverSide; + this.coverID = coverID; + this.coverData = coverData; + + this.dimID = tile.getWorld().provider.dimensionId; + } + + @Override + public byte getPacketID() { + return 7; + } + + @Override + public byte[] encode() { + ByteArrayDataOutput tOut = ByteStreams.newDataOutput(4+2+4+1+4+4+4+4); + tOut.writeInt(mX); + tOut.writeShort(mY); + tOut.writeInt(mZ); + + tOut.writeByte(side); + tOut.writeInt(coverID); + tOut.writeInt(coverData); + + tOut.writeInt(dimID); + tOut.writeInt(playerID); + + return tOut.toByteArray(); + } + + @Override + public GT_Packet decode(ByteArrayDataInput aData) { + return new GT_Packet_TileEntityCoverGUI( + aData.readInt(), + aData.readShort(), + aData.readInt(), + + aData.readByte(), + aData.readInt(), + aData.readInt(), + + aData.readInt(), + aData.readInt()); + } + + @Override + public void process(IBlockAccess aWorld) { + if (aWorld instanceof World) { + EntityClientPlayerMP a = Minecraft.getMinecraft().thePlayer; + TileEntity tile = aWorld.getTileEntity(mX, mY, mZ); + if (tile instanceof IGregTechTileEntity && !((IGregTechTileEntity) tile).isDead()) { + + ((IGregTechTileEntity) tile).setCoverDataAtSide(side, coverData); //Set it client side to read later. + a.openGui(GT_Values.GT, GT_Proxy.GUI_ID_COVER_SIDE_BASE + side, a.worldObj, mX, mY, mZ); + } + } + } +} \ No newline at end of file diff --git a/src/main/java/gregtech/api/util/GT_CoverBehavior.java b/src/main/java/gregtech/api/util/GT_CoverBehavior.java index a540601dd1..38c01b9d92 100644 --- a/src/main/java/gregtech/api/util/GT_CoverBehavior.java +++ b/src/main/java/gregtech/api/util/GT_CoverBehavior.java @@ -1,8 +1,11 @@ package gregtech.api.util; +import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.tileentity.ICoverable; +import gregtech.api.net.GT_Packet_TileEntityCoverGUI; import gregtech.api.objects.GT_ItemStack; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -43,9 +46,24 @@ public abstract class GT_CoverBehavior { * return the new Value of the Cover Variable */ public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + if (!hasCoverGUI()) + return aCoverVariable; + + if(aPlayer instanceof EntityPlayerMP) { + GT_Values.NW.sendToPlayer(new GT_Packet_TileEntityCoverGUI(aSide, aCoverID, aCoverVariable, aTileEntity, (EntityPlayerMP) aPlayer), (EntityPlayerMP) aPlayer); + } + return aCoverVariable; } + public boolean hasCoverGUI() { + return false; + } + + public Object getClientGUI(byte aSide, int aCoverID, int coverData, ICoverable aTileEntity) { + return null; + } + /** * Checks if the Cover can be placed on this. */ diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index 978afd9e06..9b7bdbfed6 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -446,7 +446,7 @@ public class GT_Client extends GT_Proxy TileEntity aTileEntity = aEvent.player.worldObj.getTileEntity(aEvent.target.blockX, aEvent.target.blockY, aEvent.target.blockZ); try { Class.forName("codechicken.lib.vec.Rotation"); - if (((aTileEntity instanceof BaseMetaPipeEntity)) && (((ICoverable) aTileEntity).getCoverIDAtSide((byte) aEvent.target.sideHit) == 0) && ((GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCovers.keySet())) || (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sCrowbarList)) || (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sWireCutterList)) || (GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sScrewdriverList))|| GT_Utility.isStackInList(aEvent.currentItem, GregTech_API.sSolderingToolList))) { + if ((aTileEntity instanceof BaseMetaPipeEntity) && ((BaseMetaPipeEntity) aTileEntity).shouldDisplayWrenchGrid(aEvent.currentItem, (byte) aEvent.target.sideHit)) { drawGrid(aEvent); return; } diff --git a/src/main/java/gregtech/common/GT_Network.java b/src/main/java/gregtech/common/GT_Network.java index 1b315c3085..5fd315b7ce 100644 --- a/src/main/java/gregtech/common/GT_Network.java +++ b/src/main/java/gregtech/common/GT_Network.java @@ -35,7 +35,7 @@ public class GT_Network public GT_Network() { this.mChannel = NetworkRegistry.INSTANCE.newChannel("GregTech", new ChannelHandler[]{this, new HandlerShared()}); - this.mSubChannels = new GT_Packet[]{new GT_Packet_TileEntity(), new GT_Packet_Sound(), new GT_Packet_Block_Event(), new GT_Packet_Ores(), new GT_Packet_Pollution(), new MessageSetFlaskCapacity()}; + this.mSubChannels = new GT_Packet[]{new GT_Packet_TileEntity(), new GT_Packet_Sound(), new GT_Packet_Block_Event(), new GT_Packet_Ores(), new GT_Packet_Pollution(), new MessageSetFlaskCapacity(), new GT_Packet_TileEntityCover(), new GT_Packet_TileEntityCoverGUI()}; } protected void encode(ChannelHandlerContext aContext, GT_Packet aPacket, List aOutput) diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index d21491adea..26b971a093 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -219,6 +219,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public boolean gt6Cable = true; public boolean ic2EnergySourceCompat = true; public boolean costlyCableConnection = false; + public static final int GUI_ID_COVER_SIDE_BASE = 10; // Takes GUI ID 10 - 15 public GT_Proxy() { GameRegistry.registerFuelHandler(this); @@ -1529,6 +1530,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if ((tTileEntity instanceof IGregTechTileEntity)) { + if (GUI_ID_COVER_SIDE_BASE <= aID && aID < GUI_ID_COVER_SIDE_BASE+6) { + return null; + } IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity(); if (tMetaTileEntity != null) { return tMetaTileEntity.getServerGUI(aID, aPlayer.inventory, (IGregTechTileEntity) tTileEntity); @@ -1553,6 +1557,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } + @Override public Object getClientGuiElement(int aID, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) { if(aID>=1000){ int ID = aID-1000; @@ -1585,9 +1590,20 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { } TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if ((tTileEntity instanceof IGregTechTileEntity)) { - IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity(); + IGregTechTileEntity tile = (IGregTechTileEntity) tTileEntity; + + if (GUI_ID_COVER_SIDE_BASE <= aID && aID < GUI_ID_COVER_SIDE_BASE+6) { + byte side = (byte) (aID - GT_Proxy.GUI_ID_COVER_SIDE_BASE); + GT_CoverBehavior cover = tile.getCoverBehaviorAtSide(side); + + if (cover.hasCoverGUI()) { + return cover.getClientGUI(side, tile.getCoverIDAtSide(side), tile.getCoverDataAtSide(side), tile); + } + return null; + } + IMetaTileEntity tMetaTileEntity = tile.getMetaTileEntity(); if (tMetaTileEntity != null) { - return tMetaTileEntity.getClientGUI(aID, aPlayer.inventory, (IGregTechTileEntity) tTileEntity); + return tMetaTileEntity.getClientGUI(aID, aPlayer.inventory, tile); } } return null; diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java index a398f7d17f..51db541650 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java @@ -1,24 +1,32 @@ package gregtech.common.covers; +import gregtech.api.enums.GT_Values; +import gregtech.api.gui.GT_GUICover; +import gregtech.api.gui.widgets.GT_GuiFakeItemButton; +import gregtech.api.gui.widgets.GT_GuiIcon; +import gregtech.api.gui.widgets.GT_GuiIconButton; import gregtech.api.interfaces.tileentity.ICoverable; +import gregtech.api.net.GT_Packet_TileEntityCover; import gregtech.api.util.GT_CoverBehavior; import gregtech.api.util.GT_Utility; +import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.*; + import static gregtech.api.enums.GT_Values.E; public class GT_Cover_Fluidfilter extends GT_CoverBehavior { // Uses the lower 3 bits of the cover variable, so we have 8 options to work with (0-7) - private final int FILTER_INPUT_DENY_OUTPUT = 0; - private final int INVERT_INPUT_DENY_OUTPUT = 1; - private final int FILTER_INPUT_ANY_OUTPUT = 2; - private final int INVERT_INPUT_ANY_OUTPUT = 3; - private final int DENY_INPUT_FILTER_OUTPUT = 4; - private final int DENY_INPUT_INVERT_OUTPUT = 5; - private final int ANY_INPUT_FILTER_OUTPUT = 6; - private final int ANY_INPUT_INVERT_OUTPUT = 7; + private final int FILTER_INPUT_DENY_OUTPUT = 0; // 000 + private final int INVERT_INPUT_DENY_OUTPUT = 1; // 001 + private final int FILTER_INPUT_ANY_OUTPUT = 2; // 010 + private final int INVERT_INPUT_ANY_OUTPUT = 3; // 011 + private final int DENY_INPUT_FILTER_OUTPUT = 4; // 100 + private final int DENY_INPUT_INVERT_OUTPUT = 5; // 101 + private final int ANY_INPUT_FILTER_OUTPUT = 6; // 110 + private final int ANY_INPUT_INVERT_OUTPUT = 7; // 111 public String getDescription(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { int aFilterMode = aCoverVariable & 7; @@ -50,21 +58,6 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehavior { } - public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { - int aFilterMode = aCoverVariable & 7; - aCoverVariable ^= aFilterMode; - aFilterMode = (aFilterMode + (aPlayer.isSneaking()? -1 : 1)) % 8; - if (aFilterMode < 0) { - aFilterMode = 7; - } - - GT_Utility.sendChatToPlayer(aPlayer, getFilterMode(aFilterMode)); - - aCoverVariable|=aFilterMode; - - return aCoverVariable; - } - public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { //GT_FML_LOGGER.info("rightclick"); if ( @@ -142,4 +135,138 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehavior { public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return 0; } + /** + * GUI Stuff + */ + + @Override + public boolean hasCoverGUI() { + return true; + } + + @Override + public Object getClientGUI(byte aSide, int aCoverID, int coverData, ICoverable aTileEntity) { + return new GT_FluidFilterGUICover(aSide, aCoverID, coverData, aTileEntity); + } + + private class GT_FluidFilterGUICover extends GT_GUICover { + private final byte side; + private final int coverID; + private int coverVariable; + private final ICoverable tile; + private GT_GuiFakeItemButton fakeItemButton; + protected String header, filterString; + + private final static int startX = 10; + private final static int startY = 25; + private final static int spaceX = 18; + private final static int spaceY = 18; + + public GT_FluidFilterGUICover(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) + { + this.side = aSide; + this.coverID = aCoverID; + this.coverVariable = aCoverVariable; + this.tile = aTileEntity; + + ItemStack item = GT_Utility.intToStack(aCoverID); + this.header = (item != null) ? item.getDisplayName() : ""; + + GT_GuiIconButton b; + b = new GT_GuiIconButton(this, 0, startX + spaceX*0, startY+spaceY*0, GT_GuiIcon.EXPORT).setTooltipText(trans("043","Filter Input")); + b = new GT_GuiIconButton(this, 1, startX + spaceX*1, startY+spaceY*0, GT_GuiIcon.IMPORT).setTooltipText(trans("044","Filter Output")); + b = new GT_GuiIconButton(this, 2, startX + spaceX*0, startY+spaceY*2, GT_GuiIcon.BLOCK_INPUT).setTooltipText(trans("219", "Block Output")); + b = new GT_GuiIconButton(this, 3, startX + spaceX*1, startY+spaceY*2, GT_GuiIcon.ALLOW_INPUT).setTooltipText(trans("220", "Allow Output")); + b = new GT_GuiIconButton(this, 4, startX + spaceX*0, startY+spaceY*1, GT_GuiIcon.WHITELIST).setTooltipText(trans("045","Whitelist Fluid")); + b = new GT_GuiIconButton(this, 5, startX + spaceX*1, startY+spaceY*1, GT_GuiIcon.BLACKLIST).setTooltipText(trans("046","Blacklist Fluid")); + + new GT_GuiFakeItemButton(this, 5, 5, null).setItem(item); + fakeItemButton = new GT_GuiFakeItemButton(this, startX, startY+spaceY*3+2, GT_GuiIcon.SLOT_DARKGRAY); + } + + private int getNewCoverVariable(int id) { + switch (id) { + case 0: + return (coverVariable & ~0x7) | (coverVariable & 0x3); + case 1: + return (coverVariable & ~0x7) | (coverVariable | 0x4); + case 2: + return (coverVariable & ~0x7) | (coverVariable & 0x5); + case 3: + return (coverVariable & ~0x7) | (coverVariable | 0x2); + case 4: + return (coverVariable & ~0x7) | (coverVariable & 0x6); + case 5: + return (coverVariable & ~0x7) | (coverVariable | 0x1); + } + return coverVariable; + } + + private boolean getClickable(int id) { + switch (id) { + case 0: case 1: + return (coverVariable>>2 & 0x1) != (id & 0x1); + case 2: case 3: + return (coverVariable>>1 & 0x1) != (id & 0x1); + case 4: case 5: + return (coverVariable & 0x1) != (id & 0x1); + } + return false; + } + + + @Override + public void drawExtras(int mouseX, int mouseY, float parTicks) { + this.fontRendererObj.drawString(header, 25, 9, 0xFF222222); + this.fontRendererObj.drawString(trans("016","Filter Direction" ), startX + spaceX*2, 3+startY+spaceY*0, 0xFF555555); + this.fontRendererObj.drawString(trans("223", "Filter Type"), startX + spaceX*2, 3+startY+spaceY*1, 0xFF555555); + this.fontRendererObj.drawString(trans("017","Block Flow"), startX + spaceX*2, 3+startY+spaceY*2, 0xFF555555); + this.fontRendererObj.drawSplitString(filterString, startX + spaceX+3, 4+startY+spaceY*3, gui_width-40 , 0xFF222222); + } + + @Override + protected void onInitGui(int guiLeft, int guiTop, int gui_width, int gui_height) { + updateButtons(); + } + + public void buttonClicked(GuiButton btn){ + if (getClickable(btn.id)){ + coverVariable = getNewCoverVariable(btn.id); + GT_Values.NW.sendToServer(new GT_Packet_TileEntityCover(side, coverID, coverVariable, tile)); + } + updateButtons(); + } + + private void updateButtons(){ + GT_GuiIconButton b; + for (Object o : buttonList) { + if (o instanceof GT_GuiIconButton) { + b = (GT_GuiIconButton) o; + b.enabled = getClickable(b.id); + if (getClickable(1)) { //filtering input + if (b.id == 2) + b.setTooltipText(trans("219", "Block Output")); + else if (b.id == 3) + b.setTooltipText(trans("220", "Allow Output")); + } else { + if (b.id == 2) + b.setTooltipText(trans("221", "Block Input")); + else if (b.id == 3) + b.setTooltipText(trans("222", "Allow Input")); + } + } + } + Fluid f = FluidRegistry.getFluid(coverVariable >>> 3); + if (f != null) { + ItemStack item = GT_Utility.getFluidDisplayStack(f); + if (item != null) { + fakeItemButton.setItem(item); + filterString = item.getDisplayName(); + return; + } + } + fakeItemButton.setItem(null); + filterString = trans("224", "Filter Empty"); + } + } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java index 466f6566c0..aeca33783b 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java @@ -1,19 +1,39 @@ package gregtech.common.covers; +import gregtech.api.enums.GT_Values; +import gregtech.api.gui.GT_GUICover; +import gregtech.api.gui.widgets.GT_GuiFakeItemButton; +import gregtech.api.gui.widgets.GT_GuiIconButton; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IMachineProgress; +import gregtech.api.net.GT_Packet_TileEntityCover; import gregtech.api.util.GT_CoverBehavior; import gregtech.api.util.GT_Utility; -import net.minecraft.entity.player.EntityPlayer; +import gregtech.api.gui.widgets.GT_GuiIcon; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; public class GT_Cover_Pump - extends GT_CoverBehavior { + extends GT_CoverBehavior{ public final int mTransferRate; + // {"006", "Export"}, + // {"007", "Import"}, + // {"008", "Export (conditional)"}, + // {"009", "Import (conditional)"}, + // {"010", "Export (invert cond)"}, + // {"011", "Import (invert cond)"}, + // {"012", "Export allow Input"}, + // {"013", "Import allow Output"}, + // {"014", "Export allow Input (conditional)"}, + // {"015", "Import allow Output (conditional)"}, + // {"016", "Export allow Input (invert cond)"}, + // {"017", "Import allow Output (invert cond)"}, + public GT_Cover_Pump(int aTransferRate) { this.mTransferRate = aTransferRate; } @@ -67,26 +87,6 @@ public class GT_Cover_Pump return aCoverVariable; } - public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { - aCoverVariable = (aCoverVariable + (aPlayer.isSneaking()? -1 : 1)) % 12; - if(aCoverVariable <0){aCoverVariable = 11;} - switch(aCoverVariable) { - case 0: GT_Utility.sendChatToPlayer(aPlayer, trans("006", "Export")); break; - case 1: GT_Utility.sendChatToPlayer(aPlayer, trans("007", "Import")); break; - case 2: GT_Utility.sendChatToPlayer(aPlayer, trans("008", "Export (conditional)")); break; - case 3: GT_Utility.sendChatToPlayer(aPlayer, trans("009", "Import (conditional)")); break; - case 4: GT_Utility.sendChatToPlayer(aPlayer, trans("010", "Export (invert cond)")); break; - case 5: GT_Utility.sendChatToPlayer(aPlayer, trans("011", "Import (invert cond)")); break; - case 6: GT_Utility.sendChatToPlayer(aPlayer, trans("012", "Export allow Input")); break; - case 7: GT_Utility.sendChatToPlayer(aPlayer, trans("013", "Import allow Output")); break; - case 8: GT_Utility.sendChatToPlayer(aPlayer, trans("014", "Export allow Input (conditional)")); break; - case 9: GT_Utility.sendChatToPlayer(aPlayer, trans("015", "Import allow Output (conditional)")); break; - case 10: GT_Utility.sendChatToPlayer(aPlayer, trans("016", "Export allow Input (invert cond)")); break; - case 11: GT_Utility.sendChatToPlayer(aPlayer, trans("017", "Import allow Output (invert cond)")); break; - } - return aCoverVariable; - } - public boolean letsRedstoneGoIn(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return true; } @@ -136,4 +136,130 @@ public class GT_Cover_Pump public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return 1; } + + /** + * GUI Stuff + */ + + @Override + public boolean hasCoverGUI() { + return true; + } + + @Override + public Object getClientGUI(byte aSide, int aCoverID, int coverData, ICoverable aTileEntity) { + return new GT_PumpGUICover(aSide, aCoverID, coverData, aTileEntity); + } + + private class GT_PumpGUICover extends GT_GUICover { + private final byte side; + private final int coverID; + private int coverVariable; + private final ICoverable tile; + protected String header; + + private final static int startX = 10; + private final static int startY = 25; + private final static int spaceX = 18; + private final static int spaceY = 18; + + public GT_PumpGUICover(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { + this.side = aSide; + this.coverID = aCoverID; + this.coverVariable = aCoverVariable; + this.tile = aTileEntity; + + ItemStack item = GT_Utility.intToStack(aCoverID); + this.header = (item != null) ? item.getDisplayName() : ""; + new GT_GuiFakeItemButton(this, 5, 5, null).setItem(item); + + GT_GuiIconButton b; + b = new GT_GuiIconButton(this, 0, startX + spaceX*0, startY+spaceY*0, GT_GuiIcon.EXPORT).setTooltipText(trans("006","Export")); + b = new GT_GuiIconButton(this, 1, startX + spaceX*1, startY+spaceY*0, GT_GuiIcon.IMPORT).setTooltipText(trans("007","Import")); + b = new GT_GuiIconButton(this, 2, startX + spaceX*0, startY+spaceY*1, GT_GuiIcon.CHECKMARK).setTooltipText(trans("008","Ignore")); + b = new GT_GuiIconButton(this, 3, startX + spaceX*1, startY+spaceY*1, GT_GuiIcon.REDSTONE_ON).setTooltipText(trans("009","Conditional")); + b = new GT_GuiIconButton(this, 4, startX + spaceX*2, startY+spaceY*1, GT_GuiIcon.REDSTONE_OFF).setTooltipText(trans("010","Invert Condition")); + b = new GT_GuiIconButton(this, 5, startX + spaceX*0, startY+spaceY*2, GT_GuiIcon.ALLOW_INPUT).setTooltipText(trans("011","Allow Input")); + b = new GT_GuiIconButton(this, 6, startX + spaceX*1, startY+spaceY*2, GT_GuiIcon.BLOCK_INPUT).setTooltipText(trans("012","Block Input")); + } + + @Override + public void drawExtras(int mouseX, int mouseY, float parTicks) { + this.fontRendererObj.drawString(header, 25, 9, 0xFF222222); + this.fontRendererObj.drawString(trans("013","Import/Export" ), startX + spaceX*3, 3+startY+spaceY*0, 0xFF555555); + this.fontRendererObj.drawString(trans("014","Conditional"), startX + spaceX*3, 3+startY+spaceY*1, 0xFF555555); + this.fontRendererObj.drawString(trans("015", "Enable Input"), startX + spaceX*3, 3+startY+spaceY*2, 0xFF555555); + } + + @Override + protected void onInitGui(int guiLeft, int guiTop, int gui_width, int gui_height) { + updateButtons(); + } + + public void buttonClicked(GuiButton btn){ + if (getClickable(btn.id)){ + coverVariable = getNewCoverVariable(btn.id); + GT_Values.NW.sendToServer(new GT_Packet_TileEntityCover(side, coverID, coverVariable, tile)); + } + updateButtons(); + } + + private void updateButtons(){ + GuiButton b; + for (Object o : buttonList) { + b = (GuiButton) o; + b.enabled = getClickable(b.id); + } + } + + private int getNewCoverVariable(int id) { + switch (id) { + case 0: + return coverVariable & ~0x1; + case 1: + return coverVariable | 0x1; + case 2: + if (coverVariable > 5) + return 0x6 | (coverVariable & ~0xE); + return (coverVariable & ~0xE); + case 3: + if (coverVariable > 5) + return 0x8 | (coverVariable & ~0xE); + return 0x2 | (coverVariable & ~0xE); + case 4: + if (coverVariable > 5) + return 0xA | (coverVariable & ~0xE); + return (0x4 | (coverVariable & ~0xE)); + case 5: + if (coverVariable <= 5) + return coverVariable + 6; + break; + case 6: + if (coverVariable > 5) + return coverVariable - 6; + } + return coverVariable; + } + + private boolean getClickable(int id) { + if (coverVariable < 0 | 11 < coverVariable) + return false; + + switch (id) { + case 0: case 1: + return (0x1 & coverVariable) != id; + case 2: + return (coverVariable % 6) >= 2; + case 3: + return (coverVariable % 6) < 2 | 4 <= (coverVariable % 6); + case 4: + return (coverVariable % 6) < 4; + case 5: + return coverVariable < 6; + case 6: + return coverVariable >= 6; + } + return false; + } + } } diff --git a/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png b/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png new file mode 100644 index 0000000000..f9b1d69325 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/GuiButtons.png differ diff --git a/src/main/resources/assets/gregtech/textures/gui/GuiCover.png b/src/main/resources/assets/gregtech/textures/gui/GuiCover.png new file mode 100644 index 0000000000..95353c79ca Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/GuiCover.png differ -- cgit From e0bf04cb11a130fea5a02582a7848409fe9efc26 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Sun, 10 May 2020 16:20:41 +0200 Subject: Start to add new HEE Bees for Ender Dust, Ectoplasma and Arcane Shards --- src/main/java/gregtech/common/items/CombType.java | 5 ++ src/main/java/gregtech/common/items/ItemComb.java | 18 +++-- .../java/gregtech/common/items/ItemPropolis.java | 15 ++-- .../java/gregtech/common/items/PropolisType.java | 8 ++- .../gregtech/loaders/misc/GT_BeeDefinition.java | 82 ++++++++++++++++++++++ .../gregtech/loaders/misc/GT_BranchDefinition.java | 12 ++++ src/main/resources/assets/gregtech/lang/en_US.lang | 3 + 7 files changed, 132 insertions(+), 11 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index a4d67ebf86..52d1e7eda1 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -113,6 +113,11 @@ public enum CombType { URGHAST("urghast", true, Materials._NULL, 70,0x7C0618, 0xA7041C), SNOWQUEEN("snowqueen", true, Materials._NULL, 60,0x9C0018, 0xD02001), + //Twilight + ENDDUST("enddust", true, Materials._NULL, 50,0x003A7D, 0xCC00FA), + ECTOPLASMA("ectoplasma", true, Materials._NULL, 35,0x381C40, 0xDCB0E5), + ARCANESHARD("arcaneshard", true, Materials._NULL, 35,0x333D82, 0x9010AD), + //Space SPACE("space", true, Materials._NULL, 100,0x003366, 0xC0C0C0), METEORICIRON("meteoriciron",true, Materials.MeteoricIron, 100,0x321928, 0x643250), diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index d60a60a3fd..5b7c80fc95 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -447,15 +447,23 @@ public class ItemComb extends Item { // Twilight tComb = getStackForType(CombType.NAGA); - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1, new Object[0]), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 4), GT_ModHandler.getModItem("dreamcraft", "item.NagaScaleChip", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.NagaScaleFragment", 1L, 0), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 800, 0, 0}, 256, 120); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 4), GT_ModHandler.getModItem("dreamcraft", "item.NagaScaleChip", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.NagaScaleFragment", 1L, 0), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 800, 0, 0}, 256, 120); tComb = getStackForType(CombType.LICH); - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1, new Object[0]), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 5), GT_ModHandler.getModItem("dreamcraft", "item.LichBoneChip", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.LichBoneFragment", 1L, 0), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 800, 0, 0}, 384, 480); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 5), GT_ModHandler.getModItem("dreamcraft", "item.LichBoneChip", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.LichBoneFragment", 1L, 0), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 800, 0, 0}, 384, 480); tComb = getStackForType(CombType.HYDRA); - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1, new Object[0]), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 1), GT_ModHandler.getModItem("dreamcraft", "item.FieryBloodDrop", 1L, 0), GT_Bees.drop.getStackForType(DropType.HYDRA), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 1000, 0, 0}, 384, 480); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 1), GT_ModHandler.getModItem("dreamcraft", "item.FieryBloodDrop", 1L, 0), GT_Bees.drop.getStackForType(DropType.HYDRA), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 1000, 0, 0}, 384, 480); tComb = getStackForType(CombType.URGHAST); - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1, new Object[0]), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 2), GT_ModHandler.getModItem("dreamcraft", "item..CarminiteChip", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.CarminiteFragment",1L, 0), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 800, 0, 0}, 512, 1920); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 2), GT_ModHandler.getModItem("dreamcraft", "item..CarminiteChip", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.CarminiteFragment",1L, 0), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 800, 0, 0}, 512, 1920); tComb = getStackForType(CombType.SNOWQUEEN); - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1, new Object[0]), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 3), GT_ModHandler.getModItem("dreamcraft", "item.SnowQueenBloodDrop", 1L, 0), GT_Bees.drop.getStackForType(DropType.SNOW_QUEEN), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 1000, 0, 0}, 512, 1920); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 3), GT_ModHandler.getModItem("dreamcraft", "item.SnowQueenBloodDrop", 1L, 0), GT_Bees.drop.getStackForType(DropType.SNOW_QUEEN), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 1000, 0, 0}, 512, 1920); + + // HEE + tComb = getStackForType(CombType.ENDDUST); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.End), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{2000, 1500,}, 384, 480); + tComb = getStackForType(CombType.ECTOPLASMA); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Ectoplasma), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{2000, 1000,}, 480, 1920); + tComb = getStackForType(CombType.ARCANESHARD); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Arcaneshard), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{2000, 1000,}, 480, 1920); //Space Line tComb = getStackForType(CombType.SPACE); diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java index 75c38ae016..bd4894e1e7 100644 --- a/src/main/java/gregtech/common/items/ItemPropolis.java +++ b/src/main/java/gregtech/common/items/ItemPropolis.java @@ -5,11 +5,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import gregtech.api.enums.GT_Values; +import gregtech.api.util.GT_ModHandler; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import java.util.List; @@ -71,12 +73,17 @@ public class ItemPropolis extends Item { public void initPropolisRecipes() { ItemStack tPropolis; - tPropolis = getStackForType(PropolisType.Zoko); - //addRecipe(tDrop, aOutput, aOutput2, aChance, aEUt); + tPropolis = getStackForType(PropolisType.End); + GT_Values.RA.addFluidExtractionRecipe(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "end_powder", 1, 0), FluidRegistry.getFluidStack("endergoo",100), 5000, 50, 480); + tPropolis = getStackForType(PropolisType.Ectoplasma); + GT_Values.RA.addFluidExtractionRecipe(tPropolis, GT_ModHandler.getModItem("dreamcraft", "item.EctoplasmaChip", 1, 0), FluidRegistry.getFluidStack("endergoo",150), 1500, 100, 1920); + tPropolis = getStackForType(PropolisType.Arcaneshard); + GT_Values.RA.addFluidExtractionRecipe(tPropolis, GT_ModHandler.getModItem("dreamcraft", "item.ArcaneShardChip", 1, 0), FluidRegistry.getFluidStack("endergoo",150), 1500, 100, 1920); + //addRecipe(tDrop, aOutput, aOutput2, aChance, aDuration, aEUt); } - public void addRecipe(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) { - GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 40, aEUt); + public void addRecipe(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aDuration, int aEUt) { + GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, aDuration, aEUt); } } diff --git a/src/main/java/gregtech/common/items/PropolisType.java b/src/main/java/gregtech/common/items/PropolisType.java index e9519c5c94..f0aa7c53e7 100644 --- a/src/main/java/gregtech/common/items/PropolisType.java +++ b/src/main/java/gregtech/common/items/PropolisType.java @@ -5,10 +5,14 @@ import gregtech.api.util.GT_LanguageManager; public enum PropolisType { - Zoko("zoko",true); + End("End",true), + Ectoplasma("Ectoplasma",true), + Arcaneshard("Arcaneshard",true); private static int[] colours = new int[]{ - 0x3A9898 + 0xCC00FA, + 0xDCB0E5, + 0x9010AD }; public boolean showInList; diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 81044cc532..695d338114 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -63,6 +63,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { //AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); //tMutation.requireResource(GameRegistry.findBlock("minecraft", "sand"), 1); //AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, GT_Bees.superLife); + //tMutation.restrictDateRange( 1, 1, 1, 1); } @Override @@ -2012,6 +2013,87 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.restrictTemperature(EnumTemperature.ICY); } }, + //HEE + ENDDUST(GT_BranchDefinition.HEE, "End-Dust", true, 0xCC00FA, 0x003A7D) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDDUST), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"ENDED"), STAINLESSSTEEL.species, 8); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "end_powder_ore"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + + } + }, + ECTOPLASMA(GT_BranchDefinition.HEE, "Ectoplasma", true, 0xDCB0E5, 0x381C40) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ECTOPLASMA), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"ENDED"), ENDDUST.species, 5); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "spooky_log"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + + } + }, + + ARCANESHARDS(GT_BranchDefinition.HEE, "ArcaneShards", true, 0x9010AD, 0x333D82) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ARCANESHARD), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(THAUMIUMSHARD.species, ENDDUST.species, 5); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "laboratory_floor"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + + } + }, + //Space Bees SPACE(GT_BranchDefinition.SPACE, "Space", true, 0x003366, 0xC0C0C0) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { diff --git a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java index d17340cafd..5dcdcf1e50 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java @@ -110,6 +110,18 @@ public enum GT_BranchDefinition { AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.FASTER); } }, + HEE("Finis Expansiones") { + @Override + protected void setBranchProperties(IAllele[] alleles) { + AlleleHelper.instance.set(alleles, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.NOCTURNAL, true); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock")); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW); + AlleleHelper.instance.set(alleles, EnumBeeChromosome.SPEED, EnumAllele.Speed.FASTEST); + } + }, SPACE("Cosmicis") { @Override protected void setBranchProperties(IAllele[] alleles) { diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index ad329776db..2150a4a4d5 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -989,6 +989,9 @@ for.bees.species.vegab=VegaB for.bees.species.cosmicneutronium=Cosmic Neutronium for.bees.species.infinitycatalyst=Infinity Catalyst for.bees.species.infinity=Infinity +for.bees.species.enddust=End-Dust +for.bees.species.ectoplasma=Ectoplasma +for.bees.species.arcaneshard=Arcaneshard for.mutation.condition.biomeid=Required Biome for.mutation.condition.dim=Required Dimension -- cgit From 2dda2750a91a3a94fa4d0cdf1bf096fe13946025 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Sun, 10 May 2020 19:11:06 +0200 Subject: more HEE bees and some fixes --- src/main/java/gregtech/common/items/CombType.java | 17 ++- src/main/java/gregtech/common/items/DropType.java | 4 +- src/main/java/gregtech/common/items/ItemComb.java | 16 ++- src/main/java/gregtech/common/items/ItemDrop.java | 9 +- .../java/gregtech/common/items/ItemPropolis.java | 26 ++-- .../java/gregtech/common/items/PropolisType.java | 12 +- .../gregtech/loaders/misc/GT_BeeDefinition.java | 140 +++++++++++++++++++-- src/main/java/gregtech/loaders/misc/GT_Bees.java | 2 - src/main/resources/assets/gregtech/lang/en_US.lang | 6 +- 9 files changed, 198 insertions(+), 34 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 52d1e7eda1..0c68a9cb01 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -113,11 +113,6 @@ public enum CombType { URGHAST("urghast", true, Materials._NULL, 70,0x7C0618, 0xA7041C), SNOWQUEEN("snowqueen", true, Materials._NULL, 60,0x9C0018, 0xD02001), - //Twilight - ENDDUST("enddust", true, Materials._NULL, 50,0x003A7D, 0xCC00FA), - ECTOPLASMA("ectoplasma", true, Materials._NULL, 35,0x381C40, 0xDCB0E5), - ARCANESHARD("arcaneshard", true, Materials._NULL, 35,0x333D82, 0x9010AD), - //Space SPACE("space", true, Materials._NULL, 100,0x003366, 0xC0C0C0), METEORICIRON("meteoriciron",true, Materials.MeteoricIron, 100,0x321928, 0x643250), @@ -151,7 +146,17 @@ public enum CombType { //Infinity COSMICNEUTRONIUM("cosmicneutronium",true, Materials._NULL, 5,0x484848, 0x323232), INFINITYCATALYST("infinitycatalyst",true, Materials._NULL, 2,0xFFFFFF, 0xFFFFFF), - INFINITY("infinity",true, Materials._NULL, 1,0xFFFFFF, 0xFFFFFF); + INFINITY("infinity",true, Materials._NULL, 1,0xFFFFFF, 0xFFFFFF), + + //HEE + ENDDUST("enddust", true, Materials._NULL, 50,0x003A7D, 0xCC00FA), + ECTOPLASMA("ectoplasma", true, Materials._NULL, 35,0x381C40, 0xDCB0E5), + ARCANESHARD("arcaneshard", true, Materials._NULL, 35,0x333D82, 0x9010AD), + STARDUST("stardust", true, Materials._NULL, 60,0xDCBE13, 0xffff00), + DRAGONESSENCE("dragonessence", true, Materials._NULL, 30,0xffff00, 0xFFA12B), + ENDERMAN("enderman", true, Materials._NULL, 25,0x6200e7, 0x161616), + SILVERFISH("silverfish", true, Materials._NULL, 25,0x0000000, 0xEE053D); + public boolean showInList; public Materials material; public int chance; diff --git a/src/main/java/gregtech/common/items/DropType.java b/src/main/java/gregtech/common/items/DropType.java index 258126b52e..1316b01601 100644 --- a/src/main/java/gregtech/common/items/DropType.java +++ b/src/main/java/gregtech/common/items/DropType.java @@ -12,7 +12,8 @@ public enum DropType { HYDRA("hydra blood",true), SNOW_QUEEN("snowqueen blood",true), OXYGEN("oxygen",true), - LAPIS("lapis coolant",true); + LAPIS("lapis coolant",true), + ENDERGOO("ender goo",true); private static int[][] colours = new int[][]{ {0x19191B, 0x303032}, @@ -23,6 +24,7 @@ public enum DropType { {0xD02001, 0x9C0018}, {0x003366, 0x0066BB}, {0x1727b1, 0x008ce3}, + {0xA005E7, 0x161616}, }; public boolean showInList; public Materials material; diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 5b7c80fc95..0814aadc7b 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -18,6 +18,7 @@ import gregtech.loaders.materialprocessing.ProcessingModSupport; import gregtech.loaders.misc.GT_Bees; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -459,12 +460,19 @@ public class ItemComb extends Item { // HEE tComb = getStackForType(CombType.ENDDUST); - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.End), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{2000, 1500,}, 384, 480); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.End), GT_Bees.drop.getStackForType(DropType.ENDERGOO), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{2000, 1500, 1000}, 384, 480); + tComb = getStackForType(CombType.STARDUST); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Stardust), GT_Bees.drop.getStackForType(DropType.ENDERGOO), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{2000, 1500, 1000}, 384, 480); tComb = getStackForType(CombType.ECTOPLASMA); - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Ectoplasma), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{2000, 1000,}, 480, 1920); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Ectoplasma), GT_Bees.drop.getStackForType(DropType.ENDERGOO), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{2500, 1000, 1500}, 512, 1920); tComb = getStackForType(CombType.ARCANESHARD); - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Arcaneshard), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{2000, 1000,}, 480, 1920); - + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Arcaneshard), GT_Bees.drop.getStackForType(DropType.ENDERGOO), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{2500, 1000,1500}, 512, 1920); + tComb = getStackForType(CombType.DRAGONESSENCE); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Dragonessence), GT_Bees.drop.getStackForType(DropType.ENDERGOO), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{3000, 750, 2000}, 640, 7680); + tComb = getStackForType(CombType.ENDERMAN); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Enderman), GT_Bees.drop.getStackForType(DropType.ENDERGOO), GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{3000, 750, 2000}, 640, 7680); + tComb = getStackForType(CombType.ARCANESHARD); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Silverfish), GT_Bees.drop.getStackForType(DropType.ENDERGOO), new ItemStack(Blocks.monster_egg, 1,60), GT_Values.NI, GT_Values.NI, new int[]{2500, 1000, 2000, 1500}, 512, 1920); //Space Line tComb = getStackForType(CombType.SPACE); GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1L), ItemList.FR_RefractoryWax.get(1L), GT_Bees.drop.getStackForType(DropType.OXYGEN), GT_ModHandler.getModItem("dreamcraft", "item.CoinSpace", 1L, 0), GT_Values.NI, GT_Values.NI, new int[]{5000, 3000, 1500, 500, 0, 0}, 384, 480); diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java index f461d8b68e..78fdfca57f 100644 --- a/src/main/java/gregtech/common/items/ItemDrop.java +++ b/src/main/java/gregtech/common/items/ItemDrop.java @@ -111,7 +111,8 @@ public class ItemDrop extends Item { tDrop = getStackForType(DropType.OXYGEN); addProcessLV(tDrop, new FluidStack(FluidRegistry.getFluid("liquidoxygen"), 100), GT_ModHandler.getModItem("ExtraBees", "propolis", 1L, 2), 250, 1200,8); RecipeManagers.squeezerManager.addRecipe(400, new ItemStack[]{tDrop}, new FluidStack(FluidRegistry.getFluid("ic2coolant"), 100), GT_ModHandler.getModItem("ExtraBees", "propolis", 1L, 2), 30); - + addProcessHV(tDrop, new FluidStack(FluidRegistry.getFluid("endergoo"), 500), GT_Values.NI ,1000); + tDrop = getStackForType(DropType.ENDERGOO); } public void addProcessLV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) { @@ -121,7 +122,9 @@ public class ItemDrop extends Item { GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, aDuration, aEUt); } public void addProcessMV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) { - GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 64, aEUt); + GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 128, aEUt); + } + public void addProcessHV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance) { + GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 480, 480); } - } \ No newline at end of file diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java index bd4894e1e7..a4e224af9f 100644 --- a/src/main/java/gregtech/common/items/ItemPropolis.java +++ b/src/main/java/gregtech/common/items/ItemPropolis.java @@ -12,7 +12,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import java.util.List; @@ -74,16 +73,29 @@ public class ItemPropolis extends Item { ItemStack tPropolis; tPropolis = getStackForType(PropolisType.End); - GT_Values.RA.addFluidExtractionRecipe(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "end_powder", 1, 0), FluidRegistry.getFluidStack("endergoo",100), 5000, 50, 480); + addProcessHV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "end_powder", 1, 0)); + tPropolis = getStackForType(PropolisType.Stardust); + addProcessHV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "stardust", 1, 0)); tPropolis = getStackForType(PropolisType.Ectoplasma); - GT_Values.RA.addFluidExtractionRecipe(tPropolis, GT_ModHandler.getModItem("dreamcraft", "item.EctoplasmaChip", 1, 0), FluidRegistry.getFluidStack("endergoo",150), 1500, 100, 1920); + addProcessEV(tPropolis, GT_ModHandler.getModItem("dreamcraft", "item.EctoplasmaChip", 1, 0)); tPropolis = getStackForType(PropolisType.Arcaneshard); - GT_Values.RA.addFluidExtractionRecipe(tPropolis, GT_ModHandler.getModItem("dreamcraft", "item.ArcaneShardChip", 1, 0), FluidRegistry.getFluidStack("endergoo",150), 1500, 100, 1920); + addProcessEV(tPropolis, GT_ModHandler.getModItem("dreamcraft", "item.ArcaneShardChip", 1, 0)); + tPropolis = getStackForType(PropolisType.Dragonessence); + addProcessIV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "essence", 16, 0)); + tPropolis = getStackForType(PropolisType.Enderman); + addProcessIV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "enderman_head", 1, 0)); + tPropolis = getStackForType(PropolisType.Silverfish); + addProcessEV(tPropolis, GT_ModHandler.getModItem("HardcoreEnderExpansion", "silverfish_blood", 1, 0)); //addRecipe(tDrop, aOutput, aOutput2, aChance, aDuration, aEUt); } - public void addRecipe(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aDuration, int aEUt) { - GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, aDuration, aEUt); + public void addProcessHV(ItemStack tPropolis, ItemStack aOutput2) { + GT_Values.RA.addFluidExtractionRecipe(tPropolis, aOutput2, FluidRegistry.getFluidStack("endergoo",100), 5000, 50, 480); + } + public void addProcessEV(ItemStack tPropolis, ItemStack aOutput2) { + GT_Values.RA.addFluidExtractionRecipe(tPropolis, aOutput2, FluidRegistry.getFluidStack("endergoo",200), 2500, 100, 1920); + } + public void addProcessIV(ItemStack tPropolis, ItemStack aOutput2) { + GT_Values.RA.addFluidExtractionRecipe(tPropolis, aOutput2, FluidRegistry.getFluidStack("endergoo",300), 1500, 150, 7680); } - } diff --git a/src/main/java/gregtech/common/items/PropolisType.java b/src/main/java/gregtech/common/items/PropolisType.java index f0aa7c53e7..bba0f8f277 100644 --- a/src/main/java/gregtech/common/items/PropolisType.java +++ b/src/main/java/gregtech/common/items/PropolisType.java @@ -7,12 +7,20 @@ public enum PropolisType { End("End",true), Ectoplasma("Ectoplasma",true), - Arcaneshard("Arcaneshard",true); + Arcaneshard("Arcaneshard",true), + Stardust("Stardust",true), + Dragonessence("Dragonessence",true), + Enderman("Enderman",true), + Silverfish("Silverfish", true); private static int[] colours = new int[]{ 0xCC00FA, 0xDCB0E5, - 0x9010AD + 0x9010AD, + 0xffff00, + 0xFFA12B, + 0x161616, + 0x000000 }; public boolean showInList; diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 695d338114..00b4cb25ae 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -2014,10 +2014,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { } }, //HEE - ENDDUST(GT_BranchDefinition.HEE, "End-Dust", true, 0xCC00FA, 0x003A7D) { + ENDDUST(GT_BranchDefinition.HEE, "End Dust", true, 0xCC00FA, 0x003A7D) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDDUST), 0.10f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -2031,7 +2031,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"ENDED"), STAINLESSSTEEL.species, 8); + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), STAINLESSSTEEL.species, 8); tMutation.restrictHumidity(EnumHumidity.ARID); if (Loader.isModLoaded("HardcoreEnderExpansion")) tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "end_powder_ore"), 0); @@ -2040,10 +2040,38 @@ public enum GT_BeeDefinition implements IBeeDefinition { } }, + + STARDUST(GT_BranchDefinition.HEE, "Star Dust", true, 0xffff00, 0xDCBE13) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.STARDUST), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, GT_Bees.speedBlinding); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), ZINC.species, 8); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "stardust_ore"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + } + }, + ECTOPLASMA(GT_BranchDefinition.HEE, "Ectoplasma", true, 0xDCB0E5, 0x381C40) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ECTOPLASMA), 0.10f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -2053,11 +2081,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); } @Override protected void registerMutations() { - IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"ENDED"), ENDDUST.species, 5); + IBeeMutationCustom tMutation = registerMutation(getSpecies(FORRESTRY,"End"), ENDDUST.species, 5); tMutation.restrictHumidity(EnumHumidity.ARID); if (Loader.isModLoaded("HardcoreEnderExpansion")) tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "spooky_log"), 0); @@ -2067,10 +2097,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { } }, - ARCANESHARDS(GT_BranchDefinition.HEE, "ArcaneShards", true, 0x9010AD, 0x333D82) { + ARCANESHARDS(GT_BranchDefinition.HEE, "Arcane Shards", true, 0x9010AD, 0x333D82) { @Override protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { - beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 4), 0.30f); + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ARCANESHARD), 0.10f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); @@ -2079,7 +2109,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void setAlleles(IAllele[] template) { - AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT); + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONG); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1); + } @Override @@ -2091,6 +2124,97 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + } + }, + + DRAGONESSENCE(GT_BranchDefinition.HEE, "Dragonessence", true, 0xFFA12B, 0xffff00) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DRAGONESSENCE), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, AlleleEffect.effectBeatific); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_3); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_3); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(ECTOPLASMA.species, ARCANESHARDS.species, 4); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "essence_altar>"), 1); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + + } + }, + + ENDERMANHEAD(GT_BranchDefinition.HEE, "Enderman", true, 0x161616, 0x6200e7) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ENDERMAN), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, getEffect(EXTRABEES, "teleport")); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1); + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(ENDERIUM.species, STARDUST.species, 4); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "ender_goo"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + + } + }, + + SILVERFISH(GT_BranchDefinition.HEE, "Silverfisch", true, 0xEE053D, 0x000000) { + @Override + protected void setSpeciesProperties(GT_AlleleBeeSpecies beeSpecies) { + beeSpecies.addProduct(GT_ModHandler.getModItem(GT_Values.MOD_ID_FR, "beeCombs", 1, 8), 0.30f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SILVERFISH), 0.10f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.NORMAL); + beeSpecies.setHasEffect(); + } + + @Override + protected void setAlleles(IAllele[] template) { + AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER); + AlleleHelper.instance.set(template, EnumBeeChromosome.EFFECT, getEffect(MAGICBEES, "SlowSpeed")); + AlleleHelper.instance.set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + AlleleHelper.instance.set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1); + + } + + @Override + protected void registerMutations() { + IBeeMutationCustom tMutation = registerMutation(ECTOPLASMA.species, STARDUST.species, 5); + tMutation.restrictHumidity(EnumHumidity.ARID); + if (Loader.isModLoaded("HardcoreEnderExpansion")) + tMutation.requireResource(GameRegistry.findBlock("HardcoreEnderExpansion", "ender_goo>"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(1, "End"));//End Dim + + } }, //Space Bees diff --git a/src/main/java/gregtech/loaders/misc/GT_Bees.java b/src/main/java/gregtech/loaders/misc/GT_Bees.java index 281eb3c675..0e08ac3de6 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Bees.java +++ b/src/main/java/gregtech/loaders/misc/GT_Bees.java @@ -11,7 +11,6 @@ import gregtech.common.items.ItemComb; import gregtech.common.items.ItemDrop; import gregtech.common.items.ItemPollen; import gregtech.common.items.ItemPropolis; -import gregtech.loaders.misc.GT_BeeDefinition; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -73,7 +72,6 @@ public class GT_Bees { blinkLife = new AlleleInteger("lifeBlink", 2, false, EnumBeeChromosome.LIFESPAN); superLife = new AlleleInteger("lifeEon", 600, false, EnumBeeChromosome.LIFESPAN); - } private static class AlleleFloat extends Allele implements IAlleleFloat { diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 2150a4a4d5..51b648b308 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -989,9 +989,13 @@ for.bees.species.vegab=VegaB for.bees.species.cosmicneutronium=Cosmic Neutronium for.bees.species.infinitycatalyst=Infinity Catalyst for.bees.species.infinity=Infinity -for.bees.species.enddust=End-Dust +for.bees.species.enddust=End Dust +for.bees.species.stardust=Stardust for.bees.species.ectoplasma=Ectoplasma for.bees.species.arcaneshard=Arcaneshard +for.bees.species.dragonessence=Dragon Essence +for.bees.species.enderman=Enderman +for.bees.species.silverfish=Silverfish for.mutation.condition.biomeid=Required Biome for.mutation.condition.dim=Required Dimension -- cgit From 1c9f654fb7fe93e517bd7d955e90189b1de117e0 Mon Sep 17 00:00:00 2001 From: DreamMasterXXL Date: Sat, 16 May 2020 20:45:36 +0200 Subject: Add new Autoclave Texture --- .../textures/gui/basicmachines/Autoclave.png | Bin 2508 -> 10220 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png index b619826025..87ca283f6c 100644 Binary files a/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png and b/src/main/resources/assets/gregtech/textures/gui/basicmachines/Autoclave.png differ -- cgit