aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2016-06-21 19:21:14 +0200
committerDream-Master <dream-master@gmx.net>2016-06-21 19:21:14 +0200
commit4f1900142313bf92a82f48fc146bd8c806734d7a (patch)
tree38387991fa4a64aecd8b97c3f4cf27a3c7f97653 /src/main/resources
parent6fe4d4a8d3226c02a65a70d7a8035a219cbd2c66 (diff)
parent2651e69c7037e2f5e19b404158506941999cde08 (diff)
downloadGT5-Unofficial-4f1900142313bf92a82f48fc146bd8c806734d7a.tar.gz
GT5-Unofficial-4f1900142313bf92a82f48fc146bd8c806734d7a.tar.bz2
GT5-Unofficial-4f1900142313bf92a82f48fc146bd8c806734d7a.zip
Merge branch 'experimental'
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/gregtech/lang/en_US.lang223
-rw-r--r--src/main/resources/assets/gregtech/textures/DevCape.pngbin525481 -> 0 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/DonorCape.pngbin394192 -> 0 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/TecCape.pngbin1576004 -> 0 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.pngbin0 -> 145 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.pngbin0 -> 145 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.pngbin0 -> 6267 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_heavy_fuel.png.mcmeta (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.png.mcmeta)0
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.pngbin0 -> 7298 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_cracked_light_fuel.png.mcmeta (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png.mcmeta)0
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.pngbin0 -> 6267 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_drillingfluid.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.pngbin0 -> 11401 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_epichlorhydrin.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.pngbin0 -> 6267 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_heavy_fuel.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_hydricsulfur.pngbin0 -> 9247 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_hydricsulfur.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.pngbin0 -> 7298 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_light_fuel.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.pngbin0 -> 5475 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_lpg.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_naphtha.pngbin0 -> 7298 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_naphtha.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_nitrationmixture.pngbin0 -> 4470 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_nitrationmixture.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sufluriclight_fuel.pngbin0 -> 7298 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sufluriclight_fuel.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricheavy_fuel.pngbin0 -> 6267 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricheavy_fuel.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricnaphtha.pngbin0 -> 7298 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_sulfuricnaphtha.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_toluene.pngbin0 -> 11401 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_toluene.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.concrete.png)bin7457 -> 7457 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.concrete.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitricacid.pngbin0 -> 4470 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitricacid.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.bluevitriol.pngbin0 -> 5470 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.bluevitriol.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.nickelsulfate.pngbin0 -> 5605 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.solution.nickelsulfate.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.titaniumtetrachloride.pngbin0 -> 12870 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.titaniumtetrachloride.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.wet.autogenerated.pngbin21917 -> 0 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ADAMANTIUM.pngbin0 -> 392 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_AERCRYSTAL.pngbin0 -> 691 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ALUMINIUM.pngbin0 -> 436 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_AMBER.pngbin0 -> 727 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_AMERICIUM.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_AMETHYST.pngbin0 -> 728 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ANNEALEDCOPPER.pngbin0 -> 415 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ANTIMONY.pngbin0 -> 401 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_AQUACRYSTAL.pngbin0 -> 744 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ARSENIC.pngbin0 -> 342 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ASTRALSILVER.pngbin0 -> 398 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BATTERYALLOY.pngbin0 -> 642 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BERYLLIUM.pngbin0 -> 442 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BISMUTH.pngbin0 -> 428 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BISMUTHBRONZE.pngbin0 -> 679 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLACKBRONZE.pngbin0 -> 737 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLACKSTEEL.pngbin0 -> 385 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLUEALLOY.pngbin0 -> 739 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLUESTEEL.pngbin0 -> 446 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BLUETOPAZ.pngbin0 -> 735 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BRASS.pngbin0 -> 445 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BRONZE.pngbin0 -> 444 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_BRONZEPREIN.pngbin0 -> 822 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_CAESIUM.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_CERIUM.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_CERTUSQUARTZ.pngbin0 -> 603 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_CHARCOAL.pngbin0 -> 653 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_CHROME.pngbin0 -> 417 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_CHROMIUMDIOXIDE.pngbin0 -> 598 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_COBALT.pngbin0 -> 442 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_COBALTBRASS.pngbin0 -> 439 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_COPPER.pngbin0 -> 413 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_CUPRONICKEL.pngbin0 -> 447 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DAMASCUSSTEEL.pngbin0 -> 385 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DARKIRON.pngbin0 -> 596 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DEEPIRON.pngbin0 -> 432 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DESH.pngbin0 -> 424 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DILITHIUM.pngbin0 -> 508 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DURANIUM.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_DYSPROSIUM.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ELECTRUM.pngbin0 -> 442 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ELECTRUMFLUX.pngbin0 -> 442 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ENDEREYE.pngbin0 -> 682 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ENDERIUM.pngbin0 -> 697 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ENDERPEARL.pngbin0 -> 702 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ERBIUM.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_EUROPIUM.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FIERYSTEEL.pngbin0 -> 320 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FOOLSRUBY.pngbin0 -> 693 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCE.pngbin0 -> 710 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCICIUM.pngbin0 -> 539 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FORCILLIUM.pngbin0 -> 539 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_GADOLINIUM.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_GALLIUM.pngbin0 -> 392 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_GREENSAPPHIRE.pngbin0 -> 721 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_HOLMIUM.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_HSLA.pngbin0 -> 398 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_HSSE.pngbin0 -> 442 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_HSSG.pngbin0 -> 437 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_HSSS.pngbin0 -> 728 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IGNISCRYSTAL.pngbin0 -> 722 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_INDIUM.pngbin0 -> 401 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_INFUSEDGOLD.pngbin0 -> 452 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_INVAR.pngbin0 -> 443 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IRIDIUM.pngbin0 -> 375 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IRONMAGNETIC.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IRONWOOD.pngbin0 -> 431 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_IRREIN.pngbin0 -> 822 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_JASPER.pngbin0 -> 710 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_KANTHAL.pngbin0 -> 431 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_KNIGHTMETAL.pngbin0 -> 428 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_LANTHANUM.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_LAZURITE.pngbin0 -> 749 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_LEAD.pngbin0 -> 390 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_LIGNITE.pngbin0 -> 653 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_LUTETIUM.pngbin0 -> 333 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_MAGNALIUM.pngbin0 -> 643 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_MAGNESIUM.pngbin0 -> 412 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_MANGANESE.pngbin0 -> 361 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_METEORICIRON.pngbin0 -> 431 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_METEORICSTEEL.pngbin0 -> 408 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_MIDASIUM.pngbin0 -> 427 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_MITHRIL.pngbin0 -> 421 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_MOLYBDENUM.pngbin0 -> 429 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_MONAZITE.pngbin0 -> 520 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAH.pngbin0 -> 366 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHALLOY.pngbin0 -> 366 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADAHENRICHED.pngbin0 -> 353 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NAQUADRIA.pngbin0 -> 338 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEODYMIUM.pngbin0 -> 377 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEODYMIUMMAGNETIC.pngbin0 -> 377 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NETHERSTAR.pngbin0 -> 508 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NEUTRONIUM.pngbin0 -> 375 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NICHROME.pngbin0 -> 440 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NICKEL.pngbin0 -> 440 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NIOBIUM.pngbin0 -> 432 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NIOBIUMNITRIDE.pngbin0 -> 489 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NIOBIUMTITANIUM.pngbin0 -> 493 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_NITER.pngbin0 -> 657 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_OLIVINE.pngbin0 -> 714 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_OPAL.pngbin0 -> 735 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_ORDOCRYSTAL.pngbin0 -> 508 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_OSMIRIDIUM.pngbin0 -> 446 bytes
-rw-r--r--