aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java27
-rw-r--r--src/Java/gtPlusPlus/core/block/base/BasicBlock.java4
-rw-r--r--src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java8
-rw-r--r--src/Java/gtPlusPlus/core/block/base/BlockBaseOre.java7
-rw-r--r--src/Java/gtPlusPlus/core/client/CustomTextureSet.java3
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java4
-rw-r--r--src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java8
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java108
-rw-r--r--src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java26
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java42
-rw-r--r--src/Java/gtPlusPlus/core/material/ELEMENT.java55
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java221
-rw-r--r--src/Java/gtPlusPlus/core/material/ORES.java509
-rw-r--r--src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java148
-rw-r--r--src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java30
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java20
-rw-r--r--src/Java/gtPlusPlus/core/util/Utils.java28
-rw-r--r--src/Java/gtPlusPlus/core/util/math/MathUtils.java270
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java13
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java270
-rw-r--r--src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java1
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java23
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java16
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_SHSteam.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Steam.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java11
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java470
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java704
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java26
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore.png (renamed from src/resources/assets/gregtech/textures/blocks/materialicons/ENRICHED/ore .png)bin271 -> 271 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block1.pngbin0 -> 504 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block2.pngbin0 -> 620 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block3.pngbin0 -> 642 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block4.pngbin0 -> 655 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block5.pngbin0 -> 427 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/block6.pngbin0 -> 504 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/foil.pngbin0 -> 368 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/frameGt.pngbin0 -> 441 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.pngbin0 -> 665 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/ore.png.mcmeta6
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/oreSmall.pngbin0 -> 339 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeHuge.pngbin0 -> 348 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeLarge.pngbin0 -> 446 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeMedium.pngbin0 -> 442 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSide.pngbin0 -> 401 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeSmall.pngbin0 -> 429 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/pipeTiny.pngbin0 -> 418 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/void.pngbin0 -> 143 bytes
-rw-r--r--src/resources/assets/gregtech/textures/blocks/materialicons/NUCLEAR/wire.pngbin0 -> 513 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell.pngbin0 -> 328 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma.pngbin0 -> 328 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cellPlasma_OVERLAY.pngbin0 -> 290 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/cell_OVERLAY.pngbin0 -> 309 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust.pngbin0 -> 370 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtDust_OVERLAY.pngbin0 -> 506 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem.pngbin0 -> 401 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtGem_OVERLAY.pngbin0 -> 526 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot.pngbin0 -> 380 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtIngot_OVERLAY.pngbin0 -> 517 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate.pngbin0 -> 455 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crateGtPlate_OVERLAY.pngbin0 -> 449 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedCentrifuged_OVERLAY.pngbin0 -> 430 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushedPurified_OVERLAY.pngbin0 -> 583 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/crushed_OVERLAY.pngbin0 -> 426 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dustTiny_OVERLAY.pngbin0 -> 221 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/dust_OVERLAY.pngbin0 -> 222 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/foil_OVERLAY.pngbin0 -> 539 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGtSmall_OVERLAY.pngbin0 -> 365 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gearGt_OVERLAY.pngbin0 -> 503 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemChipped_OVERLAY.pngbin0 -> 465 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemExquisite_OVERLAY.pngbin0 -> 613 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawed_OVERLAY.pngbin0 -> 487 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gemFlawless_OVERLAY.pngbin0 -> 504 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/gem_OVERLAY.pngbin0 -> 465 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotDouble_OVERLAY.pngbin0 -> 419 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotHot_OVERLAY.pngbin0 -> 309 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuadruple_OVERLAY.pngbin0 -> 379 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotQuintuple_OVERLAY.pngbin0 -> 362 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingotTriple_OVERLAY.pngbin0 -> 395 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ingot_OVERLAY.pngbin0 -> 365 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens.pngbin0 -> 296 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/lens_OVERLAY.pngbin0 -> 594 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/nugget_OVERLAY.pngbin0 -> 261 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDense_OVERLAY.pngbin0 -> 322 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateDouble_OVERLAY.pngbin0 -> 338 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuadruple_OVERLAY.pngbin0 -> 372 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateQuintuple_OVERLAY.pngbin0 -> 380 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plateTriple_OVERLAY.pngbin0 -> 360 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/plate_OVERLAY.pngbin0 -> 300 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/ring_OVERLAY.pngbin0 -> 413 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/rotor_OVERLAY.pngbin0 -> 470 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/round_OVERLAY.pngbin0 -> 205 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/screw_OVERLAY.pngbin0 -> 226 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/springSmall_OVERLAY.pngbin0 -> 283 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/spring_OVERLAY.pngbin0 -> 304 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stickLong_OVERLAY.pngbin0 -> 217 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/stick_OVERLAY.pngbin0 -> 248 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine.pngbin0 -> 481 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/Fiery/wireFine_OVERLAY.pngbin0 -> 458 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE.pngbin0 -> 1238 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/TURBINE_BLADE_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic.pngbin0 -> 297 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtPlastic_OVERLAY.pngbin0 -> 283 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood.pngbin0 -> 297 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/arrowGtWood_OVERLAY.pngbin0 -> 294 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt.pngbin0 -> 161 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/bolt_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell.pngbin0 -> 328 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma.pngbin0 -> 328 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cellPlasma_OVERLAY.pngbin0 -> 290 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/cell_OVERLAY.pngbin0 -> 309 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust.pngbin0 -> 370 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtDust_OVERLAY.pngbin0 -> 506 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem.pngbin0 -> 401 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtGem_OVERLAY.pngbin0 -> 526 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot.pngbin0 -> 380 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtIngot_OVERLAY.pngbin0 -> 517 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate.pngbin0 -> 455 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crateGtPlate_OVERLAY.pngbin0 -> 449 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed.pngbin0 -> 462 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged.pngbin0 -> 561 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedCentrifuged_OVERLAY.pngbin0 -> 393 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified.pngbin0 -> 603 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushedPurified_OVERLAY.pngbin0 -> 538 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/crushed_OVERLAY.pngbin0 -> 539 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust.pngbin0 -> 312 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure.pngbin0 -> 312 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustImpure_OVERLAY.pngbin0 -> 430 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure.pngbin0 -> 312 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustPure_OVERLAY.pngbin0 -> 424 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall.pngbin0 -> 286 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustSmall_OVERLAY.pngbin0 -> 256 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny.pngbin0 -> 221 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dustTiny_OVERLAY.pngbin0 -> 251 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/materialicons/NUCLEAR/dust_OVERLAY.pngbin0 -> 281 bytes
-rw-r--r--