mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-12 03:37:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	core/assets/bundles/bundle.properties
This commit is contained in:
Anuken 2019-05-02 08:57:09 -04:00
commit eaa2ad4f05
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/assets/bundles/bundle.properties
View File

@ -1,11 +1,11 @@
credits.text = Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]
credits = Credits
contributors = Translators and Contributors
discord = Join the Mindustry discord!
link.discord.description = The official Mindustry discord chatroom
discord = Join the Mindustry Discord!
link.discord.description = The official Mindustry Discord chatroom
link.github.description = Game source code
link.dev-builds.description = Unstable development builds
link.trello.description = Official trello board for planned features
link.trello.description = Official Trello board for planned features
link.itch.io.description = itch.io page with PC downloads and web version
link.google-play.description = Google Play store listing
link.wiki.description = Official Mindustry wiki