aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/GT_Mod.java19
-rw-r--r--src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java19
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java22
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java43
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java10
-rw-r--r--src/main/java/gregtech/api/enums/TextureSet.java2
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java22
-rw-r--r--src/main/java/gregtech/api/metatileentity/MetaTileEntity.java9
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java3
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java4
-rw-r--r--src/main/java/gregtech/api/util/GT_Log.java2
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java27
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Machines.java17
-rw-r--r--src/main/java/gregtech/common/items/CombType.java4
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java23
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java31
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java9
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java15
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java735
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java27
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java7
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_HeatExchanger.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java7
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Bronze.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java4
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java58
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java9
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java21
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java22
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java710
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java125
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java20
-rw-r--r--src/main/resources/assets/gregtech/lang/en_US.lang36
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/Assembler2.pngbin0 -> 5212 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/595.pngbin0 -> 380 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/619.pngbin0 -> 498 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/639.pngbin0 -> 366 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/649.pngbin0 -> 410 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/659.pngbin0 -> 462 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/679.pngbin0 -> 629 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/689.pngbin0 -> 514 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/699.pngbin0 -> 474 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/140.pngbin0 -> 2933 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/141.pngbin0 -> 2926 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/142.pngbin0 -> 2928 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/143.pngbin0 -> 2925 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/144.pngbin0 -> 2931 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/145.pngbin0 -> 2923 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/146.pngbin0 -> 2922 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/147.pngbin0 -> 2904 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/148.pngbin0 -> 2928 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/149.pngbin0 -> 2927 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/150.pngbin0 -> 3755 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/151.pngbin0 -> 3963 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/152.pngbin0 -> 3744 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/153.pngbin0 -> 3945 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/160.pngbin0 -> 4144 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/161.pngbin0 -> 3821 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/162.pngbin0 -> 4150 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/163.pngbin0 -> 3853 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/164.pngbin0 -> 4140 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/165.pngbin0 -> 3840 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.pngbin4167 -> 4098 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.pngbin3842 -> 3803 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.pngbin4120 -> 4152 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.pngbin3824 -> 3857 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/58.pngbin4162 -> 4151 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/59.pngbin3839 -> 3859 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/60.pngbin4015 -> 4232 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/62.pngbin0 -> 4167 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/63.pngbin0 -> 3842 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/64.pngbin0 -> 4120 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/65.pngbin0 -> 3824 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/DULL/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/DULL/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/EMERALD/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FIERY/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FINE/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FINE/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FLINT/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/FLUID/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GEM_HORIZONTAL/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GEM_VERTICAL/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/GLASS/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/LAPIS/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/LEAF/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/MAGNETIC/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/NETHERSTAR/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/NONE/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/NONE/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/OPAL/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/PAPER/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/POWDER/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/QUARTZ/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/ROUGH/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/casingSmall.pngbin0 -> 365 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/materialicons/RUBY/casingSmall_OVERLAY.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textu