Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0

Browse Source
This commit is contained in:
Anuken
2018-03-15 12:57:03 -04:00
parent 155f3945a6 ae89a004a6
commit b4ec2ccb90
13 changed files with 278 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,6 +70,7 @@ text.joingame.byip=Join by IP...
text.joingame.title=Join Game
text.joingame.ip=IP:
text.disconnect=Disconnected.
text.disconnect.data=Failed to load world data!
text.connecting=[accent]Connecting...
text.connecting.data=[accent]Loading world data...
text.connectfail=[crimson]Failed to connect to server: [orange]{0}
@@ -115,6 +116,8 @@ text.openlink=Open Link
text.back=Back
text.quit.confirm=Are you sure you want to quit?
text.changelog.title=Changelog
text.changelog.loading=Getting changelog...
text.changelog.error.android=[orange]Note that the changelog does not work on Android 4.4 and below!\nThis is due to an internal Android bug.
text.changelog.error=[scarlet]Error getting changelog!\nCheck your internet connection.
text.changelog.current=[yellow][[Current version]
text.changelog.latest=[orange][[Latest version]