Commit Graph

3361 Commits

Author SHA1 Message Date
Anuken
e0f1242ca7 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-07-14 15:04:04 -04:00
Anuken
bd95d81b40 nah 2020-07-14 15:03:59 -04:00
Anuken
d5b71e2773 Merge pull request #2210 from xerus2000/patch-1
Unify tower terminology in german translation of tutorial
2020-07-14 15:03:08 -04:00
Anuken
c21b02b1ec Merge pull request #2187 from Catchears/patch-1
Improved german translation.
2020-07-14 15:02:33 -04:00
Anuken
c1cd84593d Merge pull request #2194 from driver1748/patch-1
Corrected some translations
2020-07-14 14:58:35 -04:00
Anuken
85d67db1ed Merge pull request #2175 from AlbertCerfeda/patch-2
Minor changes
2020-07-14 14:58:13 -04:00
Anuken
fe0d3cfe22 Merge pull request #2140 from soytheLB/patch-5
Update bundle_es.properties
2020-07-14 14:56:30 -04:00
Anuken
1661905d9b Merge pull request #2106 from PetrGasparik/v105
Czech translation - up to date!
2020-07-14 14:56:09 -04:00
Anuken
ca1e43d79c Merge branch 'master' into patch-2 2020-07-14 14:52:28 -04:00
Anuken
43676b68bf Merge pull request #2105 from TheJaaju/patch-4
Update bundle_fi.properties
2020-07-14 14:49:27 -04:00
Anuken
752cccb588 Merge pull request #2062 from GioIacca9/patch-11
Minor changes
2020-07-14 14:45:51 -04:00
Anuken
3eca6b770e <added missing sprites IntelliJ missed> 2020-07-14 14:39:11 -04:00
Anuken
9dc49743e8 Implemented #1335 2020-07-14 13:20:50 -04:00
Anuken
064a0545a8 Merge pull request #1941 from bluet-it/master
add bundle_hu
2020-07-14 10:41:34 -04:00
Anuken
a33ac30a01 Merge pull request #1595 from andreasgamborg/patch-1
Create bundle_da.properties
2020-07-14 10:41:28 -04:00
Anuken
6d7d4bcba1 Merge pull request #2028 from burunduk/patch-2
Update bundle_uk_UA.properties
2020-07-14 10:40:34 -04:00
Anuken
b541cfcc75 Update bundle_zh_TW.properties (#2081)
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
2020-07-14 10:37:54 -04:00
Ali-C-Ila
6c52812a0d Update bundle_zh_TW.properties (#2054) 2020-07-14 10:37:41 -04:00
Lapis
360494af50 Update bundle_ja.properties (#2046)
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* removed experimental tag

* Small fix

* fix typo

* bundle_ja.properties

* Small fix

* Small fix

* Update bundle_ja.properties

* Update bundle_ja.properties

* add waves.guardian

* Fixed setting.atmosphere.name translation

* translation of waves.shields

* Update bundle_ja.properties
2020-07-14 10:37:22 -04:00
Felix Corvus
83d334582b Update bundle_ru.properties
Changes from https://github.com/Anuken/Mindustry/pull/2225
2020-07-14 07:24:40 +03:00
Ubuntu8406
982b7f33bc A small update of the finnish translation 2020-07-13 19:10:40 +03:00
Petr Gašparík
a0ef83fb62 Czech translation - small improvement 2020-07-13 10:43:31 +02:00
Petr Gašparík
682bfcc8e8 Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-07-13 10:42:30 +02:00
Anuken
430eef02e2 Multi-legged unit implementations 2020-07-11 22:41:26 -04:00
Anuken
0555e4dfa7 Various palette changes 2020-07-11 14:44:50 -04:00
Anuken
0752076bf2 Bullet cleanup 2020-07-11 09:08:17 -04:00
Anuken
9cb4645b11 More unit progress 2020-07-10 20:04:45 -04:00
T1NT4
b81de5ebe4 Update bundle_pt_BR.properties
changed the revenant factory description to match the revenant unit description on the database, and also fixed the revenant factory description so it no longer says that revenant are ground units
2020-07-10 18:00:12 -03:00
Anuken
d7e432f730 Unit name changes 2020-07-10 16:38:19 -04:00
Anuken
baa9f22a0b Ground support unit implementations 2020-07-10 12:14:24 -04:00
Anuken
f39702e1cc Core unit balance 2020-07-10 09:43:59 -04:00
Anuken
7c5f3762dd Bugfixes 2020-07-09 16:48:36 -04:00
Anuken
29e9d064df Unit wreck visuals 2020-07-08 23:48:12 -04:00
Anuken
a9333baa78 Research tweaks 2020-07-08 12:11:27 -04:00
Anuken
b95206cf87 Support for jar mods on desktop 2020-07-07 09:34:52 -04:00
Anuken
a6523630bf Unit sprite cleanup 2020-07-06 11:05:37 -04:00
Catchears
8a5f19e4f9 Changes from stuffAI 2020-07-06 13:08:48 +02:00
Janek
14f975bde7 Unify Tutorial terminology in german translation
A friend of mine was playing through the tutorial and was confused by the term "Turm", since the duo is translated as "Geschütz", so he didn't quite know what the tutorial wanted. This unifies the terminology, since in the beginning you only have one "Geschütz" choice anyways.
2020-07-05 17:54:48 +02:00
Anuken
add0d0cd86 Unit naming / Fixed #2209 2020-07-04 23:53:22 -04:00
Anuken
f4a7108382 Weapon system refactoring 2020-07-02 22:48:37 -04:00
Anuken
ee3aedc75f Implemented core item display (WIP) 2020-07-02 15:27:02 -04:00
Anuken
cecb5cf4b4 Added tractor beam turret 2020-07-02 14:02:33 -04:00
Anuken
fd2deb0a82 Moved pref saving to specific locations 2020-07-02 10:20:16 -04:00
Anuken
5f6c71b9d3 Replaced concept of "turns" with raw seconds 2020-07-01 11:50:33 -04:00
Anuken
e907c2045c Cleanup 2020-06-30 19:14:32 -04:00
Anuken
df4278a646 Removed item core restrictions 2020-06-29 19:32:15 -04:00
Anuken
810a59f146 Mass driver resprite 2020-06-29 16:23:25 -04:00
WinterUnderTheSnow
679aab18ee *Phantom is now Phenom too
XD
2020-06-29 10:07:53 +08:00
Anuken
b3f29f100d Custom launch items 2020-06-28 13:33:53 -04:00
Prosta4okua
24071ed23b Merge branch 'master' into master 2020-06-28 19:41:37 +03:00