From fcf1c09b62236d9e8e20a8ddc37181a03f96359a Mon Sep 17 00:00:00 2001
From: sashok724 <mail@sashok724.net>
Date: Fri, 1 Apr 2016 03:54:35 +0000
Subject: [PATCH 1/2] Typo in WirelessNetworkCard.setStrength?

---
 .../li/cil/oc/server/component/WirelessNetworkCard.scala      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 d8cbb3d39..378df9279 100644
--- a/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala
+++ b/src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala
@@ -46,7 +46,7 @@ class WirelessNetworkCard(host: EnvironmentHost) extends NetworkCard(host) with
 
   @Callback(doc = """function(strength:number):number -- Set the signal strength (range) used when sending messages.""")
   def setStrength(context: Context, args: Arguments): Array[AnyRef] = {
-    strength = math.max(args.checkDouble(0), math.min(0, Settings.get.maxWirelessRange))
+    strength = math.max(0, math.min(args.checkDouble(0), Settings.get.maxWirelessRange))
     result(strength)
   }
 
@@ -115,4 +115,4 @@ class WirelessNetworkCard(host: EnvironmentHost) extends NetworkCard(host) with
     super.save(nbt)
     nbt.setDouble("strength", strength)
   }
-}
\ No newline at end of file
+}

From 88f3412f0c1e4b7ebfe5f6921696b7704636343e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Sat, 2 Apr 2016 16:28:43 +0200
Subject: [PATCH 2/2] Backport switch achievement fix.

---
 src/main/scala/li/cil/oc/common/Achievement.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/scala/li/cil/oc/common/Achievement.scala b/src/main/scala/li/cil/oc/common/Achievement.scala
index 5124b24c0..ca02165f6 100644
--- a/src/main/scala/li/cil/oc/common/Achievement.scala
+++ b/src/main/scala/li/cil/oc/common/Achievement.scala
@@ -213,6 +213,7 @@ object Achievement {
     withParent(Cable).
     whenCrafting(Constants.BlockName.Switch).
     whenCrafting(Constants.BlockName.AccessPoint).
+    whenCrafting(Constants.BlockName.Relay).
     add()
   val Adapter = newAchievement("adapter").
     at(-4, 1).