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 resource-rework

Browse Source
This commit is contained in:
Anuken
2018-08-18 13:10:22 -04:00
parent e9d03c179c 0f173bcc5a
commit a60ce3c54c
63 changed files with 1674 additions and 1830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ text.server.kicked.serverOutdated=Outdated server! Ask the host to update!
text.server.kicked.banned=You are banned on this server.
text.server.kicked.recentKick=You have been kicked recently.\nWait before connecting again.
text.server.kicked.nameInUse=There is someone with that name\nalready on this server.
text.server.kicked.nameEmpty=Your name must contain at least one character or number.
text.server.kicked.nameEmpty=Your chosen name is invalid.
text.server.kicked.idInUse=You are already on this server! Connecting with two accounts is not permitted.
text.server.kicked.customClient=This server does not support custom builds. Download an official version.
text.host.info=The [accent]host[] button hosts a server on port [scarlet]6567[]. \nAnybody on the same [LIGHT_GRAY]wifi or local network[] should be able to see your server in their server list.\n\nIf you want people to be able to connect from anywhere by IP, [accent]port forwarding[] is required.\n\n[LIGHT_GRAY]Note: If someone is experiencing trouble connecting to your LAN game, make sure you have allowed Mindustry access to your local network in your firewall settings.
@@ -356,6 +356,11 @@ setting.mutemusic.name=Mute Music
setting.sfxvol.name=SFX Volume
setting.mutesound.name=Mute Sound
text.keybind.title=Rebind Keys
category.general.name=General
category.view.name=View
category.multiplayer.name=Multiplayer
keybind.move_x.name=Move x
keybind.move_y.name=Move y
keybind.select.name=Select
@@ -368,8 +373,15 @@ keybind.pause.name=Pause
keybind.dash.name=Dash
keybind.chat.name=Chat
keybind.player_list.name=Player list
keybind.console.name=console
keybind.console.name=Console
keybind.rotate.name=Rotate
keybind.toggle_menus.name=Toggle menus
keybind.chat_history_prev.name=Chat history prev
keybind.chat_history_next.name=Chat history next
keybind.chat_scroll.name=Chat scroll
keybind.drop_unit.name=drop unit
keybind.zoom_minimap.name=Zoom minimap
mode.text.help.title=Description of modes
mode.waves.name=waves
mode.waves.description=the normal mode. limited resources and automatic incoming waves.