upstream/Mekanism-Community-Edition
1
0 Fork 0
mirror of https://github.com/Thorfusion/Mekanism-Community-Edition.git synced 2026-11-08 19:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #192 from Thorfusion/1.7.10

Browse Source 
update dev
This commit is contained in:
maggi373 authored and GitHub committed 2024-10-18 16:14:35 +02:00
2 parents 178a2fe281 7962902f5a
commit 2165df77b2
2 files changed
+15 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+2 -2
View File
@@ -4,5 +4,5 @@ FMP_version=1.2.0.345
CCLIB_version=1.1.3.141
NEI_version=1.0.5.120
CCC_version=1.0.7.48
mod_version=9.10.40
alt_version=9, 10, 40
mod_version=9.10.41
alt_version=9, 10, 41
src/main/java/mekanism/common/integration/OreDictManager.java
+13 -9
View File
@@ -118,11 +118,14 @@ public final class OreDictManager
RecipeHandler.addCrusherRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, resource.ordinal()));
}
try {
for (ItemStack ore : OreDictionary.getOres("dust" + resource.getOredictName())) {
RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 8), StackUtils.size(OreDictionary.getOres("ore" + resource.getOredictName()).get(0), 1));
if (!Mekanism.hooks.EFRLoaded) {
try {
for (ItemStack ore : OreDictionary.getOres("dust" + resource.getOredictName())) {
RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 8), StackUtils.size(OreDictionary.getOres("ore" + resource.getOredictName()).get(0), 1));
}
} catch (Exception e) {
}
} catch (Exception e) {}
}
}
if (MekanismConfig.recipes.enableOsmiumBlock) {
@@ -244,11 +247,12 @@ public final class OreDictManager
} catch (Exception e) {
}
}
for (ItemStack ore : OreDictionary.getOres("dust" + s)) {
try {
RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 8), StackUtils.size(OreDictionary.getOres("ore" + s).get(0), 1));
} catch (Exception e) {
if (!Mekanism.hooks.EFRLoaded) {
for (ItemStack ore : OreDictionary.getOres("dust" + s)) {
try {
RecipeHandler.addCombinerRecipe(StackUtils.size(ore, 8), StackUtils.size(OreDictionary.getOres("ore" + s).get(0), 1));
} catch (Exception e) {
}
}
}
}