From 2cd41d8b9423cbceca59d4560b5b2e8177a9d712 Mon Sep 17 00:00:00 2001 From: payonel Date: Thu, 2 Nov 2017 00:55:26 -0700 Subject: [PATCH] merge fix, cpw.mods.fml.common.Loader changed to net.minecraftforge.fml.common.Loader --- .../scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.scala b/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.scala index 60926ab90..48b8539c1 100644 --- a/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.scala +++ b/src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.scala @@ -1,6 +1,6 @@ package li.cil.oc.integration.ic2 -import cpw.mods.fml.common.Loader +import net.minecraftforge.fml.common.Loader import li.cil.oc.api import li.cil.oc.api.Driver import li.cil.oc.integration.ModProxy