aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java25
-rw-r--r--src/main/java/gregtech/api/enums/TextureSet.java12
-rw-r--r--src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java15
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java2
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java38
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java11
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java81
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java3
-rw-r--r--src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java622
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.infinity.pngbin0 -> 4446 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.infinity.png.mcmeta37
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.spacetime.png (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.spacetime.png)bin17362 -> 17362 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.molten.spacetime.png.mcmeta (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.spacetime.png.mcmeta)0
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block1.pngbin0 -> 37428 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block1.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block2.pngbin0 -> 38658 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block2.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block3.pngbin0 -> 39350 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block3.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block4.pngbin0 -> 39582 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block4.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block5.pngbin0 -> 36288 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block5.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block6.pngbin0 -> 37428 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/block6.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/foil.pngbin0 -> 27270 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/foil.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/frameGt.pngbin0 -> 26948 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/frameGt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/ore.pngbin0 -> 6179 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/ore.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/oreSmall.pngbin0 -> 7001 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/oreSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeHuge.pngbin0 -> 29367 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeHuge.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeLarge.pngbin0 -> 33539 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeLarge.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeMedium.pngbin0 -> 33060 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeMedium.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeNonuple.pngbin0 -> 30021 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeNonuple.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeQuadruple.pngbin0 -> 30481 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeQuadruple.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSide.pngbin0 -> 29492 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSide.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSmall.pngbin0 -> 32169 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeTiny.pngbin0 -> 31149 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/pipeTiny.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/void.pngbin0 -> 310 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/void.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/wire.pngbin0 -> 35699 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/spacetime/wire.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/LCRNEI.pngbin0 -> 4969 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/PlasmaForge.pngbin5010 -> 4969 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/TURBINE_BLADE.pngbin0 -> 12557 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/TURBINE_BLADE.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/TURBINE_BLADE_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/arrowGtPlastic.pngbin0 -> 3583 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/arrowGtPlastic.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/arrowGtPlastic_OVERLAY.pngbin0 -> 283 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/arrowGtWood.pngbin0 -> 3583 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/arrowGtWood.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/arrowGtWood_OVERLAY.pngbin0 -> 294 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/bolt.pngbin0 -> 3207 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/bolt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/bolt_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/casingSmall.pngbin0 -> 22934 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/casingSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/cell.pngbin0 -> 4178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/cell.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/cellPlasma.pngbin0 -> 4178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/cellPlasma.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/cellPlasma_OVERLAY.pngbin0 -> 290 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/cell_OVERLAY.pngbin0 -> 309 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtDust.pngbin0 -> 5380 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtDust.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtDust_OVERLAY.pngbin0 -> 506 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtGem.pngbin0 -> 5264 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtGem.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtGem_OVERLAY.pngbin0 -> 526 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtIngot.pngbin0 -> 5246 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtIngot.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtIngot_OVERLAY.pngbin0 -> 517 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtPlate.pngbin0 -> 6430 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtPlate.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crateGtPlate_OVERLAY.pngbin0 -> 449 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushed.pngbin0 -> 16266 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushed.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushedCentrifuged.pngbin0 -> 15211 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushedCentrifuged.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushedCentrifuged_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushedPurified.pngbin0 -> 17937 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushedPurified.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushedPurified_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/crushed_OVERLAY.pngbin0 -> 480 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dust.pngbin0 -> 12878 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dust.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustImpure.pngbin0 -> 12878 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustImpure.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustImpure_OVERLAY.pngbin0 -> 430 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustPure.pngbin0 -> 12878 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustPure.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustPure_OVERLAY.pngbin0 -> 424 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustSmall.pngbin0 -> 6928 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustTiny.pngbin0 -> 4089 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustTiny.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dustTiny_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/dust_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/foil.pngbin0 -> 17631 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/foil.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/foil_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gearGt.pngbin0 -> 19146 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gearGt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gearGtSmall.pngbin0 -> 10024 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gearGtSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gearGtSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gearGt_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gem.pngbin0 -> 21056 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gem.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemChipped.pngbin0 -> 14911 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemChipped.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemChipped_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemExquisite.pngbin0 -> 26974 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemExquisite.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/spacetime/gemExquisite_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--