Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/singulariteam/eternalsingularity/proxy/CommonProxy.java
This commit is contained in:
RCXcrafter committed 2016-11-09 18:43:28 +01:00
commit ccba22ec61
4 files changed
+7 -3

No files matched your search

@@ -1,5 +1,6 @@
package singulariteam.eternalsingularity.proxy;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import fox.spiteful.avaritia.crafting.ExtremeCraftingManager;
import fox.spiteful.avaritia.crafting.Grinder;
@@ -7,6 +8,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.oredict.ShapelessOreRecipe;
import singulariteam.eternalsingularity.EternalRecipeTweaker;
import singulariteam.eternalsingularity.EternalSingularityMod;
import singulariteam.eternalsingularity.item.CombinedSingularityItem;
import singulariteam.eternalsingularity.item.EternalSingularityItem;
@@ -43,6 +45,8 @@ public class CommonProxy
}
GameRegistry.registerItem(EternalSingularityItem.instance, "eternal_singularity");
GameRegistry.registerItem(CombinedSingularityItem.instance, "combined_singularity");
if (Loader.isModLoaded("MineTweaker3"))
EternalRecipeTweaker.init();
}
public void init() {}