Skip to content

Commit

Permalink
Merge branch 'patch-1' of https://github.com/Mstrodl/OpenComputers in…
Browse files Browse the repository at this point in the history
…to master-MC1.7.10
  • Loading branch information
fnuecke committed Apr 25, 2015
2 parents 01f63f7 + 9fa703c commit e6fca46
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/main/resources/assets/opencomputers/robot.names
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Clamps # Futurama
Clank # Ratchet & Clank
Claptrap # Borderlands
Crypto # Kodos
Curiosity # Mars Rover
Daedalus # Deus Ex
Dalek Sec # Doctor Who
Death Trap # Borderlands 2's Mechromancer
Expand Down

0 comments on commit e6fca46

Please sign in to comment.