mirror of
https://github.com/doublespeakgames/adarkroom.git
synced 2026-06-23 04:42:29 +08:00
Merge branch 'EricaBranch' into James_BRANCH
Conflicts: README.md
This commit is contained in:
@@ -5,6 +5,7 @@ A Minimalist Text Adventure Game
|
|||||||
|
|
||||||
[Click to play](http://adarkroom.doublespeakgames.com/)
|
[Click to play](http://adarkroom.doublespeakgames.com/)
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
[
|
[
|
||||||
[Chinese](http://adarkroom.doublespeakgames.com/?lang=cn) |
|
[Chinese](http://adarkroom.doublespeakgames.com/?lang=cn) |
|
||||||
[French](http://adarkroom.doublespeakgames.com/?lang=fr) |
|
[French](http://adarkroom.doublespeakgames.com/?lang=fr) |
|
||||||
@@ -21,5 +22,16 @@ A Minimalist Text Adventure Game
|
|||||||
[Japanese](http://adarkroom.doublespeakgames.com/?lang=jp)
|
[Japanese](http://adarkroom.doublespeakgames.com/?lang=jp)
|
||||||
]
|
]
|
||||||
|
|
||||||
|
=======
|
||||||
|
Languages |
|
||||||
|
--------- | ---------
|
||||||
|
[Chinese](http://adarkroom.doublespeakgames.com/?lang=cn) | [French](http://adarkroom.doublespeakgames.com/?lang=fr)
|
||||||
|
[German](http://adarkroom.doublespeakgames.com/?lang=de) | [Italian](http://adarkroom.doublespeakgames.com/?lang=it)
|
||||||
|
[Korean](http://adarkroom.doublespeakgames.com/?lang=kr) | [Polish](http://adarkroom.doublespeakgames.com/?lang=pl)
|
||||||
|
[Russian](http://adarkroom.doublespeakgames.com/?lang=ru) | [Spanish](http://adarkroom.doublespeakgames.com/?lang=es)
|
||||||
|
[Swedish](http://adarkroom.doublespeakgames.com/?lang=sv) | [Turkish](http://adarkroom.doublespeakgames.com/?lang=tr)
|
||||||
|
[Ukrainian](http://adarkroom.doublespeakgames.com/?lang=uk) | [Portuguese](http://adarkroom.doublespeakgames.com/?lang=pg)
|
||||||
|
[Japanese](http://adarkroom.doublespeakgames.com/?lang=jp) |
|
||||||
|
>>>>>>> EricaBranch
|
||||||
|
|
||||||
[Play on GitHub](http://continuities.github.io/adarkroom)
|
[Play on GitHub](http://continuities.github.io/adarkroom)
|
||||||
|
|||||||
Reference in New Issue
Block a user