Commit Graph

201 Commits

Author SHA1 Message Date
Github Actions
3907a23fb4 Automatic bundle update 2022-07-15 14:42:13 +00:00
Github Actions
bb7f96437c Automatic bundle update 2022-07-15 03:34:36 +00:00
Catchears
e4274c2b49
german erekir & v7 translation (#6869)
* initial german erekir translation

* first ideas

* Update bundle_de.properties

added missing ones, fixed some typos

* Update bundle_de.properties

* Update bundle_de.properties

* suggested changes

* shawak's changes

* update to 4c3ee57ce9

* update to 3927841f43

* update to 371394df6f

* update to d6539b267c

Co-authored-by: JoeFLYtheCoder <73280709+jdopss@users.noreply.github.com>
Co-authored-by: Anuken <arnukren@gmail.com>
2022-07-14 23:33:26 -04:00
Github Actions
521519c8ab Automatic bundle update 2022-07-14 19:45:43 +00:00
Github Actions
07427e68a1 Automatic bundle update 2022-07-14 19:28:44 +00:00
Epowerj
4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Github Actions
9d4839b26d Automatic bundle update 2022-07-11 22:19:30 +00:00
Github Actions
a7db6d86ff Automatic bundle update 2022-07-11 21:16:23 +00:00
Epowerj
9413a399cd Merge branch 'master' of https://github.com/Anuken/Mindustry into maps
 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
2022-07-11 17:14:39 -04:00
Github Actions
788e63cf28 Automatic bundle update 2022-07-11 18:39:05 +00:00
Github Actions
cbc4c0d3b2 Automatic bundle update 2022-07-09 04:34:18 +00:00
Github Actions
0182e61803 Automatic bundle update 2022-07-07 21:04:47 +00:00
Github Actions
5ea8538e0f Automatic bundle update 2022-07-07 01:29:48 +00:00
Github Actions
5e45b64ee1 Automatic bundle update 2022-07-06 17:00:37 +00:00
Github Actions
85321d7465 Automatic bundle update 2022-07-05 22:42:07 +00:00
Github Actions
97d077df84 Automatic bundle update 2022-07-01 16:52:44 +00:00
Github Actions
261714d395 Automatic bundle update 2022-06-30 03:04:25 +00:00
Github Actions
82b3bd7520 Automatic bundle update 2022-06-29 22:51:22 +00:00
Github Actions
8f0b8c1277 Automatic bundle update 2022-06-27 13:57:57 +00:00
Github Actions
0698c5dd8f Automatic bundle update 2022-06-26 15:52:10 +00:00
Github Actions
6f3c91c241 Automatic bundle update 2022-06-25 13:08:30 +00:00
Github Actions
8b66107833 Automatic bundle update 2022-06-24 00:58:28 +00:00
Github Actions
2f45ec7c90 Automatic bundle update 2022-06-20 23:37:58 +00:00
Github Actions
3137ec09e3 Automatic bundle update 2022-06-19 14:58:55 +00:00
Github Actions
58e274b29f Automatic bundle update 2022-06-17 22:20:30 +00:00
Github Actions
6db20908b3 Automatic bundle update 2022-06-16 19:35:33 +00:00
Github Actions
22c5002931 Automatic bundle update 2022-06-14 01:10:07 +00:00
Github Actions
5ccc7d44db Automatic bundle update 2022-06-08 14:36:04 +00:00
Github Actions
642f1f74af Automatic bundle update 2022-06-08 13:21:24 +00:00
Github Actions
17bb8738cc Automatic bundle update 2022-06-08 13:06:22 +00:00
Github Actions
91643d94c4 Automatic bundle update 2022-06-08 12:58:35 +00:00
end-me-please
9b8a09892a
Update bundle_de.properties (#6768)
aHR0cHM6Ly9pLmltZ3VyLmNvbS9NSG1kV0plLnBuZw==
2022-05-10 18:58:36 -04:00
Github Actions
1a07b1514f Automatic bundle update 2022-05-09 21:42:41 +00:00
Github Actions
e69aa6bf49 Automatic bundle update 2022-05-08 16:46:41 +00:00
Github Actions
f5ef01f01e Automatic bundle update 2022-05-08 13:30:05 +00:00
Github Actions
043cd7f5be Automatic bundle update 2022-05-07 04:31:11 +00:00
Github Actions
88821befe6 Automatic bundle update 2022-05-07 00:35:16 +00:00
Anuken
b40957e28b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/ui/dialogs/JoinDialog.java
2022-04-20 14:16:20 -04:00
end-me-please
cfafc9cc8a
Update bundle_de.properties (#6708) 2022-04-14 12:48:50 -04:00
Anuken
9242ae1ecb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2022-03-09 11:42:18 -05:00
Otto Richter (fnetX)
6ea4570ae8
Update German translations (#6619) 2022-03-04 17:20:46 -05:00
Anuken
45b81fae37 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-12-21 10:39:49 -05:00
KuhnChris
4b6541ae4e
Update missing "core launch animation skip" in german translation file (bundle_de) (#6430)
* Update settings file (bundle_de)

* Update bundle_de.properties
2021-12-14 12:52:26 -05:00
Anuken
f214f38f08 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-25 13:29:51 -05:00
Catchears
c24c5c6196
update german translation (#6354)
Co-authored-by: Anuken <arnukren@gmail.com>
2021-11-25 12:09:16 -05:00
KuhnChris
cd0fbb4d81
(german translation) add missing liquid-container (#6353)
* (german translation) add missing liquid-container

For some reason the liquid container has been missing in the translation file (at all)

* Update bundle_de.properties

Reorder and remove duplicate entry for description

* Update bundle_de.properties

bblock=>block

* Update bundle_de.properties

* Update bundle_de.properties

Plural->Singular, making sure tanks only store 1 kind of liquid.
2021-11-25 12:07:50 -05:00
Anuken
a48911b983 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
2021-11-22 12:11:31 -05:00
Anuken
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken
c8397c9d10 Reverting bundle update (see description)
The bundle updater removed quite a lot of comments and extra details. I will be rewriting the bundle launcher to fix this.
2021-11-22 10:31:01 -05:00
Anuken
65f36faf71 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/src/mindustry/type/UnitType.java
2021-11-22 10:12:48 -05:00