aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md6
-rw-r--r--build.properties3
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin51017 -> 54333 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties3
-rwxr-xr-x[-rw-r--r--]gradlew78
-rw-r--r--libs/CodeChickenCore-1.7.10-1.0.4.35-dev.jarbin155441 -> 0 bytes
-rw-r--r--libs/CodeChickenLib-1.7.10-1.1.1.99-dev.jarbin294899 -> 0 bytes
-rw-r--r--libs/NotEnoughItems-1.7.10-1.0.4.95-dev.jarbin504766 -> 0 bytes
-rw-r--r--libs/forestry_1.7.10-4.2.10.58-api.jarbin284651 -> 0 bytes
-rw-r--r--src/main/java/gregtech/GT_Mod.java187
-rw-r--r--src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java2
-rw-r--r--src/main/java/gregtech/api/enums/GT_Values.java11
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java55
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java5
-rw-r--r--src/main/java/gregtech/api/interfaces/IChunkLoader.java9
-rw-r--r--src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java3
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java1
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java11
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java11
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java35
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseTileEntity.java1
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java5
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java37
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java44
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java22
-rw-r--r--src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java24
-rw-r--r--src/main/java/gregtech/api/objects/GT_ChunkManager.java158
-rw-r--r--src/main/java/gregtech/api/util/GT_Assemblyline_Server.java591
-rw-r--r--src/main/java/gregtech/api/util/GT_ModHandler.java94
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java60
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeRegistrator.java103
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java4704
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java72
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java8
-rw-r--r--src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java3
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Machines.java1
-rw-r--r--src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java1
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java1
-rw-r--r--src/main/java/gregtech/common/items/GT_NeutronReflector_Item.java2
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java3
-rw-r--r--src/main/java/gregtech/common/misc/GT_Command.java91
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java55
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java16
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java1
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java62
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java88
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Pump.java92
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java30
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java50
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java1
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java44
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java221
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java16
-rw-r--r--src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java299
-rw-r--r--src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java192
-rw-r--r--src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java235
-rw-r--r--src/main/java/gregtech/loaders/load/GT_FuelLoader.java3
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Achievements.java2
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java87
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java1
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCompressed.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java6
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java80
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingIngot.java44
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java77
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_Worldgenloader.java39
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java2
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java28
-rw-r--r--src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java9
-rw-r--r--src/main/resources/assets/gregtech/lang/en_US.lang13
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.deuterium.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.pngbin145 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_gas.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.pngbin145 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_natural_gas.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.pngbin145 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.gas_sulfuricgas.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.pngbin145 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium-3.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.pngbin145 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.helium.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.hydrogen.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.pngbin2809 -> 1695 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidair.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.pngbin0 -> 3567 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidnitrogen.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.pngbin0 -> 3275 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquidoxygen.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.methane.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogen.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.nitrogendioxide.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.oxygen.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.pngbin103 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.radon.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.pngbin144 -> 1061 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.tritium.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BLOCK_FIRESTONE.pngbin0 -> 3406 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/gui/basicmachines/Mixer2.pngbin0 -> 5686 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/666.pngbin3228 -> 3221 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/667.pngbin3221 -> 3228 bytes
115 files changed, 4634 insertions, 3708 deletions
diff --git a/README.md b/README.md
index 33c4e0faf8..c8cebf4cec 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,11 @@ GT5-Unofficial
## About
-GT5-Unofficial is a decompiled and modified version of GT5.07.07. The goal of the mod is to maintain and extend the end game of GT5.
+GT5-Unofficial is a decompiled and modified version of GT5.07.07. The goal of the mod is to maintain and extend the end game of GT5. This version has been heavily modified for use with the GTNH modpack.
## Downloads
-Builds can be found on the [IC2 Forums](http://forum.industrial-craft.net/index.php?page=Thread&threadID=11488).
+Builds can be found on the [GTNH Jenkins Server](http://jenkins.usrv.eu:8080/job/Gregtech-5-Unofficial/).
## Installation
@@ -36,4 +36,4 @@ Please do! However, please take a note of current issues and what is currently b
[Beyond Reality](https://www.atlauncher.com/pack/BeyondReality)<br />
[Infitech 2](https://forum.feed-the-beast.com/threads/1-7-10-listed-infitech-2-modpack-v3-2-21-hqm-gregtech-balanced-hard-mode-modpack.50185/)<br />
[GT New Horizons](https://www.technicpack.net/modpack/mcnewhorizons.677387)<br />
-[Идеальная Индустриальная Сборка / Ideal Industrial Assembly](http://sapientmail.wixsite.com/minecraft)<br /> \ No newline at end of file
+[Идеальная Индустриальная Сборка / Ideal Industrial Assembly](http://sapientmail.wixsite.com/minecraft)<br />
diff --git a/build.properties b/build.properties
index e68b0f155a..a878a9ede6 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,6 @@
minecraft.version=1.7.10
forge.version=10.13.4.1614-1.7.10
-
-gt.version=5.09.33.22
+gt.version=5.09.33.32
ae2.version=rv2-beta-33
applecore.version=1.7.10-1.2.1+107.59407
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index b761216703..99340b4ad1 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aae599bbfa..2c2bbe5f9a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Jul 02 15:54:47 CDT 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
diff --git a/gradlew b/gradlew
index 91a7e269e1..cccdd3d517 100644..100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
##############################################################################
##
@@ -6,20 +6,38 @@
##
##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/