aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorJohn <Techlone@users.noreply.github.com>2017-03-01 01:00:29 +0500
committerGitHub <noreply@github.com>2017-03-01 01:00:29 +0500
commit2246de7cf49bdce9da2127bcde0c5a73c6b750bb (patch)
tree21854a0abfc2592578ab1c656b14cdc047ed2645 /src/main
parentb2157c63206fb11e9c5568d0ca07933d565c8128 (diff)
parente73ee32ddbd9fcc5a4f5fb1378f5451119dacebe (diff)
downloadGT5-Unofficial-2246de7cf49bdce9da2127bcde0c5a73c6b750bb.tar.gz
GT5-Unofficial-2246de7cf49bdce9da2127bcde0c5a73c6b750bb.tar.bz2
GT5-Unofficial-2246de7cf49bdce9da2127bcde0c5a73c6b750bb.zip
Merge pull request #7 from Blood-Asp/unstable
Update
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/GT_Mod.java4
-rw-r--r--src/main/java/gregtech/api/GregTech_API.java5
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java10
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java10
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java6
-rw-r--r--src/main/java/gregtech/api/enums/Tier.java14
-rw-r--r--src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java25
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java8
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java2
-rw-r--r--src/main/java/gregtech/api/objects/GT_UO_Dimension.java52
-rw-r--r--src/main/java/gregtech/api/objects/GT_UO_DimensionList.java83
-rw-r--r--src/main/java/gregtech/api/objects/GT_UO_Fluid.java63
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java3
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java87
-rw-r--r--src/main/java/gregtech/common/GT_Pollution.java9
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java53
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java26
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java44
-rw-r--r--src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java37
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java174
-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_Steel.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java55
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java14
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java18
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java23
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java1
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java23
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java29
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java3
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java182
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java11
-rw-r--r--src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java10
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_BOTTOM.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_BOTTOM_ACTIVE.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_FRONT.pngbin0 -> 319 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_FRONT_ACTIVE.pngbin0 -> 329 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_SIDE.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_SIDE_ACTIVE.pngbin0 -> 143 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_TOP.pngbin0 -> 311 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/basicmachines/circuitassembler/OVERLAY_TOP_ACTIVE.pngbin0 -> 311 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/CircuitAssembler.pngbin0 -> 2437 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/700.pngbin231 -> 1378 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/703.pngbin319 -> 356 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/705.pngbin348 -> 4051 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/706.pngbin364 -> 4039 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/710.pngbin223 -> 773 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/711.pngbin223 -> 736 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/712.pngbin252 -> 750 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/715.pngbin273 -> 555 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/716.pngbin441 -> 663 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/717.pngbin450 -> 997 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/718.pngbin520 -> 1064 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/719.pngbin277 -> 738 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/720.pngbin331 -> 708 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/1.pngbin0 -> 773 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/10.pngbin0 -> 663 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/11.pngbin0 -> 1155 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/12.pngbin0 -> 1403 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/13.pngbin0 -> 1378 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/14.pngbin0 -> 1067 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/15.pngbin0 -> 555 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/16.pngbin0 -> 1127 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/17.pngbin0 -> 997 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/18.pngbin0 -> 1150 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/19.pngbin0 -> 1064 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/2.pngbin0 -> 736 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/20.pngbin0 -> 1175 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/3.pngbin0 -> 750 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/30.pngbin0 -> 985 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/31.pngbin0 -> 1098 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/32.pngbin0 -> 1070 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/33.pngbin0 -> 1182 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/34.pngbin0 -> 1275 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/35.pngbin0 -> 1269 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/36.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/37.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/38.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/39.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/4.pngbin0 -> 738 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/40.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/41.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/42.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/43.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/44.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/45.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/46.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/47.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/48.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/49.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/5.pngbin0 -> 708 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/50.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/51.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/52.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/53.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/54.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/55.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/56.pngbin0 -> 1501 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/57.pngbin0 -> 1178 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/6.pngbin0 -> 764 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/69.pngbin0 -> 435 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/70.pngbin0 -> 435 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/700.pngbin0 -> 231 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/701.pngbin0 -> 292 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/703.pngbin0 -> 319 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/704.pngbin0 -> 315 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/705.pngbin0 -> 348 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/707.pngbin0 -> 375 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/708.pngbin0 -> 338 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/71.pngbin0 -> 461 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/710.pngbin0 -> 223 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/711.pngbin0 -> 223 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/712.pngbin0 -> 252 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/713.pngbin0 -> 435 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/714.pngbin0 -> 461 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/715.pngbin0 -> 273 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/716.pngbin0 -> 441 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/717.pngbin0 -> 450 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/718.pngbin0 -> 520 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/719.pngbin0 -> 277 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/72.pngbin0 -> 252 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/720.pngbin0 -> 331 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/73.pngbin0 -> 9505 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/79.pngbin0 -> 321 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/80.pngbin0 -> 319 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/82.pngbin0 -> 323 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/83.pngbin0 -> 358 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/85.pngbin0 -> 319 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/86.pngbin0 -> 348 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/88.pngbin0 -> 4043 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/89.pngbin0 -> 325 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.pngbin0 -> 364 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/91.pngbin0 -> 4059 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/92.pngbin0 -> 320 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/93.pngbin0 -> 350 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/95.pngbin0 -> 4062 bytes
145 files changed, 887 insertions, 219 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index ef271204ec..734c6b5c4f 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -253,7 +253,9 @@ public class GT_Mod impl