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

This commit is contained in:
Florian Nücke 2015-04-16 11:17:02 +02:00
commit effe8ebea1

View File

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