aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2022-07-26 00:57:33 +0100
committerGitHub <noreply@github.com>2022-07-26 06:57:33 +0700
commit853c0f248a9b62de4346b82e47eb4fd1a8a682d2 (patch)
tree901f7477391d4a5a8bacc4e0bd0bcffa2b68df69 /src/main
parenta1dcf3cfdbd3cf0ea345e94b73d723395d473ab3 (diff)
downloadGT5-Unofficial-853c0f248a9b62de4346b82e47eb4fd1a8a682d2.tar.gz
GT5-Unofficial-853c0f248a9b62de4346b82e47eb4fd1a8a682d2.tar.bz2
GT5-Unofficial-853c0f248a9b62de4346b82e47eb4fd1a8a682d2.zip
New material + item + texture changes. (#1161)
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java2
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java3
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/frameGt.pngbin5848 -> 19806 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeHuge.pngbin5464 -> 17916 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeLarge.pngbin5350 -> 18691 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeMedium.pngbin5268 -> 18660 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeNonuple.pngbin5890 -> 19856 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeQuadruple.pngbin5785 -> 19162 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeSide.pngbin5091 -> 18215 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeSmall.pngbin5174 -> 21035 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeTiny.pngbin5182 -> 18556 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/wire.pngbin5402 -> 19041 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/415.pngbin0 -> 478936 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/415.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/TURBINE_BLADE.pngbin0 -> 200259 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/TURBINE_BLADE.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/TURBINE_BLADE_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/arrowGtPlastic.pngbin0 -> 59514 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/arrowGtPlastic.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/arrowGtPlastic_OVERLAY.pngbin0 -> 283 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/arrowGtWood.pngbin0 -> 59514 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/arrowGtWood.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/arrowGtWood_OVERLAY.pngbin0 -> 294 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/bolt.pngbin0 -> 75270 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/bolt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/bolt_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/casingSmall.pngbin0 -> 231286 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/casingSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/cell.pngbin0 -> 1628 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/cell.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/cellPlasma.pngbin0 -> 1628 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/cellPlasma.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/cellPlasma_OVERLAY.pngbin0 -> 290 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/cell_OVERLAY.pngbin0 -> 309 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crateGtDust.pngbin0 -> 3426 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crateGtDust.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crateGtDust_OVERLAY.pngbin0 -> 506 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crateGtGem.pngbin0 -> 3231 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crateGtGem.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crateGtGem_OVERLAY.pngbin0 -> 526 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crateGtIngot.pngbin0 -> 104220 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crateGtIngot.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crateGtIngot_OVERLAY.pngbin0 -> 517 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crateGtPlate.pngbin0 -> 123089 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crateGtPlate.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crateGtPlate_OVERLAY.pngbin0 -> 449 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crushed.pngbin0 -> 334632 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crushed.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crushedCentrifuged.pngbin0 -> 226882 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crushedCentrifuged.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crushedCentrifuged_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crushedPurified.pngbin0 -> 344359 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crushedPurified.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crushedPurified_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crushed_OVERLAY.pngbin0 -> 268803 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/crushed_OVERLAY.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dust.pngbin0 -> 171004 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dust.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustImpure.pngbin0 -> 171004 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustImpure.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustImpure_OVERLAY.pngbin0 -> 151406 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustImpure_OVERLAY.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustPure.pngbin0 -> 171004 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustPure.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustPure_OVERLAY.pngbin0 -> 150964 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustPure_OVERLAY.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustSmall.pngbin0 -> 98577 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustTiny.pngbin0 -> 66505 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustTiny.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dustTiny_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/dust_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/foil.pngbin0 -> 10353 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/foil.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/foil_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gearGt.pngbin0 -> 342918 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gearGt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gearGtSmall.pngbin0 -> 201395 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gearGtSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gearGtSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gearGt_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gem.pngbin0 -> 249344 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gem.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gemChipped.pngbin0 -> 261375 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gemChipped.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gemChipped_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gemExquisite.pngbin0 -> 376841 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gemExquisite.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gemExquisite_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gemFlawed.pngbin0 -> 288283 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gemFlawed.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gemFlawed_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gemFlawless.pngbin0 -> 298667 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gemFlawless.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gemFlawless_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/gem_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/handleMallet.pngbin0 -> 124128 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/handleMallet.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/handleMallet_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingot.pngbin0 -> 214766 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingot.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotDouble.pngbin0 -> 264063 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotDouble.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotDouble_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotHot.pngbin0 -> 214483 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotHot.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotHot_OVERLAY.pngbin0 -> 209074 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotHot_OVERLAY.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotQuadruple.pngbin0 -> 290389 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotQuadruple.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotQuadruple_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotQuintuple.pngbin0 -> 292273 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotQuintuple.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotQuintuple_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotTriple.pngbin0 -> 277564 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotTriple.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingotTriple_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/ingot_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/lens.pngbin0 -> 154174 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/lens.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/transcendentmetal/lens_OVER