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