From f2eb66fa26f1b6f794e2f097df1c869a3d32aee7 Mon Sep 17 00:00:00 2001
From: payonel <payonel@hotmail.com>
Date: Sun, 31 Dec 2017 00:03:08 -0800
Subject: [PATCH] fix bad merge

---
 .../scala/li/cil/oc/common/init/Items.scala   |  6 +--
 .../component/WirelessNetworkCard.scala       | 48 ++-----------------
 2 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/src/main/scala/li/cil/oc/common/init/Items.scala b/src/main/scala/li/cil/oc/common/init/Items.scala
index f802e323c..16e63858f 100644
--- a/src/main/scala/li/cil/oc/common/init/Items.scala
+++ b/src/main/scala/li/cil/oc/common/init/Items.scala
@@ -444,7 +444,7 @@ object Items extends ItemAPI {
     Recipes.addSubItem(new item.RedstoneCard(cards, Tier.One), Constants.ItemName.RedstoneCardTier1, "oc:redstoneCard1")
     Recipes.addSubItem(new item.RedstoneCard(cards, Tier.Two), Constants.ItemName.RedstoneCardTier2, "oc:redstoneCard2")
     Recipes.addSubItem(new item.NetworkCard(cards), Constants.ItemName.NetworkCard, "oc:lanCard")
-    Recipes.addSubItem(new item.WirelessNetworkCard(cards), Constants.ItemName.WirelessNetworkCard, "oc:wlanCard")
+    Recipes.addSubItem(new item.WirelessNetworkCard(cards, Tier.Two), Constants.ItemName.WirelessNetworkCardTier2, "oc:wlanCard2")
     Recipes.addSubItem(new item.InternetCard(cards), Constants.ItemName.InternetCard, "oc:internetCard")
     Recipes.addSubItem(new item.LinkedCard(cards), Constants.ItemName.LinkedCard, "oc:linkedCard")
 
@@ -497,8 +497,8 @@ object Items extends ItemAPI {
     Recipes.addSubItem(new item.UpgradeMF(upgrades), Constants.ItemName.MFU, "oc:mfu")
 
     // 1.7.2
-    Recipes.addSubItem(new item.WirelessNetworkCard(multi, Tier.One), Constants.ItemName.WirelessNetworkCardTier1, "oc:wlanCard1")
-    registerItem(new item.ComponentBus(multi, Tier.Four), Constants.ItemName.ComponentBusCreative)
+    Recipes.addSubItem(new item.WirelessNetworkCard(upgrades, Tier.One), Constants.ItemName.WirelessNetworkCardTier1, "oc:wlanCard1")
+    registerItem(new item.ComponentBus(upgrades, Tier.Four), Constants.ItemName.ComponentBusCreative)
   }
 
   // Storage media of all kinds.
diff --git a/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala
index c23513985..89502c233 100644
--- a/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala
+++ b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala
@@ -28,55 +28,15 @@ abstract class WirelessNetworkCard(host: EnvironmentHost) extends NetworkCard(ho
     withConnector().
     create()
 
-<<<<<<< HEAD
-  var strength = Settings.get.maxWirelessRange
+  protected def wirelessCostPerRange: Double
 
-  // ----------------------------------------------------------------------- //
+  protected def maxWirelessRange: Double
 
-  private final lazy val deviceInfo = Map(
-    DeviceAttribute.Class -> DeviceClass.Network,
-    DeviceAttribute.Description -> "Wireless ethernet controller",
-    DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor,
-    DeviceAttribute.Product -> "62i230 (MPW-01)",
-    DeviceAttribute.Capacity -> Settings.get.maxNetworkPacketSize.toString,
-    DeviceAttribute.Width -> Settings.get.maxWirelessRange.toString
-  )
+  protected def shouldSendWiredTraffic: Boolean
 
-  override def getDeviceInfo: util.Map[String, String] = deviceInfo
-
-  // ----------------------------------------------------------------------- //
+  var strength = maxWirelessRange
 
   def position = BlockPosition(host)
-||||||| merged common ancestors
-  var strength = Settings.get.maxWirelessRange
-
-  // ----------------------------------------------------------------------- //
-
-  private final lazy val deviceInfo = Map(
-    DeviceAttribute.Class -> DeviceClass.Network,
-    DeviceAttribute.Description -> "Wireless ethernet controller",
-    DeviceAttribute.Vendor -> Constants.DeviceInfo.DefaultVendor,
-    DeviceAttribute.Product -> "62i230 (MPW-01)",
-    DeviceAttribute.Capacity -> Settings.get.maxNetworkPacketSize.toString,
-    DeviceAttribute.Width -> Settings.get.maxWirelessRange.toString
-  )
-
-  override def getDeviceInfo: util.Map[String, String] = deviceInfo
-
-  // ----------------------------------------------------------------------- //
-
-  override def x = BlockPosition(host).x
-=======
-  protected def wirelessCostPerRange: Double
-  
-  protected def maxWirelessRange: Double
-  
-  protected def shouldSendWiredTraffic: Boolean
-  
-  var strength = maxWirelessRange
-    
-  override def x = BlockPosition(host).x
->>>>>>> master-MC1.7.10
 
   override def x = position.x