diff options
author | Dream-Master <dream-master@gmx.net> | 2016-07-26 19:43:29 +0200 |
---|---|---|
committer | Dream-Master <dream-master@gmx.net> | 2016-07-26 19:43:29 +0200 |
commit | a1bc16ae700db9a0445e707bc95ed9f21fcb13f9 (patch) | |
tree | bd64d8a4e8577606895c8fb4344d2de580a4b5d4 /src/main/java/gregtech/api/GregTech_API.java | |
parent | eeab702de4c84effbe22fd0a78b96deae1a31def (diff) | |
parent | 7a872dfad2b018869e2790573196a3dfc12cafe9 (diff) | |
download | GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.tar.gz GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.tar.bz2 GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.zip |
Merge branch 'new-features' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/GregTech_API.java')
-rw-r--r-- | src/main/java/gregtech/api/GregTech_API.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index d38b1c7281..d14b1d0773 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -175,9 +175,10 @@ public class GregTech_API { * Initialized by the Block creation. */ public static Block sBlockMachines; - public static Block sBlockOres1, sBlockGem, sBlockMetal1, sBlockMetal2, sBlockMetal3, sBlockMetal4, sBlockMetal5, sBlockMetal6, sBlockMetal7, sBlockMetal8, sBlockGem1, sBlockGem2, sBlockGem3, sBlockReinforced; - public static Block sBlockGranites, sBlockConcretes; - public static Block sBlockCasings1, sBlockCasings2, sBlockCasings3, sBlockCasings4; + + 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; /** * Getting assigned by the Config */ @@ -592,4 +593,4 @@ public class GregTech_API { sToolList.add(new GT_ItemStack(GT_Utility.copyAmount(1, aTool))); return true; } -}
\ No newline at end of file +} |