mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 07:07:03 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,731 Commits 4 Branches 160 Tags 2.1 GiB
f163601262
Commit Graph

1717 Commits

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