Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add robot names #2607

Merged
merged 3 commits into from
Jan 11, 2018
Merged

Add robot names #2607

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
448b29d
Update robot.names
anar4732 Nov 1, 2017
cb2fe81
Merge branch 'master-MC1.7.10' into patch-1
payonel Jan 11, 2018
00246b1
Merge branch 'master-MC1.7.10' into patch-1
payonel Jan 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master-MC1.7.10' into patch-1
  • Loading branch information
@payonel
payonel authored Jan 11, 2018
commit cb2fe81e3f5b616b8a505c338a993f9abd44677d
4 changes: 1 addition & 3 deletions src/main/resources/assets/opencomputers/robot.names
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
Adventure Core # Portal
Adjutant 23-46 # Starcraft 2
Anson Argyris # Perry Rhodan
ARR # Simple
ASIMO # Honda
Atlas # Portal
Augustus # Perry Rhodan
Expand Down Expand Up @@ -86,6 +85,7 @@ Michiyo # Contributor
*Mute # Analogue: A Hate Story / Hate Plus
Mycroft Holmes # The Moon Is a Harsh Mistress
PacMan # Pacman
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i wouldn't consider pacman a robot

Optimus # Transformers. Seperated "Optimus Prime" into two names, as both are quite fitting robot names.
P-Body # Portal
Pintsize # Questionable Content
PixelToast # Contributor
Expand All @@ -96,8 +96,6 @@ R. Giskard Reventlov # Isaac Asimov's
R2-D2 # Star Wars
Replicator # Stargate
Robby # Forbidden Planet
Robot # Robot
RO-BOT # Robot
Roomba # Under your couch... wait.
Rosie # The Jetsons
Skaffen-Amtiskaw # Use of weapons (Iain M Banks)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.