mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-09 07:17:36 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	build.gradle
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/Control.java
#	core/src/io/anuke/mindustry/core/Logic.java
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/core/NetServer.java
#	core/src/io/anuke/mindustry/core/UI.java
#	core/src/io/anuke/mindustry/editor/MapSaveDialog.java
#	core/src/io/anuke/mindustry/input/GestureHandler.java
#	core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
#	core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
#	gradle/wrapper/gradle-wrapper.properties
#	server/src/io/anuke/mindustry/server/ServerControl.java
This commit is contained in:
Anuken
2018-05-23 10:36:59 -04:00
parent 3f1389818c b4088dcfbc
commit fd77dfd66d
74 changed files with 533 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
text.about=Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\nOriginally an entry in the [orange]GDL[] Metal Monstrosity Jam.\n\nCredits:\n- SFX made with [YELLOW]bfxr[]\n- Music made by [GREEN]Roccow[]\n\nSpecial thanks to:\n- [coral]MitchellFJN[]: extensive playtesting and feedback\n- [sky]Luxray5474[]: wiki work, code contributions\n- [lime]Epowerj[]: code build system, icon\n- All the beta testers on itch.io and Google Play\n
text.about=Created by [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\nOriginally an entry in the [orange]GDL[] Metal Monstrosity Jam.\n\nCredits:\n- SFX made with [YELLOW]bfxr[]\n- Music made by [GREEN]a beat a day[]\n\nSpecial thanks to:\n- [coral]MitchellFJN[]: extensive playtesting and feedback\n- [sky]Luxray5474[]: wiki work, code contributions\n- [lime]Epowerj[]: code build system, icon\n- All the beta testers on itch.io and Google Play\n
text.credits=Credits
text.discord=Join the mindustry discord!
text.changes=[SCARLET]Attention!\n[]Some important game mechanics have been changed.\n\n- [accent]Teleporters[] now use power.\n- [accent]Smelteries[] and [accent]crucibles[] now have a maximum item capacity.\n- [accent]Crucibles[] now require coal as fuel.
@ -108,7 +108,7 @@ text.savefail=Failed to save game!
text.save.delete.confirm=Are you sure you want to delete this save?
text.save.delete=Delete
text.save.export=Export Save
text.save.import.invalid=[orange]This save is invalid!
text.save.import.invalid=[orange]This save is invalid!\n\nNote that[scarlet]importing saves with custom maps[orange]\nfrom other devices does not work!
text.save.import.fail=[crimson]Failed to import save: [orange]{0}
text.save.export.fail=[crimson]Failed to export save: [orange]{0}
text.save.import=Import Save