aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/GregTech_API.java
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-01-20 21:06:46 +0100
committerDream-Master <dream-master@gmx.net>2017-01-20 21:06:46 +0100
commit51ff9805a47275bf59f6823c6b68539226814d2b (patch)
tree40c9dc5a3e7ede0f838d171c35b4b18c49888965 /src/main/java/gregtech/api/GregTech_API.java
parenta8217117fa8aa90ffa3b1eaaa811fcc4a6db99cd (diff)
parentd53dc9ed38be06637b606db3b4fe96113c5cbc76 (diff)
downloadGT5-Unofficial-51ff9805a47275bf59f6823c6b68539226814d2b.tar.gz
GT5-Unofficial-51ff9805a47275bf59f6823c6b68539226814d2b.tar.bz2
GT5-Unofficial-51ff9805a47275bf59f6823c6b68539226814d2b.zip
Merge branch 'Tank_Blocks' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/GregTech_API.java')
-rw-r--r--src/main/java/gregtech/api/GregTech_API.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index 820e48c778..8eb8839efe 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -179,7 +179,7 @@ public class GregTech_API {
public static Block sBlockOres1, sBlockOresUb1, sBlockOresUb2, sBlockOresUb3, /*sBlockGem,*/ sBlockMetal1, sBlockMetal2, sBlockMetal3, sBlockMetal4, sBlockMetal5, sBlockMetal6, sBlockMetal7, sBlockMetal8, sBlockGem1, sBlockGem2, sBlockGem3, sBlockReinforced;
public static Block sBlockGranites, sBlockConcretes, sBlockStones;
- public static Block sBlockCasings1, sBlockCasings2, sBlockCasings3, sBlockCasings4, sBlockCasings5;
+ public static Block sBlockCasings1, sBlockCasings2, sBlockCasings3, sBlockCasings4, sBlockCasings5, sBlockCasings6;
/**
* Getting assigned by the Config
*/