aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/preload
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-01-30 10:43:09 +0100
committerGitHub <noreply@github.com>2021-01-30 10:43:09 +0100
commit75c6aa4b3d22b82266115841a0bfee2eb4b07e6f (patch)
tree61121995a7beb96b61986e453a7883fad615c839 /src/main/java/gregtech/loaders/preload
parent38b2f0bda401535d8ec1c223334d1b40ea293c64 (diff)
parent868dc9d8458c2b753414496a55f8e9322ae6484c (diff)
downloadGT5-Unofficial-75c6aa4b3d22b82266115841a0bfee2eb4b07e6f.tar.gz
GT5-Unofficial-75c6aa4b3d22b82266115841a0bfee2eb4b07e6f.tar.bz2
GT5-Unofficial-75c6aa4b3d22b82266115841a0bfee2eb4b07e6f.zip
Merge pull request #426 from KiloJoel/shadowmetalBeeFix
added GT shadowmetal block, fixed bee crash from new TM
Diffstat (limited to 'src/main/java/gregtech/loaders/preload')
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java1
1 files changed, 1 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 87a87295a7..1dc98d6949 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
@@ -365,6 +365,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
Materials.Steeleaf,
Materials.Ichorium,
Materials.Firestone,
+ Materials.Shadow
}, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS8);
GregTech_API.sBlockGem1 = new GT_Block_Metal("gt.blockgem1", new Materials[]{