Anuken
|
23bd9a989b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# core/assets/bundles/bundle_ru.properties
|
2018-07-27 09:15:24 -04:00 |
|
Anuken
|
acfa02475b
|
Updated bundles
|
2018-07-27 09:10:39 -04:00 |
|
Prosta4okua
|
69b0020d15
|
Update bundle_ru.properties
|
2018-07-27 10:03:52 +03:00 |
|
Prosta4okua
|
9ed4f2b7a3
|
Update bundle_ru.properties
|
2018-07-26 19:40:51 +03:00 |
|
Prosta4okua
|
7396f91a5e
|
Update bundle_ru.properties
|
2018-07-26 19:39:48 +03:00 |
|
Prosta4okua
|
ccc926d812
|
Update bundle_ru.properties
|
2018-07-26 19:36:26 +03:00 |
|
Prosta4okua
|
bd39255ead
|
Update bundle_ru.properties
|
2018-07-26 19:31:21 +03:00 |
|
Prosta4okua
|
add7b1a7d9
|
Update bundle_ru.properties
|
2018-07-26 19:29:19 +03:00 |
|
Prosta4okua
|
8e471f9939
|
Update bundle_ru.properties
|
2018-07-26 19:24:08 +03:00 |
|
Prosta4okua
|
c61568ef98
|
Update bundle_ru.properties
|
2018-07-26 19:13:47 +03:00 |
|
Prosta4okua
|
3260e45e71
|
Update bundle_ru.properties
|
2018-07-26 19:11:48 +03:00 |
|
Prosta4okua
|
ea61b560b8
|
Update bundle_ru.properties
|
2018-07-26 19:03:58 +03:00 |
|
Prosta4okua
|
f8ad7d485b
|
[INCOMPLETE]Update bundle_ru.properties
|
2018-07-26 18:58:24 +03:00 |
|
Prosta4okua
|
9a7ea0d28c
|
Update bundle_ru.properties
|
2018-07-26 17:40:38 +03:00 |
|
Prosta4okua
|
56239b6bbf
|
Up8te bundle_ru.properties
It's all?!
|
2018-07-24 13:44:30 +03:00 |
|
Prosta4okua
|
6cdb016c2c
|
[WIP] Update bundle_ru.properties
|
2018-07-23 23:45:43 +03:00 |
|
Anuken
|
9f723c39ef
|
Bundles updated / Fixed player name color changing join/leave text
|
2018-07-19 14:20:51 -04:00 |
|
Anuken
|
82c4c791cc
|
Added message for loading broken saves
|
2018-07-13 13:43:37 -04:00 |
|
Anuken
|
d6969d2c74
|
Removed unused bundle keys
|
2018-07-09 11:06:15 -04:00 |
|
Anuken
|
b7e28a73ba
|
Bugfixes / Added tool to re-format bundles with missing text
|
2018-07-09 11:02:30 -04:00 |
|
Anuken
|
fd77dfd66d
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0
# 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
|
2018-05-23 10:36:59 -04:00 |
|
Prosta4okua
|
dbe06b0a93
|
Update bundle_ru.properties
|
2018-05-19 22:50:50 +03:00 |
|
Prosta4okua
|
b2ea733b45
|
Update bundle_ru.properties
|
2018-05-19 21:49:29 +03:00 |
|
Prosta4okua
|
665f0ee03e
|
Update bundle_ru.properties
|
2018-05-06 09:45:17 +03:00 |
|
Anuken
|
9e309c9592
|
Changed uranium to thorium, fixed faulty vault transfer issues
|
2018-03-24 00:53:26 -04:00 |
|
Anuken
|
86a4ff971c
|
Updated Russian bundle
|
2018-02-12 16:11:46 -05:00 |
|
Anuken
|
da5e58f40b
|
Updated russian bundle
|
2018-02-02 16:27:47 -05:00 |
|
Anuken
|
fe458d03bd
|
Added russian bundle
|
2018-01-31 09:42:39 -05:00 |
|