Skip to content

Commit

Permalink
Merge branch 'mfu' of https://github.com/Vexatos/OpenComputers into m…
Browse files Browse the repository at this point in the history
…aster-MC1.7.10
  • Loading branch information
fnuecke committed Feb 3, 2017
2 parents 709bfb7 + 9fd7adc commit 0286b76
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import net.minecraftforge.common.DimensionManager
import net.minecraftforge.common.util.ForgeDirection

/**
*
* @author Vexatos
*/
object DriverUpgradeMF extends Item with HostAware {
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/li/cil/oc/server/component/UpgradeMF.scala
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import net.minecraftforge.common.util.ForgeDirection
import scala.collection.convert.WrapAsJava._

/**
* Mostly stolen from li.cil.oc.common.tileentity.Adapter
* Mostly stolen from {@link li.cil.oc.common.tileentity.Adapter}
*
* @author Sangar, Vexatos
*/
Expand Down

0 comments on commit 0286b76

Please sign in to comment.