Skip to content

Commit 87a32b3

Browse files
committed
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.12
2 parents 8ca336f + 60088ed commit 87a32b3

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This mod is [licensed under the **MIT license**](https://github.com/MightyPirate
2020
## Contributing
2121
### Assets and Localizations
2222
1. **Translations**
23-
Translations to other languages are very much appreciated. You can find the localization files [in this folder][localizations]. If a localization you wanted to create already exists, please take the time to see if the present one is complete - the strings change every so often, invalidating some of the translations. If you start a fresh localization, please base it off of the English or German one, those are the 'master' localization files. If you add a new language, please also add it to [the pack.mcmeta][pack.mcmeta] file. Keep it sorted alphabetically, use the name and region Minecraft itself uses. If you don't know how to do that, that's OK, I'll do it later.
23+
Translations to other languages are very much appreciated. Using [the Weblate instance](https://weblate.asie.pl/) is recommended, as it is the most user-friendly way to contribute translations. Alternatively, or if the Weblate service is not up, you can find the localization files [in this folder][localizations]. If a localization you wanted to create already exists, please take the time to see if the present one is complete - the strings change every so often, invalidating some of the translations. If you start a fresh localization, please base it off of the English one. If you add a new language, please also add it to [the pack.mcmeta][pack.mcmeta] file. Keep it sorted alphabetically, use the name and region Minecraft itself uses. If you don't know how to do that, that's OK, I'll do it later.
2424
2. **Textures**
2525
If you would like to contribute better textures for certain items or blocks, feel free to pull-request them. If you would like to contribute *alternative* textures, make it a resource pack, and post it on the forums, for example.
2626
3. **Documentation**

src/main/resources/assets/opencomputers/robot.names

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Atlas # Portal
1818
Augustus # Perry Rhodan
1919
Autobot # Transfomers
2020
Ava # Ex Machina
21+
Ayrobot # Aypierre's "Let's play Méchanique"
2122
Baymax # Big Hero 6
2223
BB-8 # Star Wars
2324
Bender # Futurama
@@ -27,6 +28,7 @@ C-3PO # Star Wars
2728
Cairol # Perry Rhodan
2829
Calculon # Futurama
2930
Callister Raynes # Eureka
31+
C.A.S.E # Interstellar
3032
Chappie # Chappie
3133
Clamps # Futurama
3234
Clank # Ratchet & Clank
@@ -44,6 +46,7 @@ David # A.I. (the movie)
4446
Death Trap # Borderlands 2's Mechromancer
4547
Decepticon # Transformers
4648
Deep Thought # Hitchhiker's Guide to the Galaxy
49+
Delamain # Cyberpunk 2077
4750
Deputy ANDY # Eureka
4851
Dog # Half-Life
4952
Donald Duck # Perry Rhodan

0 commit comments

Comments
 (0)