From 979a6fb543dcf71890fa7dad099e2585595b8a95 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Tue, 3 Nov 2015 11:28:31 +0100 Subject: Change Material List Adding Planets Oremixes to the lang file change build properties --- src/main/resources/assets/gregtech/lang/en_US.lang | 172 ++++++++++----------- 1 file changed, 86 insertions(+), 86 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 695cd07a8e..fda908b854 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -1,175 +1,175 @@ achievement.Naquadah=Find Naquadah Ore -achievement.Naquadah.desc=Height: 10-60, Chance: 10, //End +achievement.Naquadah.desc=Height: 10-90, Chance: 10, Asteroids/Venus/Titan/Oberon/Pluto// achievement.NaquadahEnriched=Find NaquadahEnriched Ore -achievement.NaquadahEnriched.desc=Height: 10-60, Chance: 10, //End +achievement.NaquadahEnriched.desc=Height: 10-90, Chance: 10, Asteroids/Venus/Titan/Oberon/Pluto// achievement.Lignite=Find Lignite Ore -achievement.Lignite.desc=Height: 50-130, Chance: 160, Overworld// +achievement.Lignite.desc=Height: 80-210, Chance: 160, Overworld// achievement.Coal=Find Coal Ore -achievement.Coal.desc=Height: 50-130, Chance: 160, Overworld// +achievement.Coal.desc=Height: 30-80, Chance: 160, Overworld/Twilight-Forrest// achievement.Magnetite=Find Magnetite Ore -achievement.Magnetite.desc=Height: 50-120, Chance: 160, Overworld/Nether/ +achievement.Magnetite.desc=Height: 60-180, Chance: 160, Overworld/Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Deimos/Asteorids/IO/Callisto/Venus/Triton// achievement.Iron=Find Iron Ore -achievement.Iron.desc=Height: 50-120, Chance: 160, Overworld/Nether/ +achievement.Iron.desc=Height: 10-40, Chance: 120, Overworld/Nether/Twilight-Forrest/End/End-Asteroids/Moon/Mars/Ceres/IO/Ganymed/Callisto/Mecury/Enceladus/Oberon/Proteus/Pluto// achievement.VanadiumMagnetite=Find VanadiumMagnetite Ore -achievement.VanadiumMagnetite.desc=Height: 50-120, Chance: 160, Overworld/Nether/ +achievement.VanadiumMagnetite.desc=Height: 60-180, Chance: 160, Overworld/Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Asteorids/IO/Callisto/Venus/Triton// achievement.Gold=Find Gold Ore -achievement.Gold.desc=Height: 60-80, Chance: 160, Overworld// +achievement.Gold.desc=Height: 30-60, Chance: 160, Overworld/Twilight-Forrest/End/End/End-Asteroids/Mars/Phobos/Asteroids/Callisto/Venus/Triton// achievement.BrownLimonite=Find BrownLimonite Ore -achievement.BrownLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/ +achievement.BrownLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// achievement.YellowLimonite=Find YellowLimonite Ore -achievement.YellowLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/ +achievement.YellowLimonite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// achievement.BandedIron=Find BandedIron Ore -achievement.BandedIron.desc=Height: 10-40, Chance: 120, Overworld/Nether/ +achievement.BandedIron.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// achievement.Malachite=Find Malachite Ore -achievement.Malachite.desc=Height: 10-40, Chance: 120, Overworld/Nether/ +achievement.Malachite.desc=Height: 10-40, Chance: 120, Overworld/Nether/Mars/Ganymed/Callisto/Mecury/Oberon/Pluto// achievement.Tin=Find Tin Ore -achievement.Tin.desc=Height: 40-120, Chance: 50, Overworld//End +achievement.Tin.desc=Height: 60-220, Chance: 50, Overworld/Twilight-Forrest/End/End/End-Asteroids/Moon/IO/Venus// achievement.Cassiterite=Find Cassiterite Ore -achievement.Cassiterite.desc=Height: 40-120, Chance: 50, Overworld//End +achievement.Cassiterite.desc=Height: 60-220, Chance: 50, Overworld/Twilight-Forrest/End/End/End-Asteroids/Moon/IO/Venus/Pluto// achievement.Tetrahedrite=Find Tetrahedrite Ore -achievement.Tetrahedrite.desc=Height: 80-120, Chance: 70, Overworld/Nether/ +achievement.Tetrahedrite.desc=Height: 80-120, Chance: 70, Nether/Mars/Deimos/Ganymed/Enceladus/Triton// achievement.Copper=Find Copper Ore -achievement.Copper.desc=Height: 80-120, Chance: 70, Overworld/Nether/ +achievement.Copper.desc=Height: 5-60, Chance: 80, Overworld/Nether/End/End-Asteroids/Moon/Mars/Phobos/Deimos/Ceres/Ganymed/Callisto/Enceladus/Proteus// achievement.Stibnite=Find Stibnite Ore -achievement.Stibnite.desc=Height: 80-120, Chance: 70, Overworld/Nether/ +achievement.Stibnite.desc=Height: 80-120, Chance: 70, Nether/Mars/Deimos/Ganymed/Enceladus/Triton// achievement.NetherQuartz=Find NetherQuartz Ore -achievement.NetherQuartz.desc=Height: 40-80, Chance: 80, /Nether/ +achievement.NetherQuartz.desc=Height: 40-80, Chance: 80, /Nether// achievement.Sulfur=Find Sulfur Ore -achievement.Sulfur.desc=Height: 5-20, Chance: 100, /Nether/ +achievement.Sulfur.desc=Height: 5-20, Chance: 100, /Nether/Mars/Phobos/Deimos/IO/Venus// achievement.Pyrite=Find Pyrite Ore -achievement.Pyrite.desc=Height: 5-20, Chance: 100, /Nether/ +achievement.Pyrite.desc=Height: 5-60, Chance: 100, Overworld/Nether/End/End-Asteroids/Moon/Ceres/IO/Callisto/Venus/Enceladus/Proteus// achievement.Sphalerite=Find Sphalerite Ore -achievement.Sphalerite.desc=Height: 5-20, Chance: 100, /Nether/ +achievement.Sphalerite.desc=Height: 5-20, Chance: 100, /Nether/Mars/Phobos/Deimos/IO/Venus// achievement.Chalcopyrite=Find Chalcopyrite Ore -achievement.Chalcopyrite.desc=Height: 10-30, Chance: 80, Overworld/Nether/ +achievement.Chalcopyrite.desc=Height: 5-60, Chance: 80, Overworld/Nether/End/End-Asteroids/Moon/Ceres/Callisto/Enceladus/Proteus// achievement.Bauxite=Find Bauxite Ore -achievement.Bauxite.desc=Height: 50-90, Chance: 80, Overworld// +achievement.Bauxite.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto// achievement.Aluminium=Find Aluminium Ore -achievement.Aluminium.desc=Height: 50-90, Chance: 80, Overworld// +achievement.Aluminium.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto// achievement.Ilmenite=Find Ilmenite Ore -achievement.Ilmenite.desc=Height: 50-90, Chance: 80, Overworld// +achievement.Ilmenite.desc=Height: 10-80, Chance: 80, Moon/Phobos/Asteroids/Ganymed/Mercury/Titan/Proteus/Pluto// achievement.RockSalt=Find RockSalt Ore -achievement.RockSalt.desc=Height: 50-60, Chance: 50, Overworld// +achievement.RockSalt.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forrest/Mars// achievement.Salt=Find Salt Ore -achievement.Salt.desc=Height: 50-60, Chance: 50, Overworld// +achievement.Salt.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forrest/Mars// achievement.Lepidolite=Find Lepidolite Ore -achievement.Lepidolite.desc=Height: 50-60, Chance: 50, Overworld// +achievement.Lepidolite.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forrest/Mars// achievement.Spodumene=Find Spodumene Ore -achievement.Spodumene.desc=Height: 50-60, Chance: 50, Overworld// +achievement.Spodumene.desc=Height: 50-70, Chance: 50, Overworld/Twilight-Forrest/Mars// achievement.Redstone=Find Redstone Ore -achievement.Redstone.desc=Height: 10-40, Chance: 60, Overworld/Nether/ +achievement.Redstone.desc=Height: 5-40, Chance: 60, Overworld/Nether/Mars/Ganymed/Venus/Mercury// achievement.Ruby=Find Ruby Ore -achievement.Ruby.desc=Height: 10-40, Chance: 60, Overworld/Nether/ +achievement.Ruby.desc=Height: 5-40, Chance: 60, Overworld/Nether/Mars/Ganymed/Venus/Mercury// achievement.Cinnabar=Find Cinnabar Ore -achievement.Cinnabar.desc=Height: 10-40, Chance: 60, Overworld/Nether/ +achievement.Cinnabar.desc=Height: 5-40, Chance: 60, Overworld/Nether/Mars/Ganymed/Venus/Mercury// achievement.Soapstone=Find Soapstone Ore -achievement.Soapstone.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Soapstone.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest// achievement.Talc=Find Talc Ore -achievement.Talc.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Talc.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest// achievement.Glauconite=Find Glauconite Ore -achievement.Glauconite.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Glauconite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest// achievement.Pentlandite=Find Pentlandite Ore -achievement.Pentlandite.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Pentlandite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest// achievement.Garnierite=Find Garnierite Ore -achievement.Garnierite.desc=Height: 10-40, Chance: 40, Overworld/Nether/End +achievement.Garnierite.desc=Height: 10-40, Chance: 40, Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Deimos/Venus/Titan/Triton// achievement.Nickel=Find Nickel Ore -achievement.Nickel.desc=Height: 10-40, Chance: 40, Overworld/Nether/End +achievement.Nickel.desc=Height: 10-40, Chance: 40, Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Deimos/Venus/Mercury/Enceladus/Titan/Triton/Proteus/Pluto// achievement.Cobaltite=Find Cobaltite Ore -achievement.Cobaltite.desc=Height: 10-40, Chance: 40, Overworld/Nether/End +achievement.Cobaltite.desc=Height: 10-40, Chance: 40, Twilight-Forrest/End/End-Asteroids/Mars/Phobos/Deimos/Venus/Titan/Triton// achievement.Cooperite=Find Cooperite Ore -achievement.Cooperite.desc=Height: 40-50, Chance: 5, Overworld//End +achievement.Cooperite.desc=Height: 40-50, Chance: 5, // achievement.Palladium=Find Palladium Ore -achievement.Palladium.desc=Height: 40-50, Chance: 5, Overworld//End +achievement.Palladium.desc=Height: 5-30, Chance: 10, /Ceres/IO/Ganymed/Callisto/Venus/Mercury/Enceladus/Oberon/Pluto// achievement.Platinum=Find Platinum Ore -achievement.Platinum.desc=Height: 40-50, Chance: 5, Overworld//End +achievement.Platinum.desc=Height: 5-30, Chance: 10, /Ceres/IO/Ganymed/Callisto/Mercury/Oberon/Pluto// achievement.Iridium=Find Iridium Ore -achievement.Iridium.desc=Height: 40-50, Chance: 5, Overworld//End +achievement.Iridium.desc=Height: 5-30, Chance: 10, /Venus/Mercury/Enceladus/Titan/Proteus/Pluto// achievement.Pitchblende=Find Pitchblende Ore -achievement.Pitchblende.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Pitchblende.desc=Height: 30-60, Chance: 40, Moon/Phobos/IO/Venus/Oberon// achievement.Uranium=Find Uranium Ore -achievement.Uranium.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Uranium.desc=Height: 30-60, Chance: 40, Mars/Phobos/Deimos/Ceres/IO/Gannymed/Venus/Enceladus/Oberon/Proteus// achievement.Uraninite=Find Uraninite Ore -achievement.Uraninite.desc=Height: 10-40, Chance: 40, Overworld// +achievement.Uraninite.desc=Height: 30-60, Chance: 40, Mars/Phobos/Deimos/Ceres/IO/Gannymed/Venus/Enceladus/Oberon/Proteus// achievement.Plutonium=Find Plutonium Ore -achievement.Plutonium.desc=Height: 20-30, Chance: 10, Overworld// +achievement.Plutonium.desc=Height: 5-30, Chance: 10, Phobos/Deimos/Ceres/Gannymed/Enceladus/Proteus// achievement.Bastnasite=Find Bastnasite Ore -achievement.Bastnasite.desc=Height: 20-40, Chance: 30, Overworld// +achievement.Bastnasite.desc=Height: 20-40, Chance: 30, Moon/Deimos/IO/Callisto/Venus/Enceladus/Titan/Triton// achievement.Monazite=Find Monazite Ore -achievement.Monazite.desc=Height: 20-40, Chance: 30, Overworld// +achievement.Monazite.desc=Height: 20-40, Chance: 30, Moon/Deimos/IO/Callisto/Venus/Enceladus/Titan/Triton// achievement.Neodymium=Find Neodymium Ore -achievement.Neodymium.desc=Height: 20-40, Chance: 30, Overworld// +achievement.Neodymium.desc=Height: 20-40, Chance: 30, Moon/Deimos/IO/Callisto/Venus/Enceladus/Titan/Triton// achievement.Wulfenite=Find Wulfenite Ore -achievement.Wulfenite.desc=Height: 20-50, Chance: 5, Overworld//End +achievement.Wulfenite.desc=Height: 20-50, Chance: 5, Nether/Twilight-Forrest/Moon/Phobos/Ceres/Mercury/Titan/Proteus/Pluto// achievement.Molybdenite=Find Molybdenite Ore -achievement.Molybdenite.desc=Height: 20-50, Chance: 5, Overworld//End +achievement.Molybdenite.desc=Height: 20-50, Chance: 5, Nether/Twilight-Forrest/Moon/Phobos/Ceres/Mercury/Titan/Proteus/Pluto// achievement.Molybdenum=Find Molybdenum Ore -achievement.Molybdenum.desc=Height: 20-50, Chance: 5, Overworld//End +achievement.Molybdenum.desc=Height: 20-50, Chance: 5, Nether/Twilight-Forrest/Moon/Phobos/Ceres/Mercury/Titan/Proteus/Pluto// achievement.Powellite=Find Powellite Ore -achievement.Powellite.desc=Height: 20-50, Chance: 5, Overworld//End +achievement.Powellite.desc=Height: 20-50, Chance: 5, Nether/Twilight-Forrest/Moon/Phobos/Ceres/Mercury/Titan/Proteus/Pluto// achievement.Scheelite=Find Scheelite Ore -achievement.Scheelite.desc=Height: 20-50, Chance: 10, Overworld//End +achievement.Scheelite.desc=Height: 20-60, Chance: 10, Mars/Deimos/Asteroids/Ganymed/Callisto/Enceladus/Oberon/Pluto// achievement.Tungstate=Find Tungstate Ore -achievement.Tungstate.desc=Height: 20-50, Chance: 10, Overworld//End +achievement.Tungstate.desc=Height: 20-60, Chance: 10, Mars/Deimos/Asteroids/Ganymed/Callisto/Enceladus/Oberon/Pluto// achievement.Lithium=Find Lithium Ore -achievement.Lithium.desc=Height: 20-50, Chance: 10, Overworld//End +achievement.Lithium.desc=Height: 20-60, Chance: 10, Mars/Deimos/Asteroids/Ganymed/Callisto/Enceladus/Oberon/Pluto// achievement.Almandine=Find Almandine Ore -achievement.Almandine.desc=Height: 10-40, Chance: 60, Overworld// +achievement.Almandine.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.Pyrope=Find Pyrope Ore -achievement.Pyrope.desc=Height: 10-40, Chance: 60, Overworld// +achievement.Pyrope.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.Sapphire=Find Sapphire Ore -achievement.Sapphire.desc=Height: 10-40, Chance: 60, Overworld// +achievement.Sapphire.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.GreenSapphire=Find GreenSapphire Ore -achievement.GreenSapphire.desc=Height: 10-40, Chance: 60, Overworld// +achievement.GreenSapphire.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.Grossular=Find Grossular Ore -achievement.Grossular.desc=Height: 20-30, Chance: 20, Overworld//End +achievement.Grossular.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton// achievement.Spessartine=Find Spessartine Ore -achievement.Spessartine.desc=Height: 20-30, Chance: 20, Overworld//End +achievement.Spessartine.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton// achievement.Pyrolusite=Find Pyrolusite Ore -achievement.Pyrolusite.desc=Height: 20-30, Chance: 20, Overworld//End +achievement.Pyrolusite.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton// achievement.Tantalite=Find Tantalite Ore -achievement.Tantalite.desc=Height: 20-30, Chance: 20, Overworld//End +achievement.Tantalite.desc=Height: 20-30, Chance: 20, Overworld/Nether/Ceres/IO/Titan/Oberon/Triton// achievement.Quartzite=Find Quartzite Ore -achievement.Quartzite.desc=Height: 40-80, Chance: 60, Overworld// +achievement.Quartzite.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus// achievement.Barite=Find Barite Ore -achievement.Barite.desc=Height: 40-80, Chance: 60, Overworld// +achievement.Barite.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus// achievement.CertusQuartz=Find CertusQuartz Ore -achievement.CertusQuartz.desc=Height: 40-80, Chance: 60, Overworld// +achievement.CertusQuartz.desc=Height: 40-80, Chance: 60, Nether/Moon/Mars/Phobos/IO/Venus/Proteus// achievement.Graphite=Find Graphite Ore -achievement.Graphite.desc=Height: 5-20, Chance: 40, Overworld// +achievement.Graphite.desc=Height: 5-20, Chance: 40, Overworld/Twilight-Forrest/Phobos/Ganymed/Mercury/Titan/Proteus/Pluto// achievement.Diamond=Find Diamond Ore -achievement.Diamond.desc=Height: 5-20, Chance: 40, Overworld// +achievement.Diamond.desc=Height: 5-20, Chance: 40, Overworld/Twilight-Forrest/Phobos/Ganymed/Mercury/Titan/Proteus/Pluto// achievement.Bentonite=Find Bentonite Ore -achievement.Bentonite.desc=Height: 10-40, Chance: 60, Overworld//End +achievement.Bentonite.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.Magnesite=Find Magnesite Ore -achievement.Magnesite.desc=Height: 10-40, Chance: 60, Overworld//End +achievement.Magnesite.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.Olivine=Find Olivine Ore -achievement.Olivine.desc=Height: 10-40, Chance: 60, Overworld//End +achievement.Olivine.desc=Height: 10-40, Chance: 60, Twilight-Forrest// achievement.Apatite=Find Apatite Ore -achievement.Apatite.desc=Height: 40-60, Chance: 60, Overworld// +achievement.Apatite.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forrest// achievement.Phosphorus=Find Phosphorus Ore -achievement.Phosphorus.desc=Height: 40-60, Chance: 60, Overworld// +achievement.Phosphorus.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forrest// achievement.Phosphate=Find Phosphate Ore -achievement.Phosphate.desc=Height: 40-60, Chance: 60, Overworld// +achievement.Phosphate.desc=Height: 40-60, Chance: 60, Overworld/Twilight-Forrest// achievement.Galena=Find Galena Ore -achievement.Galena.desc=Height: 30-60, Chance: 40, Overworld// +achievement.Galena.desc=Height: 5-45, Chance: 40, Twilight-Forrest/Moon/Mars/Ganymed/Venus/Oberon/Triton// achievement.Silver=Find Silver Ore -achievement.Silver.desc=Height: 30-60, Chance: 40, Overworld// +achievement.Silver.desc=Height: 5-45, Chance: 40, Twilight-Forrest/Moon/Mars/Ganymed/Venus/Oberon/Triton// achievement.Lead=Find Lead Ore -achievement.Lead.desc=Height: 30-60, Chance: 40, Overworld// +achievement.Lead.desc=Height: 5-45, Chance: 40, Twilight-Forrest/Moon/Mars/Ganymed/Venus/Oberon/Triton// achievement.Lazurite=Find Lazurite Ore -achievement.Lazurite.desc=Height: 20-50, Chance: 40, Overworld//End +achievement.Lazurite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest/Deimos/Ceres/Enceladus// achievement.Sodalite=Find Sodalite Ore -achievement.Sodalite.desc=Height: 20-50, Chance: 40, Overworld//End +achievement.Sodalite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest/Deimos/Ceres/Enceladus// achievement.Lapis=Find Lapis Ore -achievement.Lapis.desc=Height: 20-50, Chance: 40, Overworld//End +achievement.Lapis.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest/Deimos/Ceres/Enceladus// achievement.Calcite=Find Calcite Ore -achievement.Calcite.desc=Height: 20-50, Chance: 40, Overworld//End +achievement.Calcite.desc=Height: 20-50, Chance: 40, Overworld/Twilight-Forrest/Deimos/Ceres/Enceladus// achievement.Beryllium=Find Beryllium Ore -achievement.Beryllium.desc=Height: 5-30, Chance: 30, Overworld//End +achievement.Beryllium.desc=Height: 5-30, Chance: 30, Nether/End-Asteroids/Mars/Ceres/Venus/Titan/Pluto// achievement.Emerald=Find Emerald Ore -achievement.Emerald.desc=Height: 5-30, Chance: 30, Overworld//End +achievement.Emerald.desc=Height: 5-30, Chance: 30, Nether/End-Asteroids/Mars/Ceres/Venus/Titan/Pluto// achievement.Thorium=Find Thorium Ore -achievement.Thorium.desc=Height: 5-30, Chance: 30, Overworld//End +achievement.Thorium.desc=Height: 5-30, Chance: 30, Nether/End-Asteroids/Mars/Ceres/Venus/Titan/Pluto// achievement.flintpick=First Tools achievement.flintpick.desc=Craft a flint pick -- cgit From faa4c18f63edb46e60da26e64b597d19abb6b49e Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Mon, 28 Dec 2015 21:04:13 +0100 Subject: Added Blood Asps commits. New debug lang for achievements generation(miuirussia) fuel rod override v2(Blood Asp) Mox not working lik ic2 any more (more heat up more eu) Overriding IC2 fuel rods(Blood Asp) fix teleporter(Blood Asp) Sensor kit should not stack(Blood Asp) Fix teleporter nuclear control support(Blood Asp) Fixed Display overflow(Blood Asp) --- .../assets/gregtech/textures/items/gt.reactorMOXDual.png | Bin 0 -> 419 bytes .../assets/gregtech/textures/items/gt.reactorMOXQuad.png | Bin 0 -> 606 bytes .../gregtech/textures/items/gt.reactorMOXSimple.png | Bin 0 -> 368 bytes .../gregtech/textures/items/gt.reactorUraniumDual.png | Bin 0 -> 574 bytes .../gregtech/textures/items/gt.reactorUraniumQuad.png | Bin 0 -> 739 bytes .../gregtech/textures/items/gt.reactorUraniumSimple.png | Bin 0 -> 528 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.reactorMOXDual.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.reactorMOXQuad.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.reactorMOXSimple.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumDual.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumQuad.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumSimple.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/items/gt.reactorMOXDual.png b/src/main/resources/assets/gregtech/textures/items/gt.reactorMOXDual.png new file mode 100644 index 0000000000..d4e9db237a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.reactorMOXDual.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.reactorMOXQuad.png b/src/main/resources/assets/gregtech/textures/items/gt.reactorMOXQuad.png new file mode 100644 index 0000000000..c2033c67b3 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.reactorMOXQuad.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/gt.reactorMOXSimple.png b/src/main/resources/assets/gregtech/textures/items/gt.reactorMOXSimple.png new file mode 100644 index 0000000000..8b1d1bc667 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.reactorMOXSimple.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 new file mode 100644 index 0000000000..80fe3da0e3 Binary files /dev/null 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 new file mode 100644 index 0000000000..1a58dad322 Binary files /dev/null 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 new file mode 100644 index 0000000000..b2a9614b62 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.reactorUraniumSimple.png differ -- cgit From d718cac331526a1d13a4df12fba42ef01028bd90 Mon Sep 17 00:00:00 2001 From: Teteros Date: Thu, 14 Jan 2016 06:14:53 +0000 Subject: Modify Wet Concrete to be able to use cells Wet Concrete was lacking cell support as it was a 'molten' fluid type. This patch adds a new type 'wet', which replaces 'molten' for Concrete. This means with this patch you can either use the canner with concrete dust to fill the cell, or the fluid canning machine to input or output Wet Concrete. Ideally Wet Concrete would be separate from Concrete as one is solid and the other fluid, but they were kept together for compatibility with existing recipes. 1 Concrete Cell = 144 Wet Concrete = Concrete Block 'Wet' fluid type can be used anytime you'd like both solid and fluid cell support, as these were usually separate for good reasons. Mostly to prevent the awkward ratio above. --- .../textures/blocks/fluids/fluid.molten.concrete.png | Bin 7457 -> 0 bytes .../blocks/fluids/fluid.molten.concrete.png.mcmeta | 5 ----- .../textures/blocks/fluids/fluid.wet.autogenerated.png | Bin 0 -> 21917 bytes .../blocks/fluids/fluid.wet.autogenerated.png.mcmeta | 5 +++++ .../textures/blocks/fluids/fluid.wet.concrete.png | Bin 0 -> 7457 bytes .../blocks/fluids/fluid.wet.concrete.png.mcmeta | 5 +++++ 6 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta (limited to 'src/main/resources/assets/gregtech') 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 deleted file mode 100644 index 208a1792ea..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png.mcmeta deleted file mode 100644 index 0df7234a79..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png new file mode 100644 index 0000000000..8cb44c0505 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.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.wet.concrete.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png new file mode 100644 index 0000000000..208a1792ea Binary files /dev/null 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.wet.concrete.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file -- cgit From af5cef9c05c5e5e12fb250c3e7b5ae1f4e113b60 Mon Sep 17 00:00:00 2001 From: Léa Gris Date: Fri, 29 Jan 2016 15:09:07 +0100 Subject: Fix textures in wrong BMP format to PNG Script to fix ```Bash list=$(find ./ -type f -name \*.png -exec grep -l BM6 {} \;) for v in $list do f=$(echo $v | sed -e 's/\(.*\)\.png/\1/g') mv "$f.png" "$f.bmp" convert "$f.bmp" "$f.png" find ./ -type f -name "$f.bmp" -delete done ``` --- .../gregtech/textures/blocks/iconsets/FUSIONII_1.png | Bin 822 -> 597 bytes .../gregtech/textures/blocks/iconsets/FUSIONII_10.png | Bin 822 -> 592 bytes .../gregtech/textures/blocks/iconsets/FUSIONII_11.png | Bin 822 -> 618 bytes .../gregtech/textures/blocks/iconsets/FUSIONII_12.png | Bin 822 -> 586 bytes .../gregtech/textures/blocks/iconsets/FUSIONII_2.png | Bin 822 -> 603 bytes .../gregtech/textures/blocks/iconsets/FUSIONII_3.png | Bin 822 -> 535 bytes .../gregtech/textures/blocks/iconsets/FUSIONII_4.png | Bin 822 -> 544 bytes .../gregtech/textures/blocks/iconsets/FUSIONII_5.png | Bin 822 -> 558 bytes .../gregtech/textures/blocks/iconsets/FUSIONII_6.png | Bin 822 -> 562 bytes .../gregtech/textures/blocks/iconsets/FUSIONII_7.png | Bin 822 -> 488 bytes .../gregtech/textures/blocks/iconsets/FUSIONII_8.png | Bin 822 -> 646 bytes .../gregtech/textures/blocks/iconsets/FUSIONII_9.png | Bin 822 -> 582 bytes .../gregtech/textures/blocks/iconsets/FUSIONI_1.png | Bin 822 -> 601 bytes .../gregtech/textures/blocks/iconsets/FUSIONI_10.png | Bin 822 -> 595 bytes .../gregtech/textures/blocks/iconsets/FUSIONI_11.png | Bin 822 -> 626 bytes .../gregtech/textures/blocks/iconsets/FUSIONI_12.png | Bin 822 -> 594 bytes .../gregtech/textures/blocks/iconsets/FUSIONI_2.png | Bin 822 -> 611 bytes .../gregtech/textures/blocks/iconsets/FUSIONI_3.png | Bin 822 -> 542 bytes .../gregtech/textures/blocks/iconsets/FUSIONI_4.png | Bin 822 -> 551 bytes .../gregtech/textures/blocks/iconsets/FUSIONI_5.png | Bin 822 -> 567 bytes .../gregtech/textures/blocks/iconsets/FUSIONI_6.png | Bin 822 -> 569 bytes .../gregtech/textures/blocks/iconsets/FUSIONI_7.png | Bin 822 -> 495 bytes .../gregtech/textures/blocks/iconsets/FUSIONI_8.png | Bin 822 -> 649 bytes .../gregtech/textures/blocks/iconsets/FUSIONI_9.png | Bin 822 -> 589 bytes .../blocks/iconsets/MACHINE_CASING_DRAGONEGG.png | Bin 822 -> 472 bytes .../textures/blocks/iconsets/MACHINE_CASING_FUSION.png | Bin 822 -> 649 bytes .../blocks/iconsets/MACHINE_CASING_FUSION_2.png | Bin 822 -> 646 bytes .../blocks/iconsets/MACHINE_CASING_FUSION_COIL.png | Bin 822 -> 549 bytes .../blocks/iconsets/MACHINE_CASING_FUSION_GLASS.png | Bin 822 -> 616 bytes .../iconsets/MACHINE_CASING_FUSION_GLASS_YELLOW.png | Bin 822 -> 594 bytes .../textures/blocks/iconsets/MACHINE_CASING_MAGIC.png | Bin 822 -> 500 bytes .../blocks/iconsets/MACHINE_CASING_MAGIC_ACTIVE.png | Bin 822 -> 500 bytes .../blocks/iconsets/MACHINE_CASING_MAGIC_FRONT.png | Bin 822 -> 330 bytes .../iconsets/MACHINE_CASING_MAGIC_FRONT_ACTIVE.png | Bin 822 -> 330 bytes .../textures/blocks/iconsets/OVERLAY_TELEPORTER.png | Bin 822 -> 577 bytes .../blocks/iconsets/OVERLAY_TELEPORTER_ACTIVE.png | Bin 822 -> 577 bytes .../textures/blocks/iconsets/VENT_ADVANCED.png | Bin 3126 -> 720 bytes .../gregtech/textures/blocks/iconsets/VENT_NORMAL.png | Bin 3126 -> 606 bytes 38 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_1.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_1.png index 62bb0b0b5a..102e96f3c2 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_1.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_10.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_10.png index f2f1bf2d18..292f4d09b0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_10.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_10.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_11.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_11.png index 983fdda997..54a5c8fba0 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_11.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_11.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_12.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_12.png index 1ad1cf69eb..16dd6ee0a1 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_12.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_12.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_2.png index 86fe13b8f7..108e2eaa6c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_2.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_3.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_3.png index 8bbbf40ab8..1cc144aa9d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_3.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_4.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_4.png index e6175b3525..d5ac6826be 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_4.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_5.png index 58b591f5a6..76d6f6c11c 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_5.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_6.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_6.png index ac2ac3818f..f9fdf75316 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_6.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_7.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_7.png index 014df80d0c..acc12e8c7f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_7.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_7.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_8.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_8.png index 10ea4d8cba..1223f4c109 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_8.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_8.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_9.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_9.png index 9407286b72..989a9f4f95 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_9.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONII_9.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_1.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_1.png index 5804a0aa24..da68d56cab 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_1.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_1.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_10.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_10.png index 923c7e606f..1ece64c120 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_10.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_10.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_11.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_11.png index 2d8ecc34a3..0234f682cb 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_11.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_11.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_12.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_12.png index 93bc9e05e6..4133cfda64 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_12.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_12.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_2.png index b13be5bf8d..09045448fb 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_2.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_3.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_3.png index e500b1033a..2d535f107f 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_3.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_3.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_4.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_4.png index e887123149..b989076626 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_4.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_4.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_5.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_5.png index cbdf3ef6d0..dc6b0d1623 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_5.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_5.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_6.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_6.png index a7ef6ba6da..88aec9b0d2 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_6.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_6.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_7.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_7.png index 9193deca08..8f307b5217 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_7.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_7.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_8.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_8.png index d172b46f89..f47e861ce2 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_8.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_8.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_9.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_9.png index a9f041ebd5..f59ff53215 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_9.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/FUSIONI_9.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_DRAGONEGG.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_DRAGONEGG.png index 2e87357a67..d70bfa5229 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_DRAGONEGG.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_DRAGONEGG.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION.png index d172b46f89..f47e861ce2 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_2.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_2.png index 10ea4d8cba..1223f4c109 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_2.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_2.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL.png index fe13f9cd0c..d436d60d51 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_COIL.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS.png index f9cf9f0f7e..dc543897cb 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_YELLOW.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_YELLOW.png index 712c6d800d..c651126220 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_YELLOW.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_FUSION_GLASS_YELLOW.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC.png index c68c3230f0..6a7f6cc259 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC_ACTIVE.png index 333efe15ff..ae0df4605d 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC_ACTIVE.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC_FRONT.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC_FRONT.png index c9437ac9a4..c6a9ff8587 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC_FRONT.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC_FRONT.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC_FRONT_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC_FRONT_ACTIVE.png index 6977046227..bcfb198abe 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC_FRONT_ACTIVE.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_MAGIC_FRONT_ACTIVE.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 7aa22a9065..6d7514017f 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 b94b3aac3a..9792d34e75 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/VENT_ADVANCED.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/VENT_ADVANCED.png index c9663bf711..01fa40f678 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/VENT_ADVANCED.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/VENT_ADVANCED.png differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/VENT_NORMAL.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/VENT_NORMAL.png index 0b49d7534b..f5d3da89ea 100644 Binary files a/src/main/resources/assets/gregtech/textures/blocks/iconsets/VENT_NORMAL.png and b/src/main/resources/assets/gregtech/textures/blocks/iconsets/VENT_NORMAL.png differ -- cgit From f2876a31a33b3f94edfdadb6dc725f821c962398 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 2 Apr 2016 13:06:18 +0200 Subject: Try to add a new Fluid Cell to GT --- .../gregtech/textures/items/gt.metaitem.01/407.png | Bin 0 -> 2927 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png (limited to 'src/main/resources/assets/gregtech') 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 new file mode 100644 index 0000000000..f90778d04c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/407.png differ -- cgit From 975f9c718f9d7dc5b7656b3a7ab8e0b47ccf9449 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 2 Apr 2016 14:19:59 +0200 Subject: Add more Large Fluid Cells --- .../gregtech/textures/items/gt.metaitem.01/407.png | Bin 2927 -> 2975 bytes .../gregtech/textures/items/gt.metaitem.01/408.png | Bin 0 -> 2959 bytes .../gregtech/textures/items/gt.metaitem.01/409.png | Bin 0 -> 2978 bytes .../gregtech/textures/items/gt.metaitem.01/410.png | Bin 0 -> 2984 bytes .../gregtech/textures/items/gt.metaitem.01/411.png | Bin 0 -> 2955 bytes .../gregtech/textures/items/gt.metaitem.01/412.png | Bin 0 -> 2966 bytes .../gregtech/textures/items/gt.metaitem.01/413.png | Bin 0 -> 2941 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/408.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/409.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/410.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/411.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/412.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png (limited to 'src/main/resources/assets/gregtech') 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 f90778d04c..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 new file mode 100644 index 0000000000..86ae8dd7e2 Binary files /dev/null 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 new file mode 100644 index 0000000000..bff278d333 Binary files /dev/null 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 new file mode 100644 index 0000000000..f3d8ce11f2 Binary files /dev/null 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 new file mode 100644 index 0000000000..61f7255c52 Binary files /dev/null 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 new file mode 100644 index 0000000000..5cba994104 Binary files /dev/null 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 new file mode 100644 index 0000000000..80cd9711cd Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/413.png differ -- cgit From 54bdb20c500c3edeadc02e274eb2226bd88f2ea3 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sun, 3 Apr 2016 13:50:42 +0200 Subject: Change two textures for the New Cans --- .../gregtech/textures/items/gt.metaitem.01/409.png | Bin 2978 -> 2932 bytes .../gregtech/textures/items/gt.metaitem.01/410.png | Bin 2984 -> 2917 bytes 2 files changed, 0 insertions(+), 0 deletions(-) (limited to 'src/main/resources/assets/gregtech') 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 bff278d333..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 f3d8ce11f2..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 -- cgit From 6427be7b6d30811e979b346d5477daf0c84e9334 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Mon, 4 Apr 2016 20:04:53 +0200 Subject: adding Adv Miner to us Version adding Drilling Fluid added a few Textures from Gt 5.09 --- .../blocks/fluids/fluid.liquid_drillingfluid.png | Bin 0 -> 6267 bytes .../blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta | 5 +++++ .../textures/gui/multimachines/Advanced_Miner2.png | Bin 0 -> 4373 bytes .../textures/gui/multimachines/DistillationTower.png | Bin 0 -> 4366 bytes .../gregtech/textures/gui/multimachines/DrillingRig.png | Bin 0 -> 4364 bytes .../textures/gui/multimachines/LargeHeatExchanger.png | Bin 0 -> 4437 bytes .../gregtech/textures/gui/multimachines/LargeTurbine.png | Bin 0 -> 4313 bytes .../textures/gui/multimachines/OilCrackingUnit.png | Bin 0 -> 4379 bytes .../gregtech/textures/gui/multimachines/PyrolyseOven.png | Bin 0 -> 4426 bytes 9 files changed, 5 insertions(+) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta create mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/Advanced_Miner2.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/LargeHeatExchanger.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png (limited to 'src/main/resources/assets/gregtech') 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 new file mode 100644 index 0000000000..8ce2ce80a8 Binary files /dev/null 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_drillingfluid.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta new file mode 100644 index 0000000000..0df7234a79 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file 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 new file mode 100644 index 0000000000..7c9bbc058a Binary files /dev/null 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/DistillationTower.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png new file mode 100644 index 0000000000..65e6ac3197 Binary files /dev/null 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 new file mode 100644 index 0000000000..7b60ec4de7 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.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 new file mode 100644 index 0000000000..9f0f9d59b2 Binary files /dev/null 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 new file mode 100644 index 0000000000..296d75f9dd Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.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 new file mode 100644 index 0000000000..57e92ac9db Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.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 new file mode 100644 index 0000000000..d3bc30c7bd Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png differ -- cgit From 35b5bb31f9fab7f4bfdf854d05197ae3512c052c Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Sat, 9 Apr 2016 14:02:34 +0200 Subject: Revert "adding Adv Miner to us Version" This reverts commit 6427be7b6d30811e979b346d5477daf0c84e9334. --- .../blocks/fluids/fluid.liquid_drillingfluid.png | Bin 6267 -> 0 bytes .../blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta | 5 ----- .../textures/gui/multimachines/Advanced_Miner2.png | Bin 4373 -> 0 bytes .../textures/gui/multimachines/DistillationTower.png | Bin 4366 -> 0 bytes .../gregtech/textures/gui/multimachines/DrillingRig.png | Bin 4364 -> 0 bytes .../textures/gui/multimachines/LargeHeatExchanger.png | Bin 4437 -> 0 bytes .../gregtech/textures/gui/multimachines/LargeTurbine.png | Bin 4313 -> 0 bytes .../textures/gui/multimachines/OilCrackingUnit.png | Bin 4379 -> 0 bytes .../gregtech/textures/gui/multimachines/PyrolyseOven.png | Bin 4426 -> 0 bytes 9 files changed, 5 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png delete mode 100644 src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta delete mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/Advanced_Miner2.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/LargeHeatExchanger.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.png delete mode 100644 src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png (limited to 'src/main/resources/assets/gregtech') 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 deleted file mode 100644 index 8ce2ce80a8..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta deleted file mode 100644 index 0df7234a79..0000000000 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation":{ - "frametime":2 - } -} \ No newline at end of file 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 deleted file mode 100644 index 7c9bbc058a..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/Advanced_Miner2.png and /dev/null 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 deleted file mode 100644 index 65e6ac3197..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/DistillationTower.png and /dev/null 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 deleted file mode 100644 index 7b60ec4de7..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/DrillingRig.png and /dev/null 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 deleted file mode 100644 index 9f0f9d59b2..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeHeatExchanger.png and /dev/null 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 deleted file mode 100644 index 296d75f9dd..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/LargeTurbine.png and /dev/null 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 deleted file mode 100644 index 57e92ac9db..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/OilCrackingUnit.png and /dev/null 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 deleted file mode 100644 index d3bc30c7bd..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/gui/multimachines/PyrolyseOven.png and /dev/null differ -- cgit From cb2b3cc679df0e6f4a6f2b8e91bae25e5be2862c Mon Sep 17 00:00:00 2001 From: Technus Date: Mon, 18 Apr 2016 19:00:33 +0200 Subject: Added files via upload --- .../resources/assets/gregtech/textures/TecCape.png | Bin 0 -> 123893 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/TecCape.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/TecCape.png b/src/main/resources/assets/gregtech/textures/TecCape.png new file mode 100644 index 0000000000..15d3c808d2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/TecCape.png differ -- cgit From 9b55e2700b8cbe22d2753a516d91c38a201df8a4 Mon Sep 17 00:00:00 2001 From: Technus Date: Tue, 19 Apr 2016 19:54:51 +0200 Subject: Delete TecCape.png --- .../resources/assets/gregtech/textures/TecCape.png | Bin 123893 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/gregtech/textures/TecCape.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/TecCape.png b/src/main/resources/assets/gregtech/textures/TecCape.png deleted file mode 100644 index 15d3c808d2..0000000000 Binary files a/src/main/resources/assets/gregtech/textures/TecCape.png and /dev/null differ -- cgit From 966c948d3699d5ca478e32a7c5b2a68d7162294b Mon Sep 17 00:00:00 2001 From: Technus Date: Tue, 19 Apr 2016 19:55:28 +0200 Subject: Added files via upload --- .../resources/assets/gregtech/textures/DevCape.png | Bin 0 -> 525481 bytes .../resources/assets/gregtech/textures/DonorCape.png | Bin 0 -> 394192 bytes .../resources/assets/gregtech/textures/TecCape.png | Bin 0 -> 1576004 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/DevCape.png create mode 100644 src/main/resources/assets/gregtech/textures/DonorCape.png create mode 100644 src/main/resources/assets/gregtech/textures/TecCape.png (limited to 'src/main/resources/assets/gregtech') diff --git a/src/main/resources/assets/gregtech/textures/DevCape.png b/src/main/resources/assets/gregtech/textures/DevCape.png new file mode 100644 index 0000000000..6486b57e12 Binary files /dev/null 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 new file mode 100644 index 0000000000..fbfd7b72fb Binary files /dev/null and b/src/main/resources/assets/gregte