From 0bd6eea40c37484ec20d708ad9c08d90e2358480 Mon Sep 17 00:00:00 2001
From: Josh <JoshTheEnder@users.noreply.github.com>
Date: Tue, 9 Sep 2014 19:04:09 +0100
Subject: [PATCH] Update robot.names

---
 src/main/resources/assets/opencomputers/robot.names | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/resources/assets/opencomputers/robot.names b/src/main/resources/assets/opencomputers/robot.names
index 85e3f1be8..993bd793c 100644
--- a/src/main/resources/assets/opencomputers/robot.names
+++ b/src/main/resources/assets/opencomputers/robot.names
@@ -26,6 +26,7 @@ Claptrap           # Borderlands
 Crypto             # Kodos
 Dalek Sec          # Doctor Who
 Deputy ANDY        # Eureka
+Death Trap         # Borderlands 2's Mechromancer
 Dog                # Half-Life
 Donald Duck        # Perry Rhodan
 Elmer              # One of the first two robots developed by William Gray Walter.
@@ -40,6 +41,7 @@ Harkness           # Fallout 3
 Heron              # Vexatos
 Homunk             # Perry Rhodan
 J.A.R.V.I.S        # Iron Man
+JoshTheEnder       # Contributor
 Johnny 5           # Short Circuit
 K-9                # Doctor Who
 KARR               # Knight Rider
@@ -54,6 +56,7 @@ P-Body             # Portal
 PixelToast         # Contributor
 QT-1               # I, Robot
 R2-D2              # Star Wars
+Replicator         # Stargate
 Robby              # Forbidden Planet
 Roomba             # Under your couch... wait.
 Rosie              # The Jetsons