aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2022-07-05 14:03:16 +0100
committerGitHub <noreply@github.com>2022-07-05 20:03:16 +0700
commit6b3ccc0b738d3df07f5e515963d65d8001fd07f2 (patch)
tree5969eb78aa3cf28b5d0b1b301470c9860f32940a /src/main
parent6ae126921b95a38acef23e6025371f032f5ae2f4 (diff)
downloadGT5-Unofficial-6b3ccc0b738d3df07f5e515963d65d8001fd07f2.tar.gz
GT5-Unofficial-6b3ccc0b738d3df07f5e515963d65d8001fd07f2.tar.bz2
GT5-Unofficial-6b3ccc0b738d3df07f5e515963d65d8001fd07f2.zip
Small Fixes (#1113)
* Localisation of inf coils * Make GT storage blocks a valid beacon. * Improved infinity textures (again), thanks Jimbno. * Adjust author colour Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Storage.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java8
-rw-r--r--src/main/resources/assets/gregtech/lang/en_US.lang2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/block1.pngbin6804 -> 5261 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/block1.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/block2.pngbin7108 -> 5560 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/block2.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/block3.pngbin7535 -> 5775 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/block3.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/block4.pngbin7230 -> 5525 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/block4.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/block5.pngbin6854 -> 5300 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/block5.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/block6.pngbin6804 -> 5261 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/block6.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/foil.pngbin6715 -> 5259 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/foil.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/frameGt.pngbin7495 -> 5848 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/frameGt.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/ore.pngbin4217 -> 1689 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/ore.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/oreSmall.pngbin4392 -> 2063 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/oreSmall.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeHuge.pngbin6714 -> 5464 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeHuge.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeLarge.pngbin6971 -> 5350 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeLarge.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeMedium.pngbin6968 -> 5268 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeMedium.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeNonuple.pngbin7413 -> 5890 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeNonuple.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeQuadruple.pngbin7104 -> 5785 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeQuadruple.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeSide.pngbin6835 -> 5091 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeSide.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeSmall.pngbin6950 -> 5174 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeSmall.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeTiny.pngbin6932 -> 5182 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/pipeTiny.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/void.pngbin2709 -> 98 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/void.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/wire.pngbin6873 -> 5402 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/infinity/wire.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/TURBINE_BLADE.pngbin4931 -> 2535 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/TURBINE_BLADE.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/arrowGtPlastic.pngbin3344 -> 900 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/arrowGtPlastic.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/arrowGtWood.pngbin3344 -> 900 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/arrowGtWood.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/bolt.pngbin3519 -> 743 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/bolt.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/casingSmall.pngbin5737 -> 3965 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/casingSmall.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/cell.pngbin3365 -> 775 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/cell.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/cellPlasma.pngbin3365 -> 775 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/cellPlasma.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crateGtDust.pngbin3668 -> 1070 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crateGtDust.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crateGtGem.pngbin3606 -> 963 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crateGtGem.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crateGtIngot.pngbin3638 -> 1038 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crateGtIngot.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crateGtPlate.pngbin3795 -> 1210 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crateGtPlate.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crushed.pngbin6299 -> 3876 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crushed.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crushedCentrifuged.pngbin5103 -> 2978 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crushedCentrifuged.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crushedPurified.pngbin6452 -> 4240 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/crushedPurified.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/dust.pngbin5232 -> 2836 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/dust.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/dustImpure.pngbin5232 -> 2836 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/dustImpure.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/dustImpure_OVERLAY.pngbin430 -> 430 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/dustPure.pngbin5232 -> 2836 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/dustPure.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/dustPure_OVERLAY.pngbin424 -> 424 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/dustSmall.pngbin4002 -> 1334 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/dustSmall.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/dustTiny.pngbin3520 -> 829 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/dustTiny.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/foil.pngbin5714 -> 3398 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/foil.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gearGt.pngbin6351 -> 4334 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gearGt.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gearGtSmall.pngbin4821 -> 2260 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gearGtSmall.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gem.pngbin6214 -> 4022 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gem.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gemChipped.pngbin5119 -> 2637 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gemChipped.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gemExquisite.pngbin6582 -> 4812 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gemExquisite.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gemFlawed.pngbin5316 -> 2973 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gemFlawed.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gemFlawless.pngbin5757 -> 3444 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/gemFlawless.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/handleMallet.pngbin4423 -> 1998 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/handleMallet.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingot.pngbin6170 -> 4084 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingot.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotDouble.pngbin6942 -> 5419 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotDouble.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotHot.pngbin5927 -> 3825 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotHot.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuadruple.pngbin7406 -> 6280 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuadruple.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuintuple.pngbin7558 -> 6414 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotQuintuple.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotTriple.pngbin7155 -> 5747 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/ingotTriple.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/lens.pngbin5452 -> 3203 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/lens.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/nugget.pngbin4000 -> 1288 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/nugget.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/plate.pngbin5667 -> 3530 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/plate.png.mcmeta2
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/plateDense.pngbin5818 -> 4003 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/infinity/plateDense.png.mcmeta2
-rw-r--r--