AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 18:55:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix bad merge

Browse Source
This commit is contained in:
payonel 2017-12-31 00:34:18 -08:00
parent 6caf59fffa
commit 8be2816b0c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/common/init/Items.scala
View File

@ -296,7 +296,7 @@ object Items extends ItemAPI {
safeGetStack(Constants.ItemName.GraphicsCardTier2), safeGetStack(Constants.ItemName.GraphicsCardTier2),
safeGetStack(Constants.ItemName.RedstoneCardTier2), safeGetStack(Constants.ItemName.RedstoneCardTier2),
safeGetStack(Constants.ItemName.WirelessNetworkCard), safeGetStack(Constants.ItemName.WirelessNetworkCardTier2),
safeGetStack(Constants.ItemName.CPUTier3), safeGetStack(Constants.ItemName.CPUTier3),
safeGetStack(Constants.ItemName.RAMTier6), safeGetStack(Constants.ItemName.RAMTier6),

2
src/main/scala/li/cil/oc/common/tileentity/Relay.scala
View File

@ -46,7 +46,7 @@ class Relay extends traits.Hub with traits.ComponentInventory with traits.PowerA
var wirelessTier = -1 var wirelessTier = -1
override def isWirelessEnabled = wirelessTier >= Tier.One def isWirelessEnabled = wirelessTier >= Tier.One
def maxWirelessRange = if (wirelessTier == Tier.One || wirelessTier == Tier.Two) def maxWirelessRange = if (wirelessTier == Tier.One || wirelessTier == Tier.Two)
Settings.get.maxWirelessRange(wirelessTier) else 0 Settings.get.maxWirelessRange(wirelessTier) else 0