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

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

Browse Source
This commit is contained in:
Florian Nücke 2015-04-16 11:17:02 +02:00
commit effe8ebea1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ Dog # Half-Life
Donald Duck # Perry Rhodan Donald Duck # Perry Rhodan
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
Eve # Wall-E Eve # Wall-E
Fact Core # Portal Fact Core # Portal
Flexo # Futurama Flexo # Futurama
@ -42,6 +43,7 @@ HAL 9000 # Space Odyssey
Harkness # Fallout 3 Harkness # Fallout 3
Heron # Vexatos Heron # Vexatos
Homunk # Perry Rhodan Homunk # Perry Rhodan
Hyun-ae # Analogue: A Hate Story / Hate Plus
Icarus # Deus Ex Icarus # Deus Ex
J.A.R.V.I.S # Iron Man J.A.R.V.I.S # Iron Man
JoshTheEnder # Contributor JoshTheEnder # Contributor
@ -56,6 +58,7 @@ Loader 1340 # Borderlands 2
LordFokas # Contributor LordFokas # Contributor
Marvin # Hitchhiker's Guide to the Galaxy Marvin # Hitchhiker's Guide to the Galaxy
Michiyo # Contributor Michiyo # Contributor
Mute # Analogue: A Hate Story / Hate Plus
P-Body # Portal P-Body # Portal
PixelToast # Contributor PixelToast # Contributor
QT-1 # I, Robot QT-1 # I, Robot