AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-15 02:12:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Browse Source
This commit is contained in:
Florian Nücke 2015-12-24 14:54:50 +01:00
commit a3f2e5e31c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ ASIMO # Honda
Atlas # Portal Atlas # Portal
Augustus # Perry Rhodan Augustus # Perry Rhodan
Baymax # Big Hero 6 Baymax # Big Hero 6
BB-8 # Star Wars
Bender # Futurama Bender # Futurama
BMO # Adventure Time BMO # Adventure Time
BraitenBurg # Simple intelligent agents. BraitenBurg # Simple intelligent agents.
@ -28,6 +29,7 @@ Chappie # Chappie
Clamps # Futurama Clamps # Futurama
Clank # Ratchet & Clank Clank # Ratchet & Clank
Claptrap # Borderlands Claptrap # Borderlands
Codsworth # Fallout 4
Continuity # Mona Lisa Overdrive Continuity # Mona Lisa Overdrive
Crypto # Kodos Crypto # Kodos
Curiosity # Mars Rover Curiosity # Mars Rover