Merge branch 'master' of github.com:MightyPirates/OpenComputers

This commit is contained in:
Florian Nücke 2014-03-23 11:43:18 +01:00
commit 0f5ce02e97

View File

@ -22,6 +22,7 @@ Clank
Claptrap Claptrap
Dog Dog
GLaDOS GLaDOS
Heron
KITT KITT
Marvin Marvin
P-Body P-Body
@ -29,6 +30,9 @@ R2-D2
Wheatley Wheatley
Terminator T-1000 Terminator T-1000
HAL 9000 HAL 9000
Terminator T-800
Skynet
J.A.R.V.I.S
# Perry Rhodan Robots, definitly not all... # Perry Rhodan Robots, definitly not all...
Anson Argyris Anson Argyris