Commit Graph

4472 Commits

Author SHA1 Message Date
Prosta4ok_ua
f071ddf9da 123 2019-08-31 22:39:19 +03:00
Prosta4ok_ua
f49d3757df Merge branch 'translation' of https://github.com/Prosta4okua/Mindustry into translation 2019-08-31 22:03:03 +03:00
Prosta4ok_ua
4fb1ee1201 hm 2019-08-31 21:15:05 +03:00
Prosta4ok_ua
2a35f5c879 hmmm 2019-08-31 21:12:44 +03:00
Anuken
15affd4701
Merge branch 'master' into translation 2019-08-31 13:06:53 -04:00
ichthyosaurus
75451743aa Update bundle_de.properties (#620) 2019-08-31 12:12:07 -04:00
AmateurPotion
b4d9a6a507 Update bundle_ko.properties (#618)
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
2019-08-31 12:11:01 -04:00
VizardAlpha
335afa56a1 bundle_fr_BE.properties (#617)
* bundle_fr_BE.properties

* Small fix

https://fr.m.wikipedia.org/wiki/Flou_lumineux
2019-08-31 12:10:54 -04:00
laohuaji233
485592bdac Update bundle_zh_CN.properties (#612)
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
2019-08-31 12:05:49 -04:00
FranLamark
ee9289fc24 Update bundle_es.propierties (Spanish trasnlation to the game) (#611)
* Update bundle_es.propierties

Translated mostly (i hope every) stuff in english, and edit some spanish stuff too. Gaven specially to some ores more descriptive names, and bring specially translation in spanish to newer things like draugs factories, information about this one, and related newer things.

* Update bundle_es.properties
2019-08-31 12:05:42 -04:00
Spico (Spirit Guy)
a0c281a0a9 Update to Turkish Translation (#610)
Updated lines between 1 to 100.
Some tutorial messages are missing, going to translate them later on.
2019-08-31 12:05:08 -04:00
Dominik
ad0b0858f6 Update bundle_pl.properties (#608)
* Update bundle_pl.properties

* Update bundle_pl.properties

* Update bundle_pl.properties

* Update bundle_pl.properties
2019-08-31 12:05:00 -04:00
itskatt
c2191872ac [READY TO MERGE] French translation (#594)
* first step

* More progress

* Translate zones

* More translating

* Remove redundant part

* Translate ~100 lines

* Update bundle_fr.properties

* Update bundle_fr.properties

* More translating

* Translate over 1k lines, start translating the tutorial

* Rearange the french bundle like the original one

* Translate more lines from the tutorial

* Finish translating the tutorial + few adjustments

* Start translating the item descriptions

* More item description translating

* few parts that i've missed

* sync files + few changes

* not much

* Apply suggestions from AzariasB's code review

Co-Authored-By: Azarias Boutin <AzariasB@users.noreply.github.com>

* Few changes + add AzariasB to the contributors

* Translate new additions

* small fixes

* More small fixes
2019-08-31 12:04:52 -04:00
Anuken
5f361413bb /sync command 2019-08-31 10:14:26 -04:00
Anuken
3414026828 Crash fix 2019-08-31 09:50:05 -04:00
Anuken
7089fae0d5 Map fixes 2019-08-31 09:45:27 -04:00
Anuken
80bdf1e19c Bugfix 2019-08-31 08:47:53 -04:00
Anuken
e0c1f2a31a Minor save fixes 2019-08-30 23:39:29 -04:00
Anuken
92cfa2b033 1x deconstruction speed 2019-08-30 22:16:18 -04:00
Anuken
877cd5968c Tweaks 2019-08-30 21:37:10 -04:00
Anuken
b39464a7d1 Merged save previews 2019-08-30 20:13:03 -04:00
Anuken
52332e5821 Bugfixes 2019-08-30 20:11:48 -04:00
Anuken
3b9d3fd233 Platform cleanup 2019-08-30 17:32:49 -04:00
Anuken
6d9a59c60b More cleanup 2019-08-30 16:37:04 -04:00
Anuken
39e0977231 Entity cleanup 2019-08-30 16:00:09 -04:00
Anuken
f8f140090f Fixed #623 2019-08-30 15:52:55 -04:00
Anuken
f063f7b2d3 Minor tweaks 2019-08-30 15:17:05 -04:00
Anuken
60306f146f Campaign slot preview 2019-08-30 15:08:43 -04:00
Anuken
3b873b7cb2 Merge branches 'master' and 'save-preview' of https://github.com/Anuken/Mindustry into save-preview 2019-08-30 15:01:48 -04:00
Anuken
26d44ea030 Save slot previews 2019-08-30 15:01:38 -04:00
Anuken
b369751a75 Bugfixes 2019-08-30 13:56:33 -04:00
Anuken
6e2cd81c9f Save previews 2019-08-30 13:53:19 -04:00
Anuken
e953bd40eb PR build fix 2019-08-30 12:41:43 -04:00
Anuken
233ae99d3f Added teamchat 2019-08-29 23:22:47 -04:00
Anuken
ddca5ef25a Data export/import 2019-08-29 22:04:01 -04:00
Anuken
ae88f286a6 Merge remote-tracking branch 'origin/master' 2019-08-29 19:07:05 -04:00
Anuken
25af0c4302 Added bleeding edge info 2019-08-29 19:07:00 -04:00
Poussinou
96b398867b Update README.md (#622) 2019-08-29 18:57:54 -04:00
Anuken
97d1c49a3c ... 2019-08-29 18:53:46 -04:00
Anuken
e83dfd3d5a ... 2019-08-29 18:45:03 -04:00
Anuken
1142af853d ... 2019-08-29 18:37:27 -04:00
Anuken
4d502fe073 Updated travis.yml 2019-08-29 18:31:55 -04:00
Anuken
b022333df1 sadness 2019-08-29 18:27:42 -04:00
Anuken
725b2188aa Updated travis.yml 2019-08-29 18:09:03 -04:00
Anuken
1f20d19aea Updated travis.yml 2019-08-29 18:04:39 -04:00
Anuken
ec9f91519d Updated travis.yml 2019-08-29 17:23:50 -04:00
Anuken
ae4e3e2d33 Updated travis.yml 2019-08-29 17:07:58 -04:00
Anuken
b931493d2f Updated travis.yml 2019-08-29 17:04:05 -04:00
Anuken
7b0c07533b Updated travis.yml 2019-08-29 16:52:52 -04:00
Anuken
33f0d64971
Update .travis.yml 2019-08-29 16:49:07 -04:00