diff --git a/build.gradle b/build.gradle index a3ae1b04f..f9c323e31 100644 --- a/build.gradle +++ b/build.gradle @@ -64,7 +64,7 @@ configurations { } -version = "1.3.5" +version = "1.4.0" def ENV = System.getenv() if (ENV.BUILD_NUMBER) { @@ -102,7 +102,7 @@ dependencies { if(!f.exists()){ f.mkdir() } - compile 'RebornCore:RebornCore-1.9.4:2.6.0.54:dev' + compile 'RebornCore:RebornCore-1.9.4:+:dev' deobfCompile "mezz.jei:jei_1.9.4:+" // compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24:deobf" deobfCompile "slimeknights.mantle:Mantle:1.9.4-0.10.1.jenkins142" diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index f7c11c061..4175519c4 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -491,8 +491,8 @@ public class ModBlocks OreDictionary.registerOre("blockTungsten", new ItemStack(storage, 1, 10)); OreDictionary.registerOre("blockNickel", new ItemStack(storage, 1, 11)); OreDictionary.registerOre("blockInvar", new ItemStack(storage, 1, 12)); - OreDictionary.registerOre("blockOsmium", new ItemStack(storage, 1, 13)); - OreDictionary.registerOre("blockIridium", new ItemStack(storage, 1, 14)); + //OreDictionary.registerOre("blockOsmium", new ItemStack(storage, 1, 13)); No osmium, stolen by Mekanism + OreDictionary.registerOre("blockIridium", new ItemStack(storage, 1, 13)); OreDictionary.registerOre("blockCopper", BlockStorage2.getStorageBlockByName("copper", 1)); OreDictionary.registerOre("blockTin", BlockStorage2.getStorageBlockByName("tin", 1));