Commit Graph

3911 Commits

Author SHA1 Message Date
QmelZ
d837879bd8 translation 2020-10-31 00:51:34 +03:00
Anuken
181ad1016c Reduced tech costs / Added missing blocks to fungal pass 2020-10-30 16:05:40 -04:00
Anuken
ed93fa45d3 Preset tweaks 2020-10-30 13:16:59 -04:00
Anuken
76ff55d7f1 Campaign tweaks 2020-10-30 11:50:38 -04:00
Anuken
73035b9211
Merge branch 'master' into formatting 2020-10-30 09:26:51 -04:00
YellOw139
790a802236
Indev pop-up slip-by fix 2020-10-30 12:33:40 +02:00
TheJaaju
b45e7cd8f3
Update bundle_fi.properties
More translations
2020-10-30 11:17:58 +02:00
YellOw139
fca8d6741c
Yet another typo 2020-10-29 23:27:15 +02:00
YellOw139
97e9cdc1fd
Fixed real confusing entry 2020-10-29 23:25:44 +02:00
YellOw139
e9089aae68
Update bundle_ro.properties 2020-10-29 21:53:18 +02:00
Anuken
3eb655402f
Merge pull request #2978 from Volas171/patch-1
Update bundle_es.properties
2020-10-29 13:39:11 -04:00
Petr Gašparík
bced413810 Czech translation for latest version
up to commit 44286ce
2020-10-29 09:08:14 +01:00
Anuken
55a7089a3d Merge remote-tracking branch 'origin/master' 2020-10-28 18:51:49 -04:00
Anuken
44286cee59 Wave versions 2020-10-28 18:51:42 -04:00
老滑稽
e4a8d2cb33
Update bundle_zh_CN.properties 2020-10-28 23:43:57 +08:00
Yakuzet
fc317939e2
Update bundle_tr.properties
I fixed all googled things
2020-10-28 16:36:22 +03:00
Volas171
53e655698b
Update bundle_es.properties 2020-10-28 08:32:23 -05:00
Volas171
d91dd2548d
Merge branch 'master' into patch-1 2020-10-27 15:05:36 -05:00
Prosta4okua
a644b64c1c
Update bundle_uk_UA.properties 2020-10-27 21:55:22 +02:00
summetdev
2918a0ea86 Newlines 2020-10-27 22:08:53 +03:00
summetdev
a3abadd8c2 Revert "Newlines"
This reverts commit a78faa57
2020-10-27 21:55:40 +03:00
summetdev
9a7e0fb45e Removed spaces in brackets 2020-10-27 21:54:48 +03:00
summetdev
a78faa57f3 Newlines 2020-10-27 21:36:02 +03:00
Wiki Updater
7fa9902ee7 änderungen von Ansraer 2020-10-27 19:05:37 +01:00
Prosta4okua
d84f2e1993
27.10.2020 2020-10-27 19:54:50 +02:00
Anuken
5582a8bf1b Fixed #3153 / Fixed #3152 2020-10-27 13:13:54 -04:00
老滑稽
624f004800
Update bundle_zh_CN.properties 2020-10-27 23:35:38 +08:00
Anuken
6eab4ebd1c Fixed #3145 / Fixed #3144 2020-10-27 10:27:57 -04:00
老滑稽
c32c500ad2
Update bundle_zh_CN.properties 2020-10-27 12:48:11 +08:00
Anuken
c0d0edfc89 Bugfixes & cleanup 2020-10-26 23:09:51 -04:00
Anuken
8770bb2422 Fixed #3133 (probably) / Logic icon draw command 2020-10-26 13:31:32 -04:00
Vanguard
928a831bc4
1 line changed
editor.exportimage
2020-10-26 19:09:13 +03:00
Anuken
ca572163d4
Merge pull request #3115 from YellOw139/patch-5
Add Vietnamese characters to font.woff
2020-10-26 10:00:41 -04:00
Felix Corvus
0ab06392c1
Update bundle_ru.properties 2020-10-26 14:54:35 +03:00
Anuken
59b5d809db Balance 2020-10-25 15:55:23 -04:00
YellOw139
1d54e939cb
Add new font.woff 2020-10-25 17:02:04 +02:00
YellOw139
a40c49a915
Delete font.woff 2020-10-25 17:01:29 +02:00
YellOw139
103e408cb7
[Bundle][RO] Translation Update
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit 41d388aa7f
- Typo fixes & various other improvements
2020-10-25 15:45:57 +02:00
Wiki Updater
1d4da170ef änderungen von shawak 2020-10-25 14:22:36 +01:00
老滑稽
3b75527e4c
Update bundle_zh_CN.properties 2020-10-25 19:24:57 +08:00
老滑稽
83d4825bf2
Update bundle_zh_CN.properties 2020-10-25 18:57:57 +08:00
Prosta4okua
3d47389a39
Update bundle_uk_UA.properties 2020-10-25 11:19:09 +02:00
Anuken
41d388aa7f Item sprite cleanup 2020-10-24 19:06:05 -04:00
Vanguard
b4deb6caca
1 line changed
unit.nobuild
2020-10-24 20:06:02 +03:00
Felix Corvus
ba7645e531
Update bundle_ru.properties 2020-10-24 19:14:18 +03:00
Anuken
a930b34c3e
Merge pull request #3090 from QmelZ/master
Turkish Translation
2020-10-24 11:58:21 -04:00
QmelZ
232a3dfe87
one last little fix 2020-10-24 17:28:10 +03:00
QmelZ
19ef414e5c
even more fixes 2020-10-24 17:18:56 +03:00
QmelZ
f46eb24615
some other fixes 2020-10-24 17:07:52 +03:00
Anuken
56acbcecfd
Merge branch 'master' into patch-5 2020-10-24 09:46:02 -04:00
QmelZ
7d0952d858
small fix 2020-10-24 15:59:28 +03:00
QmelZ
ef40a2e78e
Update bundle_tr.properties 2020-10-24 15:56:51 +03:00
Wiki Updater
280f0d6e21 Improve german translation for v6 2020-10-24 09:20:57 +02:00
SilentOwl476
bff79d7c27
Update bundle_tr.properties 2020-10-24 01:46:02 +03:00
Anuken
42bfab6e40 Fixed #3079 2020-10-23 16:12:36 -04:00
Anuken
5512c1817d Extra scrap for debris field map 2020-10-23 14:09:05 -04:00
Anuken
754aba9013 Merge remote-tracking branch 'origin/master' 2020-10-23 13:31:58 -04:00
Anuken
cf3f540df4 New map 2020-10-23 13:31:55 -04:00
Anuken
f2f805e140
Merge pull request #2969 from rodrigolitzius/patch-1
S
2020-10-23 12:01:43 -04:00
Anuken
92d573bdcb Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/assets/bundles/bundle_ro.properties
2020-10-23 11:52:27 -04:00
Anuken
f81f4ded03 Updated bundles 2020-10-23 11:52:01 -04:00
YellOw139
92327bfd1d
[Bundle][RO] Translation Update
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit <need to check number>
- Typo fixes & various other improvements
2020-10-23 18:49:48 +03:00
Anuken
7d194094ff Merge remote-tracking branch 'origin/master' 2020-10-23 11:48:56 -04:00
Anuken
d8798b5a0d function 2020-10-23 11:48:53 -04:00
Anuken
6d846cc3a5
Merge pull request #2934 from Prosta4okua/master
[Bundle][RU] actual L10n
2020-10-23 11:48:35 -04:00
Anuken
4dfb743273 Merged translations 2020-10-23 11:42:12 -04:00
Anuken
2b5ee5c463 Merge remote-tracking branch 'origin/master' 2020-10-23 10:39:05 -04:00
Anuken
bf1268bb6e Shooting -> Function category / Dialog cleanup 2020-10-23 10:39:01 -04:00
Felix Corvus
9cb601c569
Update bundle_ru.properties 2020-10-23 17:11:51 +03:00
Felix Corvus
bf8ab8e34e
Update bundle_ru.properties 2020-10-23 16:49:43 +03:00
Anuken
9db4d287dd
Merge branch 'master' into patch-2 2020-10-23 09:47:22 -04:00
Anuken
4ca3909220
Merge pull request #3024 from DaGamerFiles/patch-2
Update bundle_in_ID.properties
2020-10-23 09:38:24 -04:00
Anuken
6983577b20
Merge pull request #3006 from Kieaer/patch-5
Update bundle_ko.properties
2020-10-23 09:38:10 -04:00
Anuken
3d46ed580e
Merge branch 'master' into patch-7 2020-10-23 09:35:13 -04:00
Anuken
d7e5828347
Merge pull request #2942 from YellOw139/patch-5
[Bundle][RO] Translation Update
2020-10-23 09:34:40 -04:00
Anuken
2dfb9830a3
Merge branch 'master' into v107 2020-10-23 09:34:04 -04:00
Anuken
a1de6e5288
Merge branch 'master' into patch-7 2020-10-23 09:30:23 -04:00
Anuken
a16b9240d6
Merge branch 'master' into patch-15 2020-10-23 09:28:47 -04:00
Anuken
e163a80ba7
Merge pull request #2748 from ballgamer56/patch-2
Update Thai translation
2020-10-23 09:25:05 -04:00
Anuken
d66cf13ac6 Added buttons to clear campaign saves & research 2020-10-23 09:08:17 -04:00
Anuken
4f21ea7799 Fixed archipelago map / filters messing with block data 2020-10-22 18:11:12 -04:00
Anuken
a2e75df096 Map editor tweaks & fixes / New map 2020-10-22 15:27:30 -04:00
Anuken
c2ff5a69ef Buffered map-load filter support / Spawn path filter 2020-10-22 12:27:22 -04:00
YellOw139
f4fcb8daa6
Update bundle_ro.properties 2020-10-22 19:14:48 +03:00
Anuken
46b2f4cccb Minor bugfixes & wave tweaks 2020-10-22 11:54:27 -04:00
Felix Corvus
c63b98150f
Merge branch 'master' into master 2020-10-22 18:21:52 +03:00
Vanguard
91164f659b
smol breyn 2020-10-22 18:02:39 +03:00
Vanguard
70750920fa
anuke shenanigans
a lot of them
2020-10-22 17:14:41 +03:00
YellOw139
76d2fc0f54
Typo 2020-10-22 16:23:21 +03:00
YellOw139
4d28b5083c
Quezler Status Fielded my mind 2020-10-22 14:27:56 +03:00
YellOw139
dabdf514d6
Space 2020-10-22 07:50:35 +03:00
Anuken
f0d74e2705 New map / Unit stat tweaks / FileChooser keyboard input 2020-10-21 20:32:35 -04:00
YellOw139
21022436e8
Stats are finally consistent and up to date 2020-10-21 22:02:24 +03:00
Anuken
a80d0cc457 Fixed #3053 2020-10-21 14:10:28 -04:00
Volas171
dec9e8d4aa
Merge branch 'master' into patch-1 2020-10-21 10:53:20 -05:00
Anuken
48f5be6623
Merge pull request #3051 from skykatik/patch-1
var -> let
2020-10-21 10:48:22 -04:00
Anuken
ee8f18796e Merge remote-tracking branch 'origin/master' 2020-10-21 10:37:07 -04:00
Anuken
3517da8214 Fixed #3049 2020-10-21 10:37:03 -04:00
Skat
aba001f499
var deprecated, use let or const 2020-10-21 16:05:36 +03:00
키에르
f3f5872159
Merge branch 'master' into patch-5 2020-10-21 20:14:40 +09:00
YellOw139
eba9578a0d
More conflict changes. Should be ok now. 2020-10-21 07:30:18 +03:00
YellOw139
b95bf1595b
Fog 2020-10-21 07:28:27 +03:00
YellOw139
92b8981988
Merge branch 'master' into patch-5 2020-10-21 07:22:51 +03:00
YellOw139
83c53a541a
Wall stats (WIP) 2020-10-21 07:10:48 +03:00
Leonwang4234
54fd2e03b4 resolve conflicts 2020-10-20 15:57:48 -07:00
Leonwang4234
df37ce3cef Merge remote-tracking branch 'upstream/master' into wall-stats 2020-10-20 15:49:46 -07:00
Anuken
18e6a43a87 Added weather to some built-in maps 2020-10-20 17:24:51 -04:00
Anuken
8f58228317 More base parts 2020-10-20 15:43:06 -04:00
Anuken
30abfc0619 Fixed #3045 2020-10-20 14:02:10 -04:00
ballgamer56
f0c5c98633
Merge branch 'master' into patch-2 2020-10-20 20:23:15 +07:00
ballgamer56
8e164269cc
Formated to the newest update
Updated to commit 2ff749bd17
2020-10-20 20:02:41 +07:00
Quick-Korc
a1a2007b3e
Zone description and typo fixed 2020-10-20 19:00:13 +07:00
WinterUnderTheSnow
877999dd1e
Update bundle_zh_CN.properties 2020-10-20 07:13:10 +08:00
Thomas Widyantoko
0ba653ddd0
Merge branch 'master' into patch-2 2020-10-20 05:55:02 +07:00
Anuken
c27251cfb0 Fog 2020-10-19 18:28:37 -04:00
Anuken
6e8732387b Better weather classes 2020-10-19 16:25:59 -04:00
Anuken
2ff749bd17 Unified stat system 2020-10-19 11:34:52 -04:00
Anuken
80f801db36 Fixed #3023 / Fixed #3020 2020-10-19 10:04:10 -04:00
Thomas Widyantoko
e88a2f8437
Space block name changed 2020-10-19 14:50:56 +07:00
Thomas Widyantoko
4b4cde288b
Update bundle_in_ID.properties
Improved translation, new lines and a slight text color format fix.
2020-10-19 13:43:59 +07:00
Petr Gašparík
538c198113 Czecg translation up to commit 46ec457 2020-10-19 07:48:57 +02:00
Petr Gašparík
8f4ac642d1 Merge branch 'master' of https://github.com/Anuken/Mindustry into v107 2020-10-19 07:34:10 +02:00
Leonwang4234
cff2799c72 remove changes in description 2020-10-18 14:29:15 -07:00
Summet
8ceb155e38
:) 2020-10-19 00:14:40 +03:00
Leonwang4234
db3db47ca1 Add wall stats + other changes 2020-10-18 13:35:20 -07:00
키에르
48885a814c
Update bundle_ko.properties 2020-10-18 13:56:55 +09:00
YellOw139
2ff6630e23
Bumped up a couple of commits 2020-10-18 05:39:38 +03:00
Anuken
521d44714d Disabled spawnpoints during ongoing attack maps 2020-10-17 19:49:13 -04:00
Felix Corvus
6ab7496a9d
Update bundle_ru.properties 2020-10-18 00:04:01 +03:00
Volas171
f364892fce
Merge branch 'master' into patch-1 2020-10-17 10:50:53 -05:00
Anuken
c99873c823 Added bool to enable editor cliff button 2020-10-17 11:02:48 -04:00
Anuken
46ec457819 Cleanup 2020-10-17 10:37:28 -04:00
Anuken
41dcf7a6f2
Merge pull request #2817 from ThePythonGuy3/patch-7
Some typo fixes and various stuff for spanish bundle.
2020-10-17 09:19:05 -04:00
WinterUnderTheSnow
699f2ca5a2
Update bundle_zh_CN.properties
Confirmed units,name this may be the final version of translation by main translating team for v108
2020-10-17 17:38:12 +08:00
Felix Corvus
db28e82faf
Update bundle_ru.properties 2020-10-16 22:50:01 +03:00
Anuken
e00daffe6d Bugfixes 2020-10-16 15:27:30 -04:00
Volas171
df0bb9583b
Update bundle_es.properties
Added 6.0 new block translation and fixed some misspells/english missed words
2020-10-16 13:08:40 -05:00
Prosta4okua
a8f45b464c
Update bundle_uk_UA.properties 2020-10-16 18:57:13 +03:00
Felix Corvus
e31d293bab
Update bundle_ru.properties 2020-10-16 18:34:29 +03:00
Anuken
2f54edf34f Sector refactoring, invasions and cleanup 2020-10-16 11:02:24 -04:00
Felix Corvus
421fcd5705
Update bundle_ru.properties 2020-10-16 04:55:31 +03:00
Rodrigo
685fd51b6f
S
completely useless "S"
2020-10-15 21:43:06 -03:00
Anuken
86c2fe8805 too many things to list 2020-10-15 13:44:20 -04:00
xXextremeduro69420Xx
17725ddfe8
Update bundle_pt_BR.properties
Small changes and fixed some typos.
2020-10-14 11:32:37 -03:00
Prosta4okua
592708811b
Update bundle_uk_UA.properties 2020-10-14 14:54:21 +03:00
YellOw139
99b3a224d0
Typo fix 2020-10-14 11:49:13 +03:00
YellOw139
80bf157752
[Bundle][RO] Translation Update
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit 1554fd0394
- Typo fixes & various other improvements
2020-10-14 11:45:09 +03:00
Petr Gašparík
a85a20b346 Czech translation up to commit 1554fd0 2020-10-14 08:00:43 +02:00
Anuken
bb655100ee
Merge pull request #2865 from sk7725/patch-18
Update bundle_ko.properties
2020-10-13 19:38:18 -04:00
Felix Corvus
4b0c34c5c9
Перевод небесных тел 2020-10-14 02:03:10 +03:00
Anuken
1554fd0394 Planet selection for mods 2020-10-13 18:50:18 -04:00
Anuken
6bfae1c34f
Merge pull request #2932 from Prosta4okua/master
Update bundle_ru.properties
2020-10-13 18:09:59 -04:00
Anuken
cce8b5a530 Merge remote-tracking branch 'origin/master' 2020-10-13 18:09:49 -04:00
Anuken
a8b55c27e8 x 2020-10-13 18:09:46 -04:00
Anuken
41c08a64e2
Merge pull request #2724 from Prosta4okua/patch-6
Ukrainian localisation
2020-10-13 18:07:35 -04:00
Felix Corvus
f846125e78
Update bundle_ru.properties 2020-10-14 01:07:32 +03:00
Anuken
caab6c1fa3
Merge pull request #2720 from Prosta4okua/master
[Bundle][RU] actual L10n
2020-10-13 18:06:45 -04:00
Anuken
7a770d8aed
Merge pull request #2696 from YellOw139/patch-4
[Bundle][RO] Translation Update
2020-10-13 18:06:31 -04:00
Anuken
77458e1e4d
Merge pull request #2694 from PetrGasparik/v106-alpha
[v107-alpha] Czech translation - update
2020-10-13 18:06:16 -04:00
Anuken
64cae7d877
Merge pull request #2693 from laohuaji233/patch-38
Update bundle_zh_CN.properties(finished)
2020-10-13 18:06:07 -04:00
Anuken
0e544825f9
Merge pull request #2481 from Pietro303HD/patch-2
some small changes, and also removed a typo
2020-10-13 18:03:56 -04:00
Anuken
3bf80e6732
Merge pull request #2420 from DaGamerFiles/patch-1
Indonesian translation
2020-10-13 18:03:47 -04:00
Felix Corvus
e612213969
Update bundle_ru.properties 2020-10-14 00:44:10 +03:00
Summet
37cafe5081
Бета 2020-10-13 23:31:41 +03:00
Anuken
4bf2b3b43e Now in beta 2020-10-13 16:18:11 -04:00
Anuken
d4c72b2a9c
Merge pull request #2915 from genNAowl/pierce-cap-info
Add `pierceCap` Info
2020-10-13 10:53:17 -04:00
Leonwang4234
24d295a924 add infinitepierce + bugfixes 2020-10-12 17:57:00 -07:00
Felix Corvus
7564f93445
Merge branch 'master' into master 2020-10-12 22:11:18 +03:00
Vanguard
e2403b96e6
3 changed lines
indev.popup
block.silicon-smelter.description
block.alloy-smelter.description
2020-10-12 17:38:56 +03:00
Summet
2a1ce6109e
Дацитовый валун (#23) 2020-10-12 17:25:13 +03:00
Vanguard
eec7408b0e
3 lines added; 1 line changed
Added:
wave.guardianwarn
wave.guardianwarn.one
lastaccessed

Changed:
block.silicon-smelter.description
2020-10-12 17:08:57 +03:00
Anuken
f10c5c1ca8 Merge remote-tracking branch 'origin/master' 2020-10-12 10:06:41 -04:00
Anuken
378e81cd90 Fixed #2917 2020-10-12 10:06:34 -04:00
Wiki Updater
08629bb7f7 add bundle entry for dacit boulder 2020-10-12 10:49:41 +02:00
Leonwang4234
7f5561f037 add... 2020-10-11 17:03:48 -07:00
YellOw139
8ed6f1e3a8
Updates until commit 3fe79531a6 2020-10-11 21:01:37 +03:00
Felix Corvus
6d436ce680
избегаем потенциальных проблем 2020-10-11 19:18:28 +03:00
Summet
504d29ca54
Подключения узлов
* Подключения узлов 

* Подключения -> Подключений
2020-10-11 19:10:02 +03:00
Anuken
3fe79531a6 Added message for last accessed player of block 2020-10-11 11:47:22 -04:00
Anuken
e11a8565d0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/src/mindustry/ui/dialogs/PausedDialog.java
2020-10-11 10:51:46 -04:00
Anuken
3d99e38f10 Sector simplification 2020-10-11 10:51:33 -04:00
Patrick 'Quezler' Mounier
6d632fc532
Update bundle.properties 2020-10-11 14:59:44 +02:00
Vanguard
ec8708067b
1 new line
editor.center
2020-10-11 14:59:05 +03:00
Anuken
3f74c61c0a Map center button 2020-10-10 12:05:11 -04:00
Anuken
fb831e8fef Better cliff sprites 2020-10-10 11:37:58 -04:00
Pietro303HD
2e4cbdcc05
Update bundle_pt_BR.properties 2020-10-10 09:51:23 -03:00
Summet
be1cc21ff5
Протекает меньше -> Не протекает (#21) 2020-10-10 01:04:31 +03:00
Anuken
81633dace4 Merge remote-tracking branch 'origin/master' 2020-10-09 13:52:15 -04:00
Anuken
c78088ab5f Harder default waves 2020-10-09 13:52:07 -04:00
Patrick 'Quezler' Mounier
d776744905
Update leak behaviour in plated conduit description 2020-10-09 19:11:56 +02:00
Anuken
22f1c3b2d1 Bugfixes 2020-10-09 10:02:08 -04:00
Sunny Kim
30a5c6631b
consistency 2020-10-09 15:50:27 +09:00
Anuken
0a0af9c291 Random derelicts in sectors 2020-10-08 19:11:20 -04:00
Felix Corvus
fcb027f3e5
Космос 2020-10-09 00:56:42 +03:00
Anuken
c7f1204119 space 2020-10-08 15:14:28 -04:00
Anuken
d06449f311 space 2020-10-08 14:06:07 -04:00
Sunny Kim
a698258b67
Update bundle_ko.properties
some stuff, unit shield(방어막) vs force field(보호막) distinction and more
2020-10-08 19:17:30 +09:00
Vanguard
f81a88feca
2 new lines; 1 changed line
New:
rules.enemyLights
units.processorcontrol

Changed:
item.titanium.description
2020-10-06 13:54:01 +03:00
Petr Gašparík
38ef46aa41 Czech translation - update for commit 7088ae8 2020-10-06 10:09:24 +02:00
Petr Gašparík
91875ec45f Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha 2020-10-06 10:06:06 +02:00