aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums/TextureSet.java
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-11-25 18:54:57 +0100
committerGitHub <noreply@github.com>2017-11-25 18:54:57 +0100
commit87210137d0c5821c1791f316710f46da5af91744 (patch)
treeafa588c32c3898b7c69a8cadde8a015fae0b3303 /src/main/java/gregtech/api/enums/TextureSet.java
parent5476c4ea3999ebe4b5dd10b002da89b9829e483d (diff)
parenta2c7e3160262b03a10a655a5925b51f5def5e218 (diff)
downloadGT5-Unofficial-87210137d0c5821c1791f316710f46da5af91744.tar.gz
GT5-Unofficial-87210137d0c5821c1791f316710f46da5af91744.tar.bz2
GT5-Unofficial-87210137d0c5821c1791f316710f46da5af91744.zip
Merge branch 'unstable' into CrackingFollowup
Diffstat (limited to 'src/main/java/gregtech/api/enums/TextureSet.java')
-rw-r--r--src/main/java/gregtech/api/enums/TextureSet.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/TextureSet.java b/src/main/java/gregtech/api/enums/TextureSet.java
index 891a808553..aa893780e8 100644
--- a/src/main/java/gregtech/api/enums/TextureSet.java
+++ b/src/main/java/gregtech/api/enums/TextureSet.java
@@ -103,8 +103,8 @@ public class TextureSet {
mTextures[81] = new Textures.BlockIcons.CustomIcon(aTextMatIconDir + mSetName + "/pipeLarge");
mTextures[82] = new Textures.BlockIcons.CustomIcon(aTextMatIconDir + mSetName + "/pipeHuge");
mTextures[83] = new Textures.BlockIcons.CustomIcon(aTextMatIconDir + mSetName + "/frameGt");
- mTextures[84] = new Textures.BlockIcons.CustomIcon(aTextMatIconDir + mSetName + aTextVoidDir);
- mTextures[85] = new Textures.BlockIcons.CustomIcon(aTextMatIconDir + mSetName + aTextVoidDir);
+ mTextures[84] = new Textures.BlockIcons.CustomIcon(aTextMatIconDir + mSetName + "/pipeQuadruple");
+ mTextures[85] = new Textures.BlockIcons.CustomIcon(aTextMatIconDir + mSetName + "/pipeNonuple");
mTextures[86] = new Textures.BlockIcons.CustomIcon(aTextMatIconDir + mSetName + aTextVoidDir);
mTextures[87] = new Textures.BlockIcons.CustomIcon(aTextMatIconDir + mSetName + aTextVoidDir);
mTextures[88] = new Textures.BlockIcons.CustomIcon(aTextMatIconDir + mSetName + aTextVoidDir);