From 4e1ca9d5208459388b00b9364badd542657c3d52 Mon Sep 17 00:00:00 2001
From: kyeiti <kyeiti@vorsicht-bissig.de>
Date: Tue, 22 May 2018 19:59:20 +0200
Subject: [PATCH] Removed Thermal Foundation's Redstone from Tech Reborn's
 config. Related #9

---
 build.gradle                                                   | 2 +-
 .../java/exterminatorjeff/undergroundbiomes/api/ModInfo.java   | 2 +-
 .../undergroundbiomes/intermod/ModOreRegistrar.java            | 1 -
 .../undergroundbiomes/intermod/OresRegistry.java               | 3 ++-
 src/main/resources/mcmod.info                                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index d0a67fc6..a3f0e5a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "1.1.1"
+version = "1.1.2"
 group = "exterminatorjeff.undergroundbiomes" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "UndergroundBiomesConstructs-1.12"
 
diff --git a/src/main/java/exterminatorjeff/undergroundbiomes/api/ModInfo.java b/src/main/java/exterminatorjeff/undergroundbiomes/api/ModInfo.java
index fafa58b6..88ac452b 100755
--- a/src/main/java/exterminatorjeff/undergroundbiomes/api/ModInfo.java
+++ b/src/main/java/exterminatorjeff/undergroundbiomes/api/ModInfo.java
@@ -9,7 +9,7 @@ public final class ModInfo {
 
   public static final String MODID = "undergroundbiomes";
   public static final String NAME = "Underground Biomes";
-  public static final String VERSION = "1.1.1";
+  public static final String VERSION = "1.1.2";
 
   private ModInfo() {
   }
diff --git a/src/main/java/exterminatorjeff/undergroundbiomes/intermod/ModOreRegistrar.java b/src/main/java/exterminatorjeff/undergroundbiomes/intermod/ModOreRegistrar.java
index ed9f045a..df8a2d9a 100644
--- a/src/main/java/exterminatorjeff/undergroundbiomes/intermod/ModOreRegistrar.java
+++ b/src/main/java/exterminatorjeff/undergroundbiomes/intermod/ModOreRegistrar.java
@@ -283,7 +283,6 @@ private ArrayList<ModOre> getTechRebornOres() {
     ores.add(new ModOre(oreName, 4, ModInfo.MODID + ":blocks/overlays/techreborn/bauxite"));
     ores.add(new ModOre(oreName, 12, ModInfo.MODID + ":blocks/overlays/techreborn/lead"));
     ores.add(new ModOre(oreName, 13, ModInfo.MODID + ":blocks/overlays/techreborn/silver"));
-    ores.add(new ModOre("thermalfoundation:ore_fluid", 2, ModInfo.MODID + ":blocks/overlays/thermalfoundation/destabilized_redstone"));
     return ores;
   }
 
diff --git a/src/main/java/exterminatorjeff/undergroundbiomes/intermod/OresRegistry.java b/src/main/java/exterminatorjeff/undergroundbiomes/intermod/OresRegistry.java
index ae3d814a..129f4c70 100755
--- a/src/main/java/exterminatorjeff/undergroundbiomes/intermod/OresRegistry.java
+++ b/src/main/java/exterminatorjeff/undergroundbiomes/intermod/OresRegistry.java
@@ -12,6 +12,7 @@
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
 import net.minecraft.item.crafting.IRecipe;
@@ -103,7 +104,7 @@ public IBlockState getUBifiedOre(UBStone baseStone, int baseStoneMeta, IBlockSta
    */
   private void applyBaseOreSmelting(Block baseOre, int meta, OreEntry... ores) {
     ItemStack result = FurnaceRecipes.instance().getSmeltingResult(new ItemStack(baseOre, 1, meta));
-    if (result != null) {
+    if (result != null && result.getItem() != (new ItemStack(Blocks.AIR)).getItem()) {
       for (OreEntry ore : ores)
         for (int i = 0; i < ore.ore().getNbVariants(); ++i)
           GameRegistry.addSmelting(new ItemStack(ore.getBlock(), 1, i), result, FurnaceRecipes.instance().getSmeltingExperience(result));
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index df733e31..013f7fa7 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
   "modid": "undergroundbiomes",
   "name": "Underground Biomes",
   "description": "24 different kinds of stones with slabs, stairs, walls, and buttons",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "mcversion": "1.12.2",
   "url": "",
   "updateUrl": "",