aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java35
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsBotania.java23
-rw-r--r--src/main/java/gregtech/api/enums/TextureSet.java2
-rw-r--r--src/main/java/gregtech/api/util/GT_Assemblyline_Server.java7
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.gaiaspirit.pngbin0 -> 43590 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.gaiaspirit.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/block1.pngbin0 -> 1743 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/block1.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/block2.pngbin0 -> 1744 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/block2.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/block3.pngbin0 -> 1803 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/block3.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/block4.pngbin0 -> 1762 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/block4.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/block5.pngbin0 -> 1738 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/block5.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/block6.pngbin0 -> 1743 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/block6.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/foil.pngbin0 -> 1699 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/foil.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/frameGt.pngbin0 -> 1746 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/frameGt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/ore.pngbin0 -> 1296 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/ore.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/oreSmall.pngbin0 -> 1345 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/oreSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeHuge.pngbin0 -> 1727 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeHuge.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeLarge.pngbin0 -> 1749 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeLarge.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeMedium.pngbin0 -> 1736 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeMedium.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeNonuple.pngbin0 -> 1759 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeNonuple.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeQuadruple.pngbin0 -> 1775 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeQuadruple.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeSide.pngbin0 -> 1713 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeSide.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeSmall.pngbin0 -> 1725 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeTiny.pngbin0 -> 1730 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/pipeTiny.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/void.pngbin0 -> 1095 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/void.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/wire.pngbin0 -> 1745 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Dreamwood/wire.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/block1.pngbin0 -> 25674 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/block1.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/block2.pngbin0 -> 25564 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/block2.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/block3.pngbin0 -> 26677 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/block3.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/block4.pngbin0 -> 28103 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/block4.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/block5.pngbin0 -> 16775 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/block5.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/block6.pngbin0 -> 25674 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/block6.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/foil.pngbin0 -> 20686 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/foil.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/frameGt.pngbin0 -> 20825 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/frameGt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/ore.pngbin0 -> 8739 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/ore.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/oreSmall.pngbin0 -> 12507 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/oreSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeHuge.pngbin0 -> 24154 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeHuge.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeLarge.pngbin0 -> 29361 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeLarge.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeMedium.pngbin0 -> 28574 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeMedium.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeNonuple.pngbin0 -> 22648 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeNonuple.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeQuadruple.pngbin0 -> 25713 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeQuadruple.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeSide.pngbin0 -> 26882 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeSide.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeSmall.pngbin0 -> 27928 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeTiny.pngbin0 -> 27742 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/pipeTiny.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/void.pngbin0 -> 263 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/void.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/wire.pngbin0 -> 35776 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/GaiaSpirit/wire.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/block1.pngbin0 -> 764 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/block1.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/block2.pngbin0 -> 764 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/block2.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/block3.pngbin0 -> 769 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/block3.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/block4.pngbin0 -> 767 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/block4.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/block5.pngbin0 -> 764 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/block5.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/block6.pngbin0 -> 764 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/block6.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/foil.pngbin0 -> 763 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/foil.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/frameGt.pngbin0 -> 769 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/frameGt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/ore.pngbin0 -> 278 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/ore.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/oreSmall.pngbin0 -> 326 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/oreSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeHuge.pngbin0 -> 767 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeHuge.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeLarge.pngbin0 -> 779 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeLarge.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeMedium.pngbin0 -> 775 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeMedium.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeNonuple.pngbin0 -> 783 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeNonuple.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeQuadruple.pngbin0 -> 774 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeQuadruple.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeSide.pngbin0 -> 766 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeSide.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeSmall.pngbin0 -> 772 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeTiny.pngbin0 -> 771 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/pipeTiny.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/void.pngbin0 -> 75 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/void.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/wire.pngbin0 -> 765 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/Livingrock/wire.png.mcmeta1
-rw-r--r--src/m