diff options
| author | Tec <daniel112092@gmail.com> | 2018-08-11 21:38:51 +0200 |
|---|---|---|
| committer | Tec <daniel112092@gmail.com> | 2018-08-11 21:38:51 +0200 |
| commit | a135dc53da90be1b0a0e2234833dd4a7c6ca5a35 (patch) | |
| tree | bf5c7fec1e5ed9e547f9e5682818edbe8cf4e068 | |
| parent | 75584c6b6ddbca089d912061a2ab93d36a455b5a (diff) | |
| parent | fd30701bc4919364ff16256d19af6bd333accecc (diff) | |
| download | GT5-Unofficial-a135dc53da90be1b0a0e2234833dd4a7c6ca5a35.tar.gz GT5-Unofficial-a135dc53da90be1b0a0e2234833dd4a7c6ca5a35.tar.bz2 GT5-Unofficial-a135dc53da90be1b0a0e2234833dd4a7c6ca5a35.zip | |
Merge branch 'master' of https://github.com/Technus/TecTech
| -rw-r--r-- | build.properties | 4 | ||||
| -rw-r--r-- | src/main/java/com/github/technus/tectech/loader/MainLoader.java | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/build.properties b/build.properties index 43d13923a6..6c98e7b008 100644 --- a/build.properties +++ b/build.properties @@ -6,8 +6,8 @@ ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=63 -gregtech.version=5.09.32.29 +gregtech.jenkinsbuild=93 +gregtech.version=5.09.32.31 cofhcore.version=[1.7.10]3.1.4-329-dev cofhlib.version=[1.7.10]1.0.3-175-dev diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index 04b354f737..de53fb225f 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -64,16 +64,6 @@ public final class MainLoader { } public static void preLoad(){ - //Set proper values in gt arrays - dyeLightBlue.mRGBa[0]=96; - dyeLightBlue.mRGBa[1]=128; - dyeLightBlue.mRGBa[2]=255; - dyeBlue.mRGBa[0]=0; - dyeBlue.mRGBa[1]=32; - dyeBlue.mRGBa[2]=255; - MACHINE_METAL.mRGBa[0]=210; - MACHINE_METAL.mRGBa[1]=220; - MACHINE_METAL.mRGBa[2]=255; //set expanded texture arrays for tiers try { |