mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-03 12:53:48 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,062 Commits 4 Branches 160 Tags 2.3 GiB
69c04ea90d
Commit Graph

1996 Commits

Author SHA1 Message Date
Albert Cerfeda
2ee518c9fc
Uppercase initial of 'Trello' (#2174) 2020-06-19 08:06:31 -04:00
Anuken
e88ff1a358 Minor UI tweaks 2020-06-17 15:07:20 -04:00
Anuken
3c02234a3b Ammo resupply point implementation 2020-06-17 10:41:26 -04:00
Math2128
cecfe77e95
Update bundle_fr.properties 
Translated new stuffs + fixed two mistakes.
 2020-06-15 15:06:42 -04:00
Anuken
90b0650af9 Merge remote-tracking branch 'origin/master' 2020-06-15 09:58:54 -04:00
Anuken
d04ce2a750 Block damage multiplier rule 2020-06-15 09:58:46 -04:00
Cyberman
3dfad51e93
Update bundle_nl.properties 
Just a few things I had time for.
 2020-06-15 15:49:10 +02:00
ILiekMelons
dbe482d494
Fixed disassembler and overdrive projector (#2163) 
I misspelt disassembler and forgot to put a .name somewhere 😅
 2020-06-15 09:44:38 -04:00
Math2128
db77cfa3b5
Update bundle_fr.properties 
added the new stuff from the main bundle + fixed a typo
 2020-06-15 02:02:04 -04:00
Math2128
ac14f43107
Update bundle_fr.properties 
1125
 2020-06-14 20:45:10 -04:00
ILiekMelons
2a7da8c80e
Add names for new drones and machines (#2162) 
* Add in names for drone-related things

* Various machines added

* extra newline that i removed
 2020-06-14 20:43:25 -04:00
Math2128
baa0d5a951
Update bundle_fr.properties 
1030
 2020-06-14 18:46:32 -04:00
Math2128
9e105dbce5
Update bundle_fr.properties 
971
 2020-06-14 14:13:15 -04:00
Math2128
a7a31f6c35
Update bundle_fr.properties 
837
 2020-06-14 00:33:57 -04:00
Math2128
917db20e76
Update bundle_fr.properties 2020-06-10 23:10:00 -04:00
Math2128
c5df9aa814
Update bundle_fr.properties 
Ligne 644: Le jeu ne se met pas en pause pendant que l'on construit, même avec cette option de cocher. En fait, cela met la construction sur pause et attend que l'on appuie sur la touche E (par défaut) pour confirmer la construction. Je trouvais l'ancien nom assez trompeur, et je l'ai donc changer comme cela. 

I'm at line 762
 2020-06-10 19:20:31 -04:00
Math2128
61d212128a
Update bundle_fr.properties 
line 709
 2020-06-09 23:47:13 -04:00
Math2128
778b61914a
Update bundle_fr.properties 
Correction de quelques fautes de frappe lors des modifications des descriptions des tourelles.
Fixed some typos about turret descriptions.
 2020-06-09 14:04:00 -04:00
Math2128
758b327639
Update bundle_fr.properties 
Quelques changements aux descriptions des tourelles pour s'ajuster aux définitions anglaises et dans le but d'homogénéiser les descriptions. Je ne suis pas sur au niveau du Cyclone.
Some changes about the turret descriptions to fit more the english description.
 2020-06-08 15:07:50 -04:00
Math2128
be50ededcd
Update bundle_fr.properties 
Because I made typos translating the tutorial
 2020-06-07 21:35:00 -04:00
Math2128
f7a7521120
Update bundle_fr.properties 
Worked on the « may be subject to a lot of changes» tutorial.
 2020-06-07 21:09:40 -04:00
Math2128
5ca1d66755
Update bundle_fr.properties 2020-06-07 20:01:36 -04:00
Anuken
36ce04e8f0 fuse fix 2020-06-07 18:26:45 -04:00
Petr Gašparík
cd1918e337 Czech translation - update with cleanups 2020-06-08 00:00:56 +02:00
Petr Gašparík
269a92a723 Merge branch 'master' of https://github.com/Anuken/Mindustry into v105 2020-06-07 23:56:42 +02:00
Math2128
68cfd1790a
Update bundle_fr.properties 
Line 633
 2020-06-07 13:44:12 -04:00
키에르
09d42773a6
Match 69d0751e65 2020-06-07 22:29:03 +09:00
키에르
b9b57f7908
Finish 2020-06-07 22:03:43 +09:00
Math2128
409cc219f1
Update bundle_fr.properties 
Line 476
 2020-06-07 00:45:57 -04:00
Math2128
f940f96a14
Update bundle_fr.properties 
Fixed some more typos and added a few translation lines (259 to 462)
 2020-06-06 15:16:02 -04:00
Math2128
fa665468d3
Update bundle_fr.properties 
Fixed some typos here and there (line 1 to 258)
 2020-06-05 12:02:56 -04:00
Ali-C-Ila
0e7c70fe3c
Update bundle_zh_TW.properties 2020-06-04 18:44:30 +08:00
soytheLB
d2d0be7759
Update bundle_es.properties 
added line 275 respawn
changed  waves.boss to waves.guardian

added bar.units
removed bar.
 2020-06-04 05:16:04 -03:00
Anuken
69d0751e65 Cleanup 2020-06-01 18:55:19 -04:00
Ali-C-Ila
95ade7f32a
Update bundle_zh_TW.properties 2020-05-30 19:48:14 +08:00
Anuken
780c4208bb Cleanup 2020-05-29 13:58:53 -04:00
Anuken
d851a09944 Cleanup 2020-05-29 13:52:42 -04:00
Petr Gašparík
645e66fe71 Czech translation - color correction 2020-05-26 22:20:15 +02:00
Petr Gašparík
671162e700 Czech translation - type 2020-05-26 13:43:35 +02:00
Ali-C-Ila
d636242b6f
Update bundle_zh_TW.properties 2020-05-25 18:37:57 +08:00
Petr Gašparík
b2382ac429 Czech translation - up to date! 2020-05-25 10:25:21 +02:00
TheJaaju
de42cd6250
Update bundle_fi.properties 
- Fixed typos
- Added translations
 2020-05-25 10:52:44 +03:00
Anuken
0e59a22cbe Respawn key 2020-05-24 22:27:14 -04:00
Anuken
e8869c07fe Removed respawn time rule 2020-05-24 17:05:31 -04:00
Anuken
f250008db3 Cleanup 2020-05-22 20:00:02 -04:00
Ali-C-Ila
ee288fbd3b
Update bundle_zh_TW.properties 2020-05-21 20:32:37 +08:00
Izzat Nasrun
196a79a10c togglable in settings.game 
fix zoom independency
 2020-05-21 12:26:20 +08:00
Anuken
78f24b8840 Support for wave shields 2020-05-20 17:16:18 -04:00
Przemyslaw Paluch
0af1e549f8
Fixed typos in Polish translation (#2083) 2020-05-18 20:24:21 -04:00
Ali-C-Ila
255edd94f8
Update bundle_zh_TW.properties 2020-05-18 23:11:18 +08:00
zethnest
dafe629c1d
fix coloring (#2077) 2020-05-18 08:37:10 -04:00
키에르
3a62bfa8ce
Update bundle_ko.properties 2020-05-17 16:07:21 +09:00
키에르
d61da30c15
Update bundle_ko.properties 2020-05-17 02:05:33 +09:00
Anuken
6938c69d97 Minor planet dialog polish 2020-05-15 22:24:01 -04:00
GioIacca9
898c07c4af
Minor changes 2020-05-15 16:21:39 +02:00
sk7725
8c501fa10b
[KO] Small Revert (#2059) 
Readd translator credits(Kieaer said he removed it temporarily, and also https://discord.com/channels/391020510269669376/395414970793459714/710497552071655484)
 2020-05-14 22:00:24 -04:00
Olexandr Nesterenko
b99dba808e
Merge branch 'master' into patch-2 2020-05-14 08:54:42 +03:00
Olexandr Nesterenko
89f3511082
Update bundle_uk_UA.properties 2020-05-14 08:53:13 +03:00
Anuken
8abe6c4270 Merge remote-tracking branch 'origin/master' 2020-05-13 17:05:10 -04:00
Anuken
04dc701c25 Various campaign-related tweaks 2020-05-13 17:04:59 -04:00
zethnest
2dfa334ba6
Lowercases ColorNames (#2053) 
* lowercase colornames

* change yellow to accent
 2020-05-13 14:38:26 -04:00
ian
b758b69243
Partially add to and fix swedish translations (#2052) 2020-05-13 14:37:05 -04:00
Anuken
ab49825d35 Merge remote-tracking branch 'origin/master' 2020-05-12 21:34:40 -04:00
Anuken
6a22d45320 Prototype unit cap mechanic 2020-05-12 21:34:27 -04:00
Summet
fea5142955
Replaced all upper-case colors to lower-case (#2044) 2020-05-12 20:03:35 -04:00
Alberto Galera
4910afbc82
Fix translation typo (#2045) 
* Fix translation typo

* typo
 2020-05-12 20:03:23 -04:00
sk7725
911424b2e2
Changed [lighthray] to [lightgray] (#2033) 
If somehow the color [lighthray] will be added, ignore this pull request!
 2020-05-11 21:23:50 -04:00
Lapis
130eee35ec
Update bundle_ja.properties (#2029) 
* 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
 2020-05-11 10:46:34 -04:00
Olexandr Nesterenko
709d3751d1
Update bundle_uk_UA.properties 2020-05-11 12:20:46 +03:00
Olexandr Nesterenko
4545033f12
Update bundle_uk_UA.properties 2020-05-11 11:20:48 +03:00
TheMainOne
a5b235d829
Fixed "Restart required" (#2025) 2020-05-10 22:56:24 -04:00
Lapis
1514f9f7ec
Update bundle_ja.properties (#2026) 
* 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
 2020-05-10 22:48:14 -04:00
Anuken
07701f8c01 Merge remote-tracking branch 'origin/master' 2020-05-10 13:34:57 -04:00
Anuken
2cb9cfb097 Cleanup 2020-05-10 13:34:52 -04:00
DLJ-345
11d2ed06cd
Update bundle_fi.properties (#2020) 2020-05-10 12:27:44 -04:00
Lapis
53d60e9cf6
Update bundle_ja.properties (#2013) 
* 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
 2020-05-09 10:21:34 -04:00
valtsu41
dcaf0dded5
Better zone naming in finnish (#2008) 2020-05-08 18:28:20 -04:00
cinnx
21e446e6f0
Update bundle_pl.properties (#2010) 
updated, fixed and translated some phrases.
thanks @Kubek0212 for reporting old description of power nodes ❤
 2020-05-08 16:43:11 -04:00
laohuaji233
e5e325b25b
Update bundle_zh_CN.properties (#2007) 2020-05-08 09:20:44 -04:00
Lapis
1fd22f6d10
Small fix bundle_ja.properties (#1992) 
* 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
 2020-05-07 20:17:29 -04:00
TheSlaylord
a0c747407f
Update bundle_ru.properties (#2004) 
Removed experimental tag
 2020-05-07 20:17:21 -04:00
LFlicker
735187e78a
Update bundle_ko.properties (#1986) 
* Update bundle_ko.properties

Typo correction

* Update bundle_ko.properties

* Update bundle_ko.properties

Typo Correction
 2020-05-05 11:06:32 -04:00
Koteyka_by
c920902481
Update bundle_be.properties (#1977) 
Fix a errors in a translate
 2020-05-04 09:09:58 -04:00
xetrov05
c83ae5d34c
Translation to ZH_TW (#1974) 2020-05-03 17:50:57 -04:00
Summet
63d2d32fd8
Update bundle_ru.properties (#1972) 2020-05-03 11:45:41 -04:00
Ali-C-Ila
e7c3c3f199
Update bundle_zh_TW.properties (#1965) 
* 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-05-02 10:13:01 -04:00
Lapis
33d9501dd2
Update bundle_ja.properties (#1963) 
* 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
 2020-05-01 23:55:22 -04:00
키에르
211be67e0e
Update bundle_ko.properties (#1948) 2020-05-01 12:24:01 -04:00
Anuken
cdc8d2bfe4 Removed experimental tag 2020-05-01 11:31:25 -04:00
DarkenWizMan
f8a24bc3a1
fixed more misspells, added new words (#1956) 
unit factory and drone changed to lithuanian counterparts
 2020-05-01 10:06:16 -04:00
DarkenWizMan
864d6977ff
fixed mispels, added new words (#1945) 
Removed some capital letters, because in lithuanian names of things don't have capital letters in all words, only first word (unless each word gets it's own row). I was too unsure if I should change machine name capital letters.
Also changed uncorrectly used words.
Added new words.
NOTE: I haven't looked through all stuff, so, I may have missed something.
 2020-04-30 12:34:02 -04:00
Ali-C-Ila
d3c9689fff
Update bundle_zh_TW.properties (#1940) 2020-04-29 10:21:50 -04:00
bluet-it
7bffc66b3d added incomplete hungarian translation 2020-04-29 15:58:35 +02:00
TheSlaylord
ae472fb03d
Update bundle_ru.properties (#1931) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2020-04-28 15:05:41 -04:00
Kittiskov
58cbfa599a
Update(Not complete yet) (#1381) 
I didn't update all these yet, because I have to sleep (yawn).

Co-authored-by: Anuken <arnukren@gmail.com>
 2020-04-28 14:16:40 -04:00
Daan Breur
40ea1c865d
[LANG] NL Some Small Changes (#1546) 2020-04-28 12:32:09 -04:00
Lapis
1836cf9582
Update bundle_ja.properties (#1930) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties

* Update bundle_ja.properties
 2020-04-28 12:27:07 -04:00
GioIacca9
eef4137a59
Updated bundle_it to dfcf11f (#1929) 2020-04-28 12:27:00 -04:00
Prosta4okua
ab0cb0c019
Ukrainian translation (#1924) 
* Update bundle_ru.properties

* Felix alive (phantom description)

* RU bundle Phantom description fix

* 2 lines changed

wave.enemies
wave.enemy

* 6 lines changed

editor.overwrite.confirm
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

* 5 lines changed (fixed)

confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

* 5 lines changed (yet again)

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Стан з гілки master взято

* Оновлено на 26.04.2020

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

Co-authored-by: Felix Corvus <remint32@yandex.ru>
Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
 2020-04-28 12:26:52 -04:00
sk7725
14de9d7f5f
6.0 unit and block Korean Translation #1 (#1936) 2020-04-28 12:25:31 -04:00
Wina
621fa7862c
Updated Spanish Bundle (#1937) 
* Minor fixes

* Added Plastanium Conveyor Translation
 2020-04-28 12:25:11 -04:00
Prosta4okua
f905245b71
Revert "Update bundle_ru.properties" 2020-04-27 00:50:15 +03:00
Summet
8860dab37a
Update bundle_ru.properties 
Rename "Целостность" to "Здоровье"
 2020-04-26 21:15:38 +03:00
Anuken
1941b0fa8a Merge remote-tracking branch 'origin/master' 2020-04-26 11:24:56 -04:00
Anuken
dfcf11fb07 Removed mech-related bundle entries 2020-04-26 11:24:52 -04:00
Lapis
02fbc56137
Update bundle_ja.properties (#1917) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties

* Update bundle_ja.properties
 2020-04-26 11:08:05 -04:00
Gdeft
9260cdee95
Update in bundle_in_ID.properties (#1913) 
Translated few words to Bahasa and revised some of them too so they sound more standard.
 2020-04-25 13:38:06 -04:00
Lapis
d97d971cf6
Update bundle_ja.properties (#1908) 
* update bundle_ja.properties

* update bundle_ja.properties

* update bundle_ja.properties
 2020-04-25 13:38:00 -04:00
Anuken
9e0af97cee Merge remote-tracking branch 'origin/master' 2020-04-25 12:30:22 -04:00
Anuken
838e12cc0a stop 2020-04-25 12:30:18 -04:00
sk7725
02394973b0
Fix inconsistencies in Korean Translation (#1912) 
For block, the national institute of korean language(https://www.korean.go.kr/front/onlineQna/onlineQnaView.do?mn_id=216&qna_seq=81761) specifies that the correct translation is 블록, not 블럭. Both translations, despite 블럭 being the wrong translation, are being used. All 블럭 have been changed to 블록.
 2020-04-25 12:24:56 -04:00
Anuken
09e08a474b Plastanium conveyor + bugfixes 2020-04-24 20:17:24 -04:00
Anuken
21946cafd1 Merge branch 'crater' of https://github.com/Quezler/Mindustry into Quezler-crater 2020-04-24 15:46:32 -04:00
Anuken
6041e238a6 Bugfixes 2020-04-24 12:01:08 -04:00
Patrick 'Quezler' Mounier
39266d23c8
Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
 2020-04-23 21:10:48 +02:00
Anuken
7091cad704 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-04-23 14:05:09 -04:00
laohuaji233
37240478b8
Update bundle_zh_CN.properties (#1900) 
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2020-04-23 11:08:33 -04:00
Álvaro Manzanas
cf69fa1d7c
Update bundle_es.properties (#1899) 
* Update bundle_es.properties

* Update bundle_es.properties
 2020-04-22 16:20:07 -04:00
Kaio Duarte Costa
390b5e3b60
Update bundle_pt_BR.properties (#1881) 2020-04-21 11:03:25 -04:00
sk7725
05cfe7a80a
Fixed inconsistencies with the word 'schematic' (#1892) 
설계도 and 회로도 are both schematic.
 2020-04-21 11:03:09 -04:00
Patrick 'Quezler' Mounier
32e32ecae2
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
 2020-04-16 22:38:51 +02:00
Felix Corvus
07ae854dec
A🅱️uke fixes 
see: https://github.com/Anuken/Mindustry/pull/1877#issuecomment-614645700
 2020-04-16 22:02:40 +03:00
Patrick 'Quezler' Mounier
79a095faa8
Merge branch '6.0' into crater 2020-04-16 20:30:13 +02:00
Anuken
2693f9c176 Implemented some PR features 2020-04-16 13:46:45 -04:00
Corby
15750b5eb0
Korean localization fixes and changes. (#1874) 2020-04-16 13:33:38 -04:00
Patrick 'Quezler' Mounier
a1d4804fae
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 17:13:18 +02:00
Anuken
a8f4df8030 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
 2020-04-16 10:14:13 -04:00
Ali-C-Ila
7d6e8fdcd1
Update bundle_zh_TW.properties (#1876) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-04-16 09:14:36 -04:00
Vanguard
0cde4a9778
Merge branch 'master' into master 2020-04-16 15:44:04 +03:00
Vanguard
bfe701bd08
5 lines changed (yet again) 2020-04-16 15:17:35 +03:00
Vanguard
2a47c22607
5 lines changed (fixed) 
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin
 2020-04-16 15:15:25 +03:00
Patrick 'Quezler' Mounier
5c28985ee6
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/Blocks.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/BlockStorage.java
 2020-04-16 12:39:52 +02:00
Patrick 'Quezler' Mounier
424e58ff7d
Merge branch 'master' into crater 2020-04-16 11:20:16 +02:00
Prosta4okua
305632c002
Update bundle_uk_UA.properties (#1871) 2020-04-15 10:36:38 -04:00
Vanguard
18e92f5abf
RU updates (#1866) 
* Update bundle_ru.properties

* Felix alive (phantom description)

* RU bundle Phantom description fix

* 2 lines changed

wave.enemies
wave.enemy

* 6 lines changed

editor.overwrite.confirm
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin

Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: Felix Corvus <remint32@yandex.ru>
 2020-04-14 10:04:29 -04:00
Miguel de Dios Matias
a10235d6b0
I18n es tiny fix (#1865) 
* Update some translations into spanish.

* Need a white space between #wave_number and wave word (in spanish).

* Added translation for 'search'.

* Fix translate of 'bleeding edge' is https://www.urbandictionary.com/define.php?term=Bleeding%20edge . It is not a name.

* Fixed some spanish strings about schematic.

* Fixed some translations in spanish.
 2020-04-14 10:04:13 -04:00
Vanguard
32199ac307
6 lines changed 
editor.overwrite.confirm
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin
 2020-04-14 15:17:33 +03:00
GioIacca9
25bc6ebaf0
Minor changes (#1858) 2020-04-13 21:22:49 -04:00
Wina
9a0292268e
Minor changes in bundle_es.properties (#1861) 
Added some clarifications in the tutorial and corrected multiple spelling and grammar errors.
 2020-04-13 21:21:20 -04:00
Lapis
91f9ce3098
update (#1862) 2020-04-13 21:21:10 -04:00
Olexandr Nesterenko
474ddcf989
Update bundle_uk_UA.properties (#1811) 2020-04-12 18:06:09 -04:00
Fernando
8093f69b6a
Update bundle_pt_BR.properties (#1839) 
* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties
 2020-04-12 17:43:51 -04:00
Lapis
bc20967262
Update bundle_ja.properties (#1848) 
* update

* update

* update
 2020-04-12 13:36:01 -04:00
Blockzilla101
501253d13a
added name of player to ban/kick/vote-kick/un-admin/admin confirmation dialog (#1846) 
* added name of player to baning/kicking/vote-kicking/admining

* slight tweaks

* fixed redundant things
 2020-04-12 10:52:05 -04:00
Patrick 'Quezler' Mounier
9e811be477
Name which map name has a conflict when importing (#1844) 2020-04-12 09:56:36 -04:00
Anuken
b1f32d241b Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/assets/bundles/bundle_uk_UA.properties
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/blocks/power/ImpactReactor.java
#	gradle.properties
 2020-04-11 10:37:52 -04:00
Petr Gašparík
9c1730685c
Czech translation - up to date (#1836) 2020-04-10 18:45:01 -04:00
Anuken
2395bc9308 Bugfixes / Testing reaper sprite 2020-04-10 12:55:58 -04:00
Anuken
aedd047c6f Slightly improved mod dialog 2020-04-10 11:49:22 -04:00
OverChock
4ec85ae72b
Update bundle_pt_BR.properties (#1833) 
Some changes on turrets description.
 2020-04-10 08:34:17 -04:00