Commit Graph

1996 Commits

Author SHA1 Message Date
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
Miguel de Dios Matias
5ac8ae2a00
I18n es tiny fix (#1835)
* Update some translations into spanish.

* Need a white space between #wave_number and wave word (in spanish).
2020-04-10 08:34:09 -04:00
Fernando
0a2ff97eb0
Update bundle_pt_BR.properties (#1830) 2020-04-09 09:59:03 -04:00
Gdeft
2c3e473b0f
Updated translation for bundle_in_ID.properties (#1824)
* New translation added for Bahasa

I will add more translation and also review it soon again.

* Update bundle_in_ID.properties

* Update bundle_in_ID.properties

Updated ID translation for the description in campaign mode.

* Update bundle_in_ID.properties

More update for the Indonesian language including :
▪Even more translation (of course)
▪Fixed captialization and spelling
▪Fixed already existing translation
(almost finished)

* Finished translation for Bahasa 

• Fixed few missed spellings
• Added new translation
• Finished translation (I'm not sure for the items)

This the last commit for this pull request :)
2020-04-09 09:37:34 -04:00
Vanguard
f7fcc0528e
2 lines changed
wave.enemies
wave.enemy
2020-04-09 02:39:52 +03:00
VKLowe
18aa9fc15e
Update bundle_ru.properties (#1827) 2020-04-07 09:13:38 -04:00
Olivier
3b0bff1a9b
Revised french translation, corrected syntax errors (grammar, spelling), coherence with names. (#1822) 2020-04-05 13:56:17 -04:00
laohuaji233
7227180707
Update bundle_zh_CN.properties (#1815) 2020-04-04 09:16:25 -04:00
Fernando
0d2bef90f2
Update bundle_pt_BR.properties (#1813) 2020-04-03 19:48:01 -04:00
shadowpazzo
b3cd492a13
little fix to surge things and more understandable words (#1778)
i think lega supercarica is better than lega di sovratensione for italians and more
2020-04-03 11:04:41 -04:00
Vanguard
4c9b034153
Updated Phantom description (#1809)
Added info "Rebuilds destroyed blocks"
2020-04-03 08:21:39 -04:00
TheSlaylord
41510d4574
Update bundle_ru.properties (#1808) 2020-04-03 08:21:16 -04:00
Patrick 'Quezler' Mounier
74e94e5344
Merge branch 'master' into crater 2020-04-02 12:05:04 +02:00
Felix Corvus
5f49f23aa0
RU bundle Phantom description fix 2020-04-02 05:13:33 +03:00
Felix Corvus
a7e86aeee8
Felix alive (phantom description) 2020-04-02 05:07:05 +03:00
KeviTV
e253f5b0bd
Create bundle_be.properties (#1797)
* Create bundle_be.properties

Full translation for the game into Belarusian

* Update bundle_be.properties

Small fix
2020-04-01 01:19:44 -04:00
Azathoth
8d784f616f
Update bundle_pt_BR.properties (#1796)
some fixes at translation, better and more fluid translation in some words and a big fix at a weapon name that a lot of people was complaining about
2020-03-31 23:36:09 -04:00
Ali-C-Ila
e31061a546
Update bundle_zh_TW.properties (#1792) 2020-03-31 09:32:50 -04:00
Lapis
c90a206a3a
update bundle_ja.properties (#1787) 2020-03-30 14:29:19 -04:00
Anuken
084c90ba9f Improved atmosphere shader performance 2020-03-30 11:35:22 -04:00
TheSlaylord
dd932c91b4
Update bundle_ru.properties (#1776)
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
2020-03-30 11:13:06 -04:00
Prosta4okua
7de0da28cd
Update bundle_ru.properties (#1777) 2020-03-30 11:12:58 -04:00
Lapis
4740350ec5
update bundle_ja.properties (#1782)
* 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-03-29 15:24:52 -04:00
Prosta4okua
075cfd6eb0
Update bundle_ru.properties 2020-03-28 18:39:37 +02:00
Anuken
48715d0311
Merge pull request #1769 from NickZhYT/patch-8
Update bundle_ru.properties
2020-03-28 08:52:46 -04:00
Anuken
cd99a0e1a7
Merge pull request #1770 from GioIacca9/patch-7
Update bundle_it.properties
2020-03-28 08:52:17 -04:00
Lapis256
43ef64bb2f update bundle_ja.properties 2020-03-28 20:12:34 +09:00
Lapis256
81bc6c6ce7 update bundle_ja.properties 2020-03-28 20:04:22 +09:00
NickZhYT
101744a710
Update bundle_ru.properties
Some description changes
2020-03-28 11:15:23 +03:00
GioIacca9
b37ea872a8
Update bundle_it.properties 2020-03-28 08:51:56 +01:00
Anuken
8302287019
Merge branch 'master' into patch-3 2020-03-27 16:52:54 -04:00
Anuken
b284d6892a Updated bundles with missing text 2020-03-27 16:13:41 -04:00
Anuken
6f279a18d5
Merge pull request #1700 from laohuaji233/patch-28
Update bundle_zh_CN.properties
2020-03-27 16:03:09 -04:00
Anuken
f6e384c0a2
Merge pull request #1766 from Ali-C-Ila/patch-30
Update bundle_zh_TW.properties
2020-03-27 16:02:32 -04:00
Anuken
88214aadb4
Merge pull request #1761 from PetrGasparik/v104
Czech translation for 104.x
2020-03-27 16:02:26 -04:00
Anuken
40e910b2e7
Merge branch 'master' into patch-1 2020-03-27 16:02:16 -04:00
Anuken
df572aac6b
Merge pull request #1724 from TheJaaju/patch-2
Update bundle_fi.properties
2020-03-27 15:58:42 -04:00
Anuken
6dfd6d44e7
Merge pull request #1699 from TheAldas/patch-4
Grammar corrections
2020-03-27 15:56:34 -04:00
Anuken
53c8b636ea
Merge pull request #1694 from Prosta4okua/master
RU updates
2020-03-27 15:56:25 -04:00
Anuken
d430a821d4
Update bundle_uk_UA.properties (#1693)
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
2020-03-27 15:56:17 -04:00
feu-follet
fad10815d2
Update bundle_fr.properties (#1683)
Add the french version for underflow gate (name+description)

Co-authored-by: Anuken <arnukren@gmail.com>
2020-03-27 15:56:09 -04:00
yeyys
2fc95d5a22
Update bundle_pt_BR.properties (#1627)
* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties

Co-authored-by: Anuken <arnukren@gmail.com>
2020-03-27 15:54:40 -04:00
Predator127
7cae1572c0
Update bundle_pt_BR.properties (#1628)
* Update bundle_pt_BR.properties

Made by Hanko! (Now Zero)

* Update bundle_pt_BR.properties

* Update bundle_pt_BR.properties
2020-03-27 15:53:15 -04:00
Lapis
5ddafdd618
Update bundle_ja.properties (#1681)
* update bundle

* update bundle

* update ja_bundle

Co-authored-by: Anuken <arnukren@gmail.com>
2020-03-27 15:11:17 -04:00
QmelZ
e93e174dcd
Fixed small things/changes to bundle_tr.properties (#1692)
title
2020-03-27 13:01:13 -04:00
soytheLB
f714714106
Update bundle_es.properties (#1748)
added translation to schematic.exists
added translation to rules.deconstructrefundmultiplier
added tranlation to rules.solarpowermultiplier
On the last I used solar panel power multiplier since it doesnt sound good in spanish otherwise.
2020-03-27 13:00:18 -04:00
feu-follet
900d221327
Update bundle_fr.properties (#1710)
Adds the chaos array translation, corrects some errors and improves some translations
2020-03-27 13:00:09 -04:00
NickZhYT
04e2aab3cf
Update bundle_ru.properties (#1746)
Some description changes
2020-03-27 12:33:22 -04:00
Igor Polyakov
3e30db1173
Update bundle_ru.properties (#1735) 2020-03-27 12:33:12 -04:00
Ali-C-Ila
1af5e59098
Update bundle_zh_TW.properties 2020-03-27 22:43:15 +08:00
TheSlaylord
ec49875325
Update bundle_ru.properties (#1760) 2020-03-27 10:10:07 -04:00
Prosta4okua
d6a395292a
Update bundle_uk_UA.properties 2020-03-27 11:43:03 +02:00
Prosta4okua
96e288d0ab
Update bundle_uk_UA.properties 2020-03-27 11:40:31 +02:00
Petr Gašparík
64d0c478d0 Czech translation - minus EOL 2020-03-27 09:12:56 +01:00
Petr Gašparík
f1717ceafa Czech translation - sync with 104.x 2020-03-27 09:11:45 +01:00
Vanguard
7216818fdc
2 new lines
players.search
players.notfound
2020-03-27 04:28:22 +03:00
fuzzbuck
643d054294
Add search bar in playerlist (#1572)
* add "search" bar in playerlist

* remove log.info

* clear keyboard focus & text on toggle

* refactor sField -> field (fixes build??)

* refactor field -> sField (revert) should build now 👍

* remove drawEach boolean, simplify everything (please ignore previous commits)

* escape color codes

* use Strings.stripcolors & check for & without color codes
2020-03-26 19:01:24 -04:00
Petr Gašparík
0b619851de
Czech translation - 104.x translation (#1713)
* Czech translation - sync with changes

* Czech translation - sync with updates

* Czech translation - small fix

* Czech - ud to date translation

* Czech - update translations for 104.x

* Czech translation - fixed typo
2020-03-26 18:40:49 -04:00
NickZhYT
281f2f7a64
Update bundle.properties (#1747)
Some description edits
2020-03-26 18:40:34 -04:00
unakiritan
935b22bf4a
Update bundle_ja.properties (#1695)
Translated into Japanese.
2020-03-26 17:43:18 -04:00
Anuken
152a987c3a Experimental flow display 2020-03-26 17:19:18 -04:00
Prosta4okua
11723fdb2d
Update bundle_uk_UA.properties 2020-03-26 20:39:50 +02:00
Prosta4okua
c6f7da4e4e
Update bundle_ru.properties 2020-03-26 20:30:31 +02:00
Anuken
0f79017f02 Merge remote-tracking branch 'origin/master' 2020-03-26 12:39:59 -04:00
Anuken
d346442e86 Changed "global" -> "community" servers 2020-03-26 12:39:54 -04:00
GioIacca9
ec30b0fa94
Update bundle_it.properties (#1755) 2020-03-26 11:30:04 -04:00
Yoann Prot
379bef6b52
✏️ fix typo on tutorial for belgium translation (#829) 2020-03-26 11:23:37 -04:00
Fernando
70d7f68078
Update bundle_pt_BR.properties 2020-03-24 20:50:52 -03:00
Fernando
6ecee1e947
Update bundle_pt_BR.properties 2020-03-24 20:46:48 -03:00
Anuken
7d5ceafff2 Implemented #1129 / Bugfixes 2020-03-24 12:02:26 -04:00
Dexapnow
d18697a504
Update bundle_pl.properties (#1742)
Based of "missing tags"
2020-03-24 11:18:06 -04:00
Olexandr Nesterenko
75272c0a3e change scrap name 2020-03-23 12:30:39 +02:00
TheJaaju
998cc9535e
Update bundle_fi.properties
Titles
2020-03-19 22:54:08 +02:00
laohuaji233
da215425e9
Update bundle_zh_CN.properties 2020-03-19 15:53:38 +08:00
TheJaaju
58a4ec1265
Update bundle_fi.properties 2020-03-18 08:42:16 +02:00
Anuken
436c76fd2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
#	core/src/mindustry/world/blocks/BuildBlock.java
2020-03-17 20:03:12 -04:00
TheJaaju
b874eecd5f
Update bundle_fi.properties
+ translations
2020-03-18 01:40:29 +02:00
Ali-C-Ila
0d19068219
Update bundle_zh_TW.properties (#1718)
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
2020-03-17 12:02:56 -04:00
TheJaaju
b0dddb2a7c
Update bundle_fi.properties (#1720)
added translations and fixed a typo
2020-03-17 12:02:47 -04:00
Prosta4okua
9d24a47b01
Update bundle_uk_UA.properties 2020-03-17 13:01:31 +02:00
Prosta4okua
bc0104b0cc
Update bundle_uk_UA.properties 2020-03-17 09:31:16 +02:00
Olexandr Nesterenko
567eb1e9dd revert some fix 2020-03-16 16:01:23 +02:00
Olexandr Nesterenko
660e27f002 fix uk 2020-03-16 13:24:18 +02:00
Olexandr Nesterenko
f23177fddc Update uk 2020-03-16 12:12:14 +02:00
Olexandr Nesterenko
9a529fc40b Fix uk translation 2020-03-16 11:54:37 +02:00
Vanguard
11b6ae58d7
1 new line, 1 changed line
New:
rules.deconstructrefundmultiplier

Changed:
stat.deconstructed
2020-03-16 00:34:58 +03:00
Patrick 'Quezler' Mounier
4f195b72d1
Merge branch 'master' into crater 2020-03-15 22:00:51 +01:00
ma44
ec34e27102
map setting refund (#1709) 2020-03-15 14:02:47 -04:00
Anuken
7e781d9ff8 Bugfixes 2020-03-14 12:29:12 -04:00
laohuaji233
377ac2be90
Update bundle_zh_CN.properties 2020-03-12 22:48:34 +08:00
laohuaji233
9e8dbfdc03
Update bundle_zh_CN.properties 2020-03-12 21:33:26 +08:00
Prosta4okua
7db5d14048
Update bundle_uk_UA.properties 2020-03-12 11:37:54 +02:00
Aldas
680b2bc6b6
Translated launch.skip.confirm line 2020-03-11 12:12:30 +02:00
Vanguard
c4d3c18dda
Merge branch 'master' into master 2020-03-10 05:44:57 +03:00
Vanguard
424514e037
2 new lines
schematic.replace
schematic.exists
2020-03-10 05:39:14 +03:00
Prosta4okua
521f367286
Update bundle_uk_UA.properties 2020-03-09 19:17:32 +02:00
Aldas
b4df9e37d7
Grammar corrections
grammar corrections
2020-03-09 18:39:43 +02:00
Anuken
d7f9090c0b Fixed #1672 2020-03-09 09:41:39 -04:00
Anuken
a02c7989b4 Bugfixes 2020-03-06 16:10:13 -05:00
Patrick 'Quezler' Mounier
bcb87f8f76
Update description accordingly 2020-03-05 12:15:38 +01:00
Patrick 'Quezler' Mounier
e7298702a1
Delete drafts 2020-03-05 10:50:21 +01:00
Patrick 'Quezler' Mounier
b74cf71f40
Come up with a new description 2020-03-05 10:50:08 +01:00
Patrick 'Quezler' Mounier
e5e4884448
Merge branch 'master' into crater
# Conflicts:
#	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/world/modules/ItemModule.java
2020-03-05 10:00:02 +01:00
Anuken
0534a4da45
Update bundle_zh_TW.properties (#1665) 2020-03-04 13:53:54 -05:00
Anuken
31c9b61358
Updated join.info (#1666) 2020-03-04 13:53:47 -05:00
Anuken
c7112a706a
Update bundle_uk_UA.properties (#1636)
* Update bundle_uk_UA.properties

* Update uk metadata

* Update uk bundles

* Update achievemnts
2020-03-04 13:52:20 -05:00
Vanguard
307f9ee297
2 changed lines
link.trello.description
link.feathub.description
2020-03-04 19:51:48 +03:00
Vanguard
1bbdedec72
1 changed line
join.info
2020-03-04 14:59:57 +03:00
Anuken
f1aadd97a8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
# Conflicts:
#	core/src/mindustry/core/Logic.java
#	gradle.properties
2020-03-03 12:12:25 -05:00
Aldas
cdb8682d43
Updated data.import.confirm lane (#1658)
Updated data.import.confirm lane
2020-03-03 10:36:34 -05:00
Aldas
d3b7dd973f
Grammar corrections (#1656)
Grammar and logic corrections
2020-03-02 10:02:56 -05:00
Anuken
f88fe898ff Updated bundle 2020-03-01 21:23:50 -05:00
Lapis+
d93ca520ae
Update bundle_ja.properties (#1578) 2020-03-01 21:09:08 -05:00
Vanguard
cdf8514ac8
RU updates (#1584)
* 1 changed line, 1 removed line

Changed:
keybind.zoom.name

Removed:
keybind.zoom_hold.name

Moved some lines around to keep them in the same order with bundle.properties

* 1 changed line

tutorial.intro

* 3 new lines, 3 changed lines

New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details

* 2 changed lines

mods.guide
mod.import.github

* 1 new line

link.feathub.description

* 1 changed line

item.graphite.description

* 1 changed line

block.mass-driver.description

* 9 new lines, 1 changed line

New:
be.update
be.update.confirm
be.updating
be.ignore
be.noupdates
be.check
server.kicked.serverRestarting
setting.coreselect.name
rules.blockhealthmultiplier

Changed:
wave.enemy

* 3 changed lines

quit.confirm.tutorial
setting.coreselect.name
public.confirm

* 22 changed lines

mod.missing
item.plastanium.name
block.plastanium-wall.name
block.plastanium-wall-large.name
block.plastanium-compressor.name
item.scrap.description
item.spore-pod.description
item.blast-compound.description
liquid.oil.description
unit.revenant.description
block.multi-press.description
block.plastanium-compressor.description
block.spore-press.description
block.power-source.description
block.force-projector.description
block.conveyor.description
block.mass-driver.description
block.liquid-junction.description
block.phase-conduit.description
block.thorium-reactor.description
block.blast-drill.description
block.cyclone.description

* 3 new lines, 2 removed lines

New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description

Removed:
block.signal
block.editsignal

* 1 new line

data.openfolder

* 1 changed line

block.cryofluidmixer.description

* 2 new lines

block.underflow-gate.name
block.underflow-gate.description

* 2 changed lines

unit.thousands
unit.millions

* 3 new lines

blocks.tiles
blocks.affinities
setting.playerlimit.name

* 1 changed line

block.underflow-gate.name

* 1 changed line

unit.thousands

* 1 changed line

blocks.affinities

* 1 changed line (reverted)

unit.thousands

* Update bundle_ru.properties

* 1 new line

mod.display

* 1 changed line

techtree

* 1 changed line (new approach)

techtree

* 1 changed line

editor.generate

* 1 new line

stat.playtime

* 3 new lines

servers.local
servers.remote
servers.global

* 3 changed lines

servers.local
servers.remote
servers.global

* 1 changed line

setting.pixelate.name

* 1 line removed

schematic.replace

* 1 new line

rules.solarpowermultiplier

* 2 changed lines

unit.thousands
unit.millions

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
2020-03-01 21:06:16 -05:00
Dexapnow
62c7b5f691
Update bundle_pl.properties (#1643) 2020-03-01 21:04:07 -05:00
AmateurPotion
a6ddb1d187
Update bundle_ko.properties (#1629) 2020-03-01 21:03:41 -05:00
StarMiner99
4c28c30228
[Lang] Changed some nl Translations (#1626)
* fixed translations till line 180

fixed nl translations

* Fixed most nl translations

* small fixes

suggested by Quezler
2020-03-01 21:03:00 -05:00
Anuken
c6fc103bff Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 2020-03-01 12:55:51 -05:00
Prosta4okua
057f3aead7
Update bundle_uk_UA.properties (#1644) 2020-02-29 21:46:38 -05:00
Aldas
bcc901b3ef
Add bundle_lt.properties for lithuanian translation (#1650)
* Create bundle_lt.properties file

Translated first 480 lines. Soon other half will be translated

* Update bundle_lt.properties

* Update bundle_lt.properties

* Update bundle_lt.properties

* Update bundle_lt.properties

* Update bundle_lt.properties
2020-02-29 09:02:45 -05:00
Anuken
04f8282821 Better lighting 2020-02-28 13:44:03 -05:00
Anuken
1e53ea50b0 Added support for export/import of all basic terrain as image 2020-02-26 19:37:22 -05:00
xaumex
c361e5c26d
Update Silicon translation in spanish (#1639)
Silicone (en) = Silicona (es)
Silicon (en) = Silicio (es)
2020-02-26 11:01:56 -05:00
Ali-C-Ila
251877f561
Update bundle_zh_TW.properties (#1579)
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
2020-02-24 11:46:20 -05:00
Anuken
cfbe631e66 Merge 2020-02-23 20:14:38 -05:00
soytheLB
c989504bf6
Update bundle_es.properties (#1624)
Corrected some misspellings.
Added warning text in router.
Changed description of alloy smelter to keep with the translated name of surge alloy.
Added a missed dot from my previous translation.
2020-02-23 10:44:09 -05:00
Vanguard
5735fba4c7
2 changed lines
unit.thousands
unit.millions
2020-02-22 20:21:05 +03:00
GioIacca9
47618ac21f
Translated #1593 (#1621) 2020-02-22 10:33:22 -05:00
Patrick 'Quezler' Mounier
f891c42847
Remove bundle key space (#1619) 2020-02-22 08:43:54 -05:00
Vanguard
2fc17fea2a
1 new line
rules.solarpowermultiplier
2020-02-22 04:04:53 +03:00
Petr Gašparík
0a98597ad0
Czech translation - sync with v104 (#1612)
* Czech translation - sync with changes

* Czech translation - sync with updates

* Czech translation - small fix
2020-02-21 16:27:05 -05:00
DeltaNedas
fe22d334dc
Separate ambient light and solar panel efficiency (#1593)
* new branch

* Separate ambient light and solar panel efficiency

* Made ambient light -> solar efficiency default
2020-02-21 11:38:56 -05:00
Dexapnow
23e4d1dd84
Update bundle_pl.properties 2020-02-20 14:05:38 +01:00
Dexapnow
3bb4820e79
Update bundle_pl.properties
Some things just were confusing
2020-02-20 09:46:37 +01:00
Anuken
32dcae8fd3
Update bundle.properties 2020-02-19 13:49:40 -05:00
Anuken
1d1c73fd6f Merge 2020-02-19 13:10:25 -05:00
Vanguard
10732ccb5a
1 line removed
schematic.replace
2020-02-19 15:33:53 +03:00
Anuken
4a55dde5ee Bugfixes 2020-02-18 19:54:35 -05:00
Anuken
711faa6e2a
Merge pull request #1597 from GioIacca9/patch-3
Update block.pyratite-mixer.description
2020-02-18 11:51:37 -05:00
Anuken
a655e18b87 Merge remote-tracking branch 'origin/master' 2020-02-18 11:35:36 -05:00
Anuken
2038409283 Removed schematic replacement dialog 2020-02-18 11:35:28 -05:00
Anuken
8b14219bab
Merge pull request #1583 from Prosta4okua/patch-9
6.0
2020-02-18 10:39:22 -05:00
Anuken
d9ae8e5a28
Merge pull request #1571 from artur309/master
Added new lines and some small translation.s
2020-02-18 10:32:30 -05:00
Anuken
507f553295
Merge pull request #1592 from QmelZ/patch-1
Translation to Turkish
2020-02-18 10:32:08 -05:00
Anuken
08509dafb1
Merge pull request #1573 from soytheLB/patch-2
Update bundle_es to version #149465
2020-02-18 10:31:46 -05:00
GioIacca9
f650963cf4
Update block.pyratite-mixer.description 2020-02-16 19:06:50 +01:00
Andreas Gamborg
35c130c4ff
Create bundle_da.properties
Added file for danish translated.
I have translated the first 200 lines.
2020-02-16 16:42:39 +01:00
QmelZ
47f63dd006
Translation to Turkish
I translated all the default ones left, fully finished.
2020-02-15 15:15:27 +02:00
Prosta4okua
ff74a212c5
Update bundle_uk_UA.properties 2020-02-14 12:38:58 +02:00
Prosta4okua
a4d42ea22c
6.0 2020-02-14 12:35:17 +02:00
Vanguard
fc46708677
1 changed line
setting.pixelate.name
2020-02-14 03:24:27 +03:00
Anuken
47f075133f Merge 2020-02-13 11:22:29 -05:00
Anuken
0678f54e25 Fixed bloom darkening sprites / Changed pixelate desc 2020-02-13 10:17:43 -05:00
laohuaji233
93de060ad5
Update bundle_zh_CN.properties 2020-02-13 14:56:46 +08:00
soytheLB
c5fcc30422
Update bundle_es to version #149465
Added translation to the following:
 Line 62 stat.playtime
Line 108 mod. display
Line 176 servers.local
Line 177 servers.remote
Line 178 servers.global
line 261 data.open.folder
Line 542 block.tiles
Line 543 block.afinities
Line 678 Player.limit
Line 681 bridge.opacity
Changed cancel building from "impiar" to "limpiar"
Changed Lich unit name to "Exánime".
Translated name for scatter turret.
Changed wave name from "Horda" to "Ola". (Horda reffers to enemy waves while ola means sea waves)
Changed name swarmer from "enjambredor" to "enjambre".
changed turrets description to be closer to the english version.
Changed factories descriptions to be closer to english version
2020-02-12 23:46:27 -03:00
Artur Quaresma
97355263df Added new lines and some small translation.s
I added new lines and some small transaltions that was missing.
2020-02-12 21:09:58 +00:00
Anuken
6fd0205495 Merge 2020-02-11 19:55:02 -05:00
Alexander H
68e403557a
translated; spelling errors, odd phrases removed
I've gone through the German translation file looking for missing translations, which I provided, as well as spelling errors and odd phrases, which I continued to remove. I also replaced every [LIGHT_GRAY] tag with [lightgray] for uniformity.
2020-02-12 01:46:13 +01:00
Anuken
aafecfebbb
Merge pull request #1468 from Prosta4okua/patch-7
Update bundle_uk_UA.properties
2020-02-11 15:45:12 -05:00
Anuken
de9a14c903
Czech translation for 103.x changelog (#1455)
* Czech translation for 103.x changelog

* Czech translation - mod display

* Czech translation - fix typos

* Czech: added Time played + small format corr.

* Czech for server categories!
2020-02-11 15:40:33 -05:00
Ali-C-Ila
5ab47f4fe0
Update bundle_zh_TW.properties (#1454)
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
2020-02-11 15:40:24 -05:00
Vanguard
435860eda4
RU updates (#1442)
* 1 changed line, 1 removed line

Changed:
keybind.zoom.name

Removed:
keybind.zoom_hold.name

Moved some lines around to keep them in the same order with bundle.properties

* 1 changed line

tutorial.intro

* 3 new lines, 3 changed lines

New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details

* 2 changed lines

mods.guide
mod.import.github

* 1 new line

link.feathub.description

* 1 changed line

item.graphite.description

* 1 changed line

block.mass-driver.description

* 9 new lines, 1 changed line

New:
be.update
be.update.confirm
be.updating
be.ignore
be.noupdates
be.check
server.kicked.serverRestarting
setting.coreselect.name
rules.blockhealthmultiplier

Changed:
wave.enemy

* 3 changed lines

quit.confirm.tutorial
setting.coreselect.name
public.confirm

* 22 changed lines

mod.missing
item.plastanium.name
block.plastanium-wall.name
block.plastanium-wall-large.name
block.plastanium-compressor.name
item.scrap.description
item.spore-pod.description
item.blast-compound.description
liquid.oil.description
unit.revenant.description
block.multi-press.description
block.plastanium-compressor.description
block.spore-press.description
block.power-source.description
block.force-projector.description
block.conveyor.description
block.mass-driver.description
block.liquid-junction.description
block.phase-conduit.description
block.thorium-reactor.description
block.blast-drill.description
block.cyclone.description

* 3 new lines, 2 removed lines

New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description

Removed:
block.signal
block.editsignal

* 1 new line

data.openfolder

* 1 changed line

block.cryofluidmixer.description

* 2 new lines

block.underflow-gate.name
block.underflow-gate.description

* 2 changed lines

unit.thousands
unit.millions

* 3 new lines

blocks.tiles
blocks.affinities
setting.playerlimit.name

* 1 changed line

block.underflow-gate.name

* 1 changed line

unit.thousands

* 1 changed line

blocks.affinities

* 1 changed line (reverted)

unit.thousands

* Update bundle_ru.properties

* 1 new line

mod.display

* 1 changed line

techtree

* 1 changed line (new approach)

techtree

* 1 changed line

editor.generate

* 1 new line

stat.playtime

* 3 new lines

servers.local
servers.remote
servers.global

* 3 changed lines

servers.local
servers.remote
servers.global

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
2020-02-11 15:40:17 -05:00
AmateurPotion
5611a8684c
Update bundle_ko.properties (#1490)
* Update bundle_ko.properties

Finish! yeeeee!

* Update bundle_ko.properties
2020-02-11 15:33:25 -05:00
LauweJoster
f06550fc3c
Update bundle_nl.properties (#1501)
Grammar and sentence improvements. Also added translations
2020-02-11 15:32:18 -05:00
Ali-C-Ila
652c143ff6
Update bundle_zh_TW.properties (#1519) 2020-02-11 15:25:53 -05:00
Rasangus
64ade54336
Update bundle_pt_BR.properties (#1525) 2020-02-11 15:25:38 -05:00
Petr Gašparík
29a6b1a8da Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-11 11:18:54 +01:00
Patrick 'Quezler' Mounier
562fa07755
Merge branch 'master' into crater 2020-02-10 12:09:14 +01:00
GioIacca9
941449c502 Updated "Full implementation of #1494" (#1541) 2020-02-09 22:26:47 -05:00
Anuken
a2706a80b1 Merged with master 2020-02-09 12:27:44 -05:00
Prosta4okua
0a53c4c1be Update bundle_uk_UA.properties 2020-02-08 12:26:09 +02:00
Prosta4okua
d7eb0d3ba3 Update bundle_uk_UA.properties 2020-02-08 12:23:50 +02:00
Anuken
c8455ddbc8 Added message for non-building units 2020-02-07 21:56:55 -05:00
valtsu41
9b36125b0c
Finnish translation & grammar update (#1473)
* Finnish translation & grammar update

* More grammar correcting and making things more native

* Just a little more fine-tuning

* Fixes
2020-02-07 20:42:14 -05:00
Petr Gašparík
e98808bc46 Czech for server categories! 2020-02-07 12:35:09 +01:00
Petr Gašparík
bc37415a10 Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-07 12:32:33 +01:00
Prosta4okua
619b2ba897
Update bundle_uk_UA.properties 2020-02-07 12:42:59 +02:00
Prosta4okua
59431b223b
Update bundle_uk_UA.properties 2020-02-06 23:38:45 +02:00
Patrick 'Quezler' Mounier
99d1a2829f
Merge branch 'master' into crater 2020-02-06 19:33:57 +01:00
Vanguard
9b30b452a1
3 changed lines
servers.local
servers.remote
servers.global
2020-02-06 03:39:32 +03:00
Vanguard
c254a702fc
3 new lines
servers.local
servers.remote
servers.global
2020-02-06 03:34:19 +03:00
Anuken
4a2c6c571f Merge remote-tracking branch 'origin/master' 2020-02-05 19:02:02 -05:00
Anuken
a5fd881f8d Full implementation of #1494 2020-02-05 19:01:53 -05:00
martin-mfg
d59b23b835
bundle_de.properties: merge PRs + further improvements (#1482)
* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* add minor missing changes from discussion in #799

* fix duplicated text in german translation (configure.locked)

* apply German translation suggestions from PR comment

This commit applies suggestions from the comment at https://github.com/Anuken/Mindustry/pull/783#pullrequestreview-299643677

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Silvério Santos <ssantos@web.de>
2020-02-05 18:37:21 -05:00
Patrick 'Quezler' Mounier
e06d8eabec
[formatting] add newline to file(s) (#1508)
* Trail appropriate files with a new line

* For some ironic reason it ignored itself

Probably because it wasn’t tracked/commited yet.

* Rename newlines to server executable naming pattern
2020-02-05 18:36:56 -05:00
Anuken
f6b1420103 c l e a n u p 2020-02-05 18:28:19 -05:00
Patrick 'Quezler' Mounier
05ccdfd51b
Merge branch 'master' into crater
# Conflicts:
#	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/world/modules/ItemModule.java
2020-02-05 10:26:34 +01:00
Petr Gašparík
39b35dd9cb Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-05 08:34:59 +01:00
Anuken
be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl
# Conflicts:
#	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/Vars.java
#	core/src/mindustry/entities/traits/SaveTrait.java
#	core/src/mindustry/maps/generators/MapGenerator.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/world/blocks/Floor.java
#	desktop/src/mindustry/desktop/DesktopLauncher.java
#	gradle.properties
2020-02-04 12:25:18 -05:00
GioIacca9
b4be655d0c
Translated stat.playtime (#1485) 2020-02-03 12:54:06 -05:00
LauweJoster
19da1e1306
Update bundle_nl.properties (#1499)
Improved some grammar and sentencing. Also added a few translations.
2020-02-03 12:37:28 -05:00
Anuken
f2f31120a0 Gradual component conversion 2020-02-02 20:17:22 -05:00
Vanguard
6aed5f081c
1 new line
stat.playtime
2020-02-01 04:21:50 +03:00
Petr Gašparík
b4e9e6be32 Czech: added Time played + small format corr. 2020-01-31 13:16:27 +01:00
Petr Gašparík
737e3145ec Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-01-31 13:13:51 +01:00
Anuken
2721aa550d Implemented #1444 2020-01-30 22:56:17 -05:00
Vanguard
91d1abf1e9
1 changed line
editor.generate
2020-01-30 04:17:46 +03:00
Prosta4okua
6a48a1e0a3
Update bundle_uk_UA.properties 2020-01-29 01:12:12 +02:00
Prosta4okua
d0faecbea5
Update bundle_uk_UA.properties 2020-01-29 01:07:24 +02:00
Anuken
ad6e0bcd0f Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework
# Conflicts:
#	android/src/mindustry/android/AndroidLauncher.java
#	annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
#	annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java
#	build.gradle
#	core/assets-raw/fontgen/config.json
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/fonts/font.ttf
#	core/assets/fonts/icon.ttf
#	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/UnitTypes.java
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/core/NetServer.java
#	core/src/mindustry/entities/bullet/BulletType.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/maps/filters/FilterOption.java
#	core/src/mindustry/mod/Scripts.java
#	core/src/mindustry/ui/Fonts.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/ui/fragments/HudFragment.java
#	core/src/mindustry/ui/fragments/MenuFragment.java
#	core/src/mindustry/world/blocks/production/Cultivator.java
#	core/src/mindustry/world/blocks/units/CommandCenter.java
#	gradle.properties
#	tools/src/mindustry/tools/FontGenerator.java
2020-01-27 15:51:02 -05:00
Patrick 'Quezler' Mounier
8edcebd3a6
Undo moving other bundle keys into their place
Should be a different commit/pull
2020-01-27 19:42:27 +01:00