aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java12
-rw-r--r--src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java18
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader.java4
-rw-r--r--src/main/java/goodgenerator/loader/RecipeLoader2.java17
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java32
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsUEVplus.java90
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java98
-rw-r--r--src/main/java/gregtech/api/recipe/RecipeMaps.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java0
-rw-r--r--src/main/java/gregtech/common/items/ID_MetaItem_03.java0
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitBase.java0
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/GT_MetaTileEntity_PurificationUnitParticleExtractor.java0
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationPlant.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBase.java2
-rw-r--r--src/main/java/gregtech/loaders/materials/MaterialsInit1.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_PurifiedWaterRecipes.java0
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/PurifiedWaterRecipes.java9
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java54
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java13
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java46
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java35
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java0
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderChemicalSkips.java2
-rw-r--r--src/main/java/kekztech/common/recipeLoaders/AssemblyLine.java2
-rw-r--r--src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java75
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluid.dimensionallyshiftedsuperfluid.pngbin0 -> 12912 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluid.dimensionallyshiftedsuperfluid.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluid.protohalkonitebase.pngbin0 -> 4869 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.fluid.protohalkonitebase.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/exohalkonite/foil.pngbin0 -> 26938 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/exohalkonite/foil.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/exohalkonite/frameGt.pngbin0 -> 18420 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/exohalkonite/frameGt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/hotexohalkonite/frameGt.pngbin0 -> 39237 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/hotexohalkonite/frameGt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/hotprotohalkonite/foil.pngbin0 -> 913 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/hotprotohalkonite/foil.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/hotprotohalkonite/frameGt.pngbin0 -> 986 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/materialicons/CUSTOM/protohalkonite/frameGt.pngbin0 -> 698 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/dimensionallyshiftedsuperfluid/cell.pngbin0 -> 2159 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/dimensionallyshiftedsuperfluid/cell.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/dimensionallyshiftedsuperfluid/cell_OVERLAY.pngbin0 -> 251 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/TURBINE_BLADE.pngbin0 -> 9819 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/TURBINE_BLADE.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/TURBINE_BLADE_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/arrowGtPlastic.pngbin0 -> 2243 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/arrowGtPlastic.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/arrowGtPlastic_OVERLAY.pngbin0 -> 234 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/arrowGtWood.pngbin0 -> 2243 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/arrowGtWood.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/arrowGtWood_OVERLAY.pngbin0 -> 238 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/blockCasing.pngbin0 -> 27570 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/blockCasingAdvanced.pngbin0 -> 25964 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/bolt.pngbin0 -> 3097 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/bolt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/bolt_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/bottle.pngbin0 -> 5180 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/capsule.pngbin0 -> 4771 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/capsuleMolten.pngbin0 -> 4771 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/casingSmall.pngbin0 -> 18415 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/casingSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/casingSmall_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/cell.pngbin0 -> 3173 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/cell.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/cellPlasma.pngbin0 -> 3173 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/cellPlasma.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/cellPlasma_OVERLAY.pngbin0 -> 224 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/cell_OVERLAY.pngbin0 -> 251 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/circuit.pngbin0 -> 74402 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crateGtDust.pngbin0 -> 4204 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crateGtDust.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crateGtDust_OVERLAY.pngbin0 -> 504 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crateGtGem.pngbin0 -> 3715 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crateGtGem.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crateGtGem_OVERLAY.pngbin0 -> 526 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crateGtIngot.pngbin0 -> 4034 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crateGtIngot.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crateGtIngot_OVERLAY.pngbin0 -> 516 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crateGtPlate.pngbin0 -> 4978 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crateGtPlate.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crateGtPlate_OVERLAY.pngbin0 -> 444 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crushed.pngbin0 -> 11053 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crushed.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crushedCentrifuged.pngbin0 -> 10673 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crushedCentrifuged.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crushedCentrifuged_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crushedPurified.pngbin0 -> 11602 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crushedPurified.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crushedPurified_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/crushed_OVERLAY.pngbin0 -> 315 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dust.pngbin0 -> 11068 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dust.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dustImpure.pngbin0 -> 11068 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dustImpure.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dustImpure_OVERLAY.pngbin0 -> 374 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dustPure.pngbin0 -> 11068 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dustPure.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dustPure_OVERLAY.pngbin0 -> 371 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dustSmall.pngbin0 -> 5802 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dustSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dustSmall_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dustTiny.pngbin0 -> 3140 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dustTiny.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dustTiny_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dust_$_0.pngbin0 -> 155860 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/dust_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/emitter.pngbin0 -> 79509 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/foil.pngbin0 -> 13337 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/foil.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/foil_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gearGt.pngbin0 -> 15957 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gearGt.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gearGtSmall.pngbin0 -> 8217 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gearGtSmall.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gearGtSmall_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gearGt_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gem.pngbin0 -> 15821 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gem.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gemChipped.pngbin0 -> 9898 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gemChipped.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gemChipped_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gemExquisite.pngbin0 -> 18545 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gemExquisite.png.mcmeta1
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gemExquisite_OVERLAY.pngbin0 -> 141 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gemFlawed.pngbin0 -> 12687 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/CUSTOM/exohalkonite/gemFlawed.png.mcmeta1