Commit Graph
52 Commits
Author SHA1 Message Date
Prosta4okuaandGitHub 8432677826 Update bundle_ru.properties 2018-08-08 23:58:41 +03:00
Prosta4okuaandGitHub 0c0c6e5470 Update bundle_ru.properties 2018-08-08 23:56:42 +03:00
Prosta4okuaandGitHub 273523480f Update bundle_ru.properties 2018-08-08 08:34:44 +03:00
Anuken 80001246ef Added sector wave difficulty / ita bundle updated 2018-08-06 11:19:44 -04:00
Anuken 6904d4693f Merge remote-tracking branch 'origin/master' 2018-08-05 19:19:55 -04:00
Anuken 3ef7ec3be5 Bundles updated 2018-08-05 19:19:50 -04:00
Prosta4okuaandGitHub d3077bec58 Update bundle_ru.properties 2018-08-06 00:12:50 +03:00
Prosta4okuaandGitHub a1095353fc Update bundle_ru.properties 2018-08-06 00:11:19 +03:00
Prosta4okuaandGitHub 569d6d4272 Update bundle_ru.properties 2018-08-05 19:09:01 +03:00
Prosta4okuaandGitHub eabc6d79c3 Update bundle_ru.properties 2018-08-02 12:44:35 +03:00
Prosta4okuaandGitHub 5f4ca6e383 Update bundle_ru.properties 2018-08-02 11:57:11 +03:00
Anuken 9b01140882 Fixed merge conflicts 2018-08-01 18:44:53 -04:00
Anuken 4dae27da98 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/assets/bundles/bundle_ru.properties
2018-08-01 18:44:25 -04:00
Anuken f0cab65a6d Bundles updated 2018-08-01 18:38:48 -04:00
Prosta4okuaandGitHub b5ad885237 Update bundle_ru.properties 2018-08-01 23:45:08 +03:00
Prosta4okuaandGitHub 07bd0fec70 Update bundle_ru.properties 2018-08-01 23:44:25 +03:00
Prosta4okuaandGitHub 318e51d736 Update bundle_ru.properties 2018-08-01 23:43:18 +03:00
Prosta4okuaandGitHub 64772c195e Update bundle_ru.properties 2018-08-01 21:17:23 +03:00
Prosta4okuaandGitHub 05ead63bdc Update bundle_ru.properties 2018-08-01 21:16:55 +03:00
Prosta4okuaandGitHub 6f5c64420d Update bundle_ru.properties 2018-08-01 20:59:45 +03:00
Prosta4okuaandGitHub d9d9a00a24 Update bundle_ru.properties 2018-08-01 20:53:01 +03:00
Prosta4okuaandGitHub a3b0bb323f Update bundle_ru.properties 2018-07-30 19:23:06 +03:00
Prosta4okuaandGitHub a6246d27d9 [INCOMPLETE]Upt8te bundle_ru.properties 2018-07-30 19:11:25 +03:00
Anuken bbaa2a2c92 Updated bundles, removed unused text 2018-07-29 12:01:25 -04:00
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
Prosta4okuaandGitHub 69b0020d15 Update bundle_ru.properties 2018-07-27 10:03:52 +03:00
Prosta4okuaandGitHub 9ed4f2b7a3 Update bundle_ru.properties 2018-07-26 19:40:51 +03:00
Prosta4okuaandGitHub 7396f91a5e Update bundle_ru.properties 2018-07-26 19:39:48 +03:00
Prosta4okuaandGitHub ccc926d812 Update bundle_ru.properties 2018-07-26 19:36:26 +03:00
Prosta4okuaandGitHub bd39255ead Update bundle_ru.properties 2018-07-26 19:31:21 +03:00
Prosta4okuaandGitHub add7b1a7d9 Update bundle_ru.properties 2018-07-26 19:29:19 +03:00
Prosta4okuaandGitHub 8e471f9939 Update bundle_ru.properties 2018-07-26 19:24:08 +03:00
Prosta4okuaandGitHub c61568ef98 Update bundle_ru.properties 2018-07-26 19:13:47 +03:00
Prosta4okuaandGitHub 3260e45e71 Update bundle_ru.properties 2018-07-26 19:11:48 +03:00
Prosta4okuaandGitHub ea61b560b8 Update bundle_ru.properties 2018-07-26 19:03:58 +03:00
Prosta4okuaandGitHub f8ad7d485b [INCOMPLETE]Update bundle_ru.properties 2018-07-26 18:58:24 +03:00
Prosta4okuaandGitHub 9a7ea0d28c Update bundle_ru.properties 2018-07-26 17:40:38 +03:00
Prosta4okuaandGitHub 56239b6bbf Up8te bundle_ru.properties
It's all?!
2018-07-24 13:44:30 +03:00
Prosta4okuaandGitHub 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
Prosta4okuaandGitHub dbe06b0a93 Update bundle_ru.properties 2018-05-19 22:50:50 +03:00
Prosta4okuaandGitHub b2ea733b45 Update bundle_ru.properties 2018-05-19 21:49:29 +03:00
Prosta4okuaandGitHub 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