diff options
| author | OneEyeMaker <oneeyemaker@gmail.com> | 2016-07-26 09:02:10 +0300 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2016-07-26 17:10:23 +0200 |
| commit | c014ae4afc980b33d92e589f52151b8afbd6b3ad (patch) | |
| tree | 1b726a98caf8ad7f5132ab6e367489f8d52db341 /src/main/java/gregtech/api/GregTech_API.java | |
| parent | cda6044614431206536a905aef4ef307bf5a7763 (diff) | |
| download | GT5-Unofficial-c014ae4afc980b33d92e589f52151b8afbd6b3ad.tar.gz GT5-Unofficial-c014ae4afc980b33d92e589f52151b8afbd6b3ad.tar.bz2 GT5-Unofficial-c014ae4afc980b33d92e589f52151b8afbd6b3ad.zip | |
Fixed merge conflicts.
Diffstat (limited to 'src/main/java/gregtech/api/GregTech_API.java')
| -rw-r--r-- | src/main/java/gregtech/api/GregTech_API.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index b342a9cba6..d14b1d0773 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -175,8 +175,9 @@ 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 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 |