Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,142 Commits 4 Branches 180 Tags
8b9eb0b466d285fc2d64ac4112e2fdfde2186146
Commit Graph

235 Commits

Author SHA1 Message Date
Anuken
a48911b983 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/assets/bundles/bundle_zh_CN.properties
	core/assets/bundles/bundle_zh_TW.properties
 2021-11-22 12:11:31 -05:00
Anuken
521b0e1ec4 Automatic bundle update 2021-11-22 11:50:28 -05:00
Anuken
c8397c9d10 Reverting bundle update (see description) 
The bundle updater removed quite a lot of comments and extra details. I will be rewriting the bundle launcher to fix this.
 2021-11-22 10:31:01 -05:00
Anuken
65f36faf71 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/bundles/bundle_ko.properties
	core/src/mindustry/type/UnitType.java
 2021-11-22 10:12:48 -05:00
Anuken
77fb5a9a24 conflict 2021-11-20 15:07:07 -05:00
Prosta4okua
0e8a677ecc Update bundle_uk_UA.properties (#6290) 
* Update bundle_uk_UA.properties

Атака -> Наступ

* Update bundle_uk_UA.properties

конструкції->споруди

* Update bundle_uk_UA.properties

* Приголомшлює -> електризує

* Small fixes

→ -> "->"
елемент -> предмет
Оксино -> Оксиноя, better spelling

* Update bundle_uk_UA.properties
 2021-11-20 15:05:46 -05:00
Anuken
82eb3a9159 Alloy smelter rename / WIP block ideas 2021-11-16 22:37:13 -05:00
Anuken
486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
Prosta4okua
144731bfb0 Update bundle_uk_UA.properties (#6213) 2021-10-27 11:25:48 -04:00
Prosta4okua
ea3802bfc7 Update bundle_uk_UA.properties (#6180) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2021-10-17 15:23:50 -04:00
SoMall-dumpling
3bd3d3aa37 Avoid ambiguity (#5809) 
* Avoid ambiguity

When you see 'boost: 150%'
It can be 'increase the speed to 150%' or 'increase the speed to 250%'.
Maybe you will say that the colon has already avoided this ambiguity.
But you know there's always someone who ignores those things, and also translating 'boost' is hard with no 'x' to avoid ambiguity.
With a 'x', it will show 'Boost: x150%', which will never be thought as 250%.

* Update OverdriveProjector.java

When power is low, show 'low power: -{0}%';
When power is high, show 'boost: +{0}%'.

* Update bundle.properties

* Update bundle.properties

* Update OverdriveProjector.java

bugfix（perhaps）

* Update OverdriveProjector.java

what if

* Update OverdriveProjector.java

InTeReStInG

* Update OverdriveProjector.java

back to the past

* Update OverdriveProjector.java

Now using Math.max.

* Update bundle_bg.properties

* Update bundle_de.properties

* Update bundle_fr.properties

* Update bundle_hu.properties

* Update bundle_in_ID.properties

* Update bundle_ja.properties

* Update bundle_ko.properties

* Update bundle_pl.properties

* Update bundle_ro.properties

* Update bundle_ru.properties

* Update bundle_th.properties

* Update bundle_uk_UA.properties

* Update bundle_vi.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_TW.properties

* Update OverdriveProjector.java

Maybe this is necessary.

* Update OverdriveProjector.java

The stats are '+50%' ,etc. now.

* Update OverdriveProjector.java

Necessary, because the previous one is strange.
2.5 does not make sense. 12.5 does.
 2021-08-23 12:37:34 -04:00
Prosta4okua
fa9573e6dc [UKR] Translation (#5810) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2021-08-23 12:27:17 -04:00
Anuken
7e047ef726 Stone craters name fix 2021-08-09 12:13:07 -04:00
Anuken
b80129e17b Improved environmental block internal names 2021-08-06 11:52:25 -04:00
Prosta4okua
59aff44a55 Update bundle_uk_UA.properties (#5540) 2021-07-28 16:58:06 -04:00
MEEP of Faith
3910d7769b Add space to bullet.lightning (#5136) 2021-04-22 11:11:08 -04:00
Prosta4okua
2f3fd9de3b [Bundle][uk_UA] Update Ukrainian (#4868) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

03.06.2021

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2021-03-28 18:42:41 -04:00
Prosta4okua
668144cf2a [Bundle]Update bundle_uk_UA.properties (#4434) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2021-02-07 12:32:57 -05:00
Anuken
91692f362f Mod browser cleanup 2020-12-17 21:17:55 -05:00
Prosta4okua
21c97571e0 Update bundle_uk_UA.properties 2020-12-06 00:45:30 +02:00
Prosta4okua
8e92be9037 Update bundle_uk_UA.properties 2020-12-06 00:42:18 +02:00
Prosta4okua
0553cafbe9 Update bundle_uk_UA.properties 2020-12-01 03:04:30 +02:00
Prosta4okua
9d78459d7d Підготовка до виходу 6.0 ч.1 2020-12-01 02:31:46 +02:00
Prosta4okua
06faa368cc Update bundle_uk_UA.properties 2020-11-29 14:06:41 +02:00
Prosta4okua
949ad79ade Update bundle_uk_UA.properties 2020-11-17 20:48:01 +02:00
Prosta4okua
daabdf486f Update bundle_uk_UA.properties 2020-11-17 20:40:27 +02:00
Prosta4okua
8b50bb68e7 Update bundle_uk_UA.properties 2020-11-17 20:33:05 +02:00
Prosta4okua
bd654fda76 Update bundle_uk_UA.properties 2020-11-17 20:29:26 +02:00
Prosta4okua
4a25063a29 Update bundle_uk_UA.properties 2020-11-14 15:50:53 +02:00
Prosta4okua
6b2ba8b432 Update bundle_uk_UA.properties 2020-11-14 15:48:59 +02:00
Prosta4okua
6753ab7c6e Update bundle_uk_UA.properties 2020-11-14 15:33:53 +02:00
Prosta4okua
ea41e38706 Оновлення 
Залишилось перевіти десь зо 30 рядків
 2020-11-13 23:59:24 +02:00
Prosta4okua
c263a1e52f Добридень 2020-11-11 21:58:39 +02:00
Prosta4okua
ab947c4fe7 Update bundle_uk_UA.properties 2020-10-31 02:25:38 +02:00
Prosta4okua
a644b64c1c Update bundle_uk_UA.properties 2020-10-27 21:55:22 +02:00
Prosta4okua
d84f2e1993 27.10.2020 2020-10-27 19:54:50 +02:00
Prosta4okua
3d47389a39 Update bundle_uk_UA.properties 2020-10-25 11:19:09 +02:00
Anuken
f81f4ded03 Updated bundles 2020-10-23 11:52:01 -04:00
Anuken
3d46ed580e Merge branch 'master' into patch-7 2020-10-23 09:35:13 -04:00
Anuken
2ff749bd17 Unified stat system 2020-10-19 11:34:52 -04:00
Prosta4okua
a8f45b464c Update bundle_uk_UA.properties 2020-10-16 18:57:13 +03:00
Prosta4okua
592708811b Update bundle_uk_UA.properties 2020-10-14 14:54:21 +03:00
Anuken
41c08a64e2 Merge pull request #2724 from Prosta4okua/patch-6 
Ukrainian localisation
 2020-10-13 18:07:35 -04:00
Leonwang4234
14156c1ce7 "cryofluidmixer" to "cryofluid-mixer"fl 2020-09-30 17:54:50 -07:00
Prosta4okua
52a610a957 Update bundle_uk_UA.properties 2020-09-25 14:13:06 +03:00
Prosta4okua
13ff69cbca Update bundle_uk_UA.properties 2020-09-25 14:10:55 +03:00
Anuken
28b7ef53bb Updated bundle contents 2020-09-23 18:28:25 -04:00
Félix Córvus
e907d1a23f Updating bundles 2020-09-20 16:43:15 +03:00
Prosta4okua
7e2b3a6e2d Ukrainian translation (#2492) 
* Український переклад :flag_ua:

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Оновлення перекладу до стану 10.09.2020

* Update bundle_uk_UA.properties

* Оновлення на 15.09.2020

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2020-09-15 18:21:11 -04:00
Anuken
aec4a07aec Fixed steam-generator bundle name 2020-09-10 10:29:54 -04:00