AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-14 17:56:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-1' of https://github.com/Chlikikijleelgus/OpenComputers into master-MC1.7.10

Browse Source
This commit is contained in:
Florian Nücke 2015-07-25 11:07:06 +02:00
commit 074ee33f76
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/resources/assets/opencomputers/robot.names
View File

@ -11,6 +11,7 @@
# sorting. # sorting.
Adventure Core # Portal Adventure Core # Portal
Adjutant 23-46 # Starcraft 2
Anson Argyris # Perry Rhodan Anson Argyris # Perry Rhodan
ASIMO # Honda ASIMO # Honda
Atlas # Portal Atlas # Portal
@ -26,15 +27,19 @@ Callister Raynes # Eureka
Clamps # Futurama Clamps # Futurama
Clank # Ratchet & Clank Clank # Ratchet & Clank
Claptrap # Borderlands Claptrap # Borderlands
Continuity # Mona Lisa Overdrive
Crypto # Kodos Crypto # Kodos
Curiosity # Mars Rover Curiosity # Mars Rover
Daedalus # Deus Ex Daedalus # Deus Ex
Dalek Sec # Doctor Who Dalek Sec # Doctor Who
Data # Star Trek
David # A.I. (the movie) David # A.I. (the movie)
Death Trap # Borderlands 2's Mechromancer Death Trap # Borderlands 2's Mechromancer
Deep Thought # Hitchhiker's Guide to the Galaxy
Deputy ANDY # Eureka Deputy ANDY # Eureka
Dog # Half-Life Dog # Half-Life
Donald Duck # Perry Rhodan Donald Duck # Perry Rhodan
Eliza Cassan # Deus Ex
Elmer # One of the first two robots developed by William Gray Walter. Elmer # One of the first two robots developed by William Gray Walter.
Elsie # One of the first two robots developed by William Gray Walter. Elsie # One of the first two robots developed by William Gray Walter.
*Emilia # Digital: A Love Story *Emilia # Digital: A Love Story
@ -46,6 +51,7 @@ GLaDOS # Portal
HAL 9000 # Space Odyssey HAL 9000 # Space Odyssey
Harkness # Fallout 3 Harkness # Fallout 3
Heron # Vexatos Heron # Vexatos
Hex # Discworld
Homunk # Perry Rhodan Homunk # Perry Rhodan
*Hyun-ae # Analogue: A Hate Story / Hate Plus *Hyun-ae # Analogue: A Hate Story / Hate Plus
Icarus # Deus Ex Icarus # Deus Ex
@ -64,6 +70,7 @@ Marvin # Hitchhiker's Guide to the Galaxy
Michiyo # Contributor Michiyo # Contributor
*Mute # Analogue: A Hate Story / Hate Plus *Mute # Analogue: A Hate Story / Hate Plus
P-Body # Portal P-Body # Portal
Pintsize # Questionable Content
PixelToast # Contributor PixelToast # Contributor
QT-1 # I, Robot QT-1 # I, Robot
R. Daneel Olivaw # Isaac Asimov's R. Daneel Olivaw # Isaac Asimov's
@ -77,6 +84,7 @@ Shakey # The first general-purpose mobile robot that could reason ab
Skynet # Terminator Skynet # Terminator
Space Core # Portal Space Core # Portal
SpiritedDusty # Contributor SpiritedDusty # Contributor
T-1000 # Terminator
Tachikoma # Ghost in the Shell Tachikoma # Ghost in the Shell
TARA UH # Perry Rhodan TARA UH # Perry Rhodan
Terminator # Terminator Terminator # Terminator
@ -89,4 +97,5 @@ Wall-E # Wall-E
Watson # IBM Watson Watson # IBM Watson
Weebo # Flubber Weebo # Flubber
Wheatley # Portal Wheatley # Portal
Wintermute # Neuromancer
Wobbo # Contributor Wobbo # Contributor