mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-04 16:09:23 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,522 Commits 4 Branches 160 Tags 2.4 GiB
2a7da8c80e
Commit Graph

1836 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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