Merge branch master-MC1.9.4 into master-MC1.10

This commit is contained in:
payonel 2017-11-02 00:55:50 -07:00
commit 680a488bc5

View File

@ -1,6 +1,6 @@
package li.cil.oc.integration.ic2 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
import li.cil.oc.api.Driver import li.cil.oc.api.Driver
import li.cil.oc.integration.ModProxy import li.cil.oc.integration.ModProxy