diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-08-10 22:41:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-10 22:41:36 +0200 |
| commit | e6ecf4f2989eed1caedab4e0b01a13ddfd1be0b2 (patch) | |
| tree | e22fb6ebb060dc92433e7061eee3037d758ef4b5 /src/main/java/gregtech/loaders | |
| parent | b3bd42ba8cd4a785230be7f5a1693b4dc2375b7e (diff) | |
| parent | 4ee250357e7ce20d45a64c47e6e38658957c189c (diff) | |
| download | GT5-Unofficial-e6ecf4f2989eed1caedab4e0b01a13ddfd1be0b2.tar.gz GT5-Unofficial-e6ecf4f2989eed1caedab4e0b01a13ddfd1be0b2.tar.bz2 GT5-Unofficial-e6ecf4f2989eed1caedab4e0b01a13ddfd1be0b2.zip | |
Merge pull request #597 from Muramasa-/GCOres
GC Ore Support
Diffstat (limited to 'src/main/java/gregtech/loaders')
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 8da136d341..75f141367a 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -144,6 +144,9 @@ public class GT_Loader_Item_Block_And_Fluid GregTech_API.sBlockOresUb2 = new GT_Block_Ores_UB2();
GregTech_API.sBlockOresUb3 = new GT_Block_Ores_UB3();
}
+ if(Loader.isModLoaded("GalacticraftCore") && Loader.isModLoaded("GalacticraftMars")) {
+ GregTech_API.sBlockOresGC = new GT_Block_Ores_GC();
+ }
GregTech_API.sBlockMetal1 = new GT_Block_Metal("gt.blockmetal1", new Materials[]{
Materials.Adamantium,
Materials.Aluminium,
|