Merge branch '2.4.6': Deepslate bug fix

build.gradle

@@ -37,7 +37,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 // SEMVER that gradle uses.
 group = "ganymedes01.etfuturum"
 archivesBaseName = "Et_Futurum_Requiem"
-def modVersion = "2.4.5"
+def modVersion = "2.4.6"
 version = project.hasProperty("useCommitHashInVersion") ? getCommitVersion(modVersion) : modVersion
 
 def buildAll = project.hasProperty("all")

src/main/java/ganymedes01/etfuturum/blocks/ores/BlockDeepslateOre.java

@@ -34,8 +34,10 @@ public BlockDeepslateOre(Block block) {
 		super();
 		setAttribs(this, block);
 		base = block;
-		if(isEnabled() && (!(base instanceof IConfigurable) || ((IConfigurable)base).isEnabled()))
+		setCreativeTab(EtFuturum.creativeTabBlocks);
+		if(isEnabled() && (!(base instanceof IConfigurable) || ((IConfigurable)base).isEnabled())) {
 			addDeepslateMappings();
+		}
 	}
 
 	public static void setAttribs(Block to, Block from) {
@@ -46,7 +48,6 @@ public static void setAttribs(Block to, Block from) {
 		to.setBlockName(Utils.getUnlocalisedName("deepslate_" + from.textureName.toLowerCase()));
 		to.setBlockTextureName("deepslate_" + from.textureName);
 		to.setStepSound(ConfigSounds.newBlockSounds ? ModSounds.soundDeepslate : soundTypeStone);
-		to.setCreativeTab(from.getCreativeTabToDisplayOn());
 		to.setLightLevel(from.getLightValue() / 15F);
 		to.setLightOpacity(from.getLightOpacity());
 		for(int i = 0; i < 16; i++) {