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

272 Commits

Author SHA1 Message Date
Epowerj
4812ff47c0 Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 2022-07-11 18:39:06 -04:00
Github Actions
9d4839b26d Automatic bundle update 2022-07-11 22:19:30 +00:00
Github Actions
a7db6d86ff Automatic bundle update 2022-07-11 21:16:23 +00:00
Epowerj
9413a399cd Merge branch 'master' of https://github.com/Anuken/Mindustry into maps 
 Conflicts:
	core/assets/bundles/bundle_fi.properties
	core/assets/bundles/bundle_th.properties
 2022-07-11 17:14:39 -04:00
Github Actions
788e63cf28 Automatic bundle update 2022-07-11 18:39:05 +00:00
Github Actions
cbc4c0d3b2 Automatic bundle update 2022-07-09 04:34:18 +00:00
Github Actions
0182e61803 Automatic bundle update 2022-07-07 21:04:47 +00:00
1stvaliduser
bfd41c34a4 Update bundle_uk_UA.properties (#7138) 
* Update bundle_uk_UA.properties

Yesn't

* Update bundle_uk_UA.properties

Yay new update)
 2022-07-06 22:09:27 -04:00
Github Actions
5ea8538e0f Automatic bundle update 2022-07-07 01:29:48 +00:00
Github Actions
5e45b64ee1 Automatic bundle update 2022-07-06 17:00:37 +00:00
Github Actions
85321d7465 Automatic bundle update 2022-07-05 22:42:07 +00:00
1stvaliduser
64dc854bdd Update bundle_uk_UA.properties(small changes) (#7118) 
* Update bundle_uk_UA.properties

A lot of stuff

* :)

* Update bundle_uk_UA.properties

Small changes

* Update bundle_uk_UA.properties

Oops

* Update bundle_uk_UA.properties
 2022-07-03 14:17:52 -04:00
Github Actions
97d077df84 Automatic bundle update 2022-07-01 16:52:44 +00:00
1stvaliduser
d4bd6796fc Update bundle_uk_UA.properties) (#7102) 
* Update bundle_uk_UA.properties

A lot of stuff

* :)
 2022-07-01 11:48:24 -04:00
Github Actions
261714d395 Automatic bundle update 2022-06-30 03:04:25 +00:00
Github Actions
82b3bd7520 Automatic bundle update 2022-06-29 22:51:22 +00:00
Github Actions
8f0b8c1277 Automatic bundle update 2022-06-27 13:57:57 +00:00
Github Actions
0698c5dd8f Automatic bundle update 2022-06-26 15:52:10 +00:00
Github Actions
6f3c91c241 Automatic bundle update 2022-06-25 13:08:30 +00:00
Github Actions
8b66107833 Automatic bundle update 2022-06-24 00:58:28 +00:00
Github Actions
2f45ec7c90 Automatic bundle update 2022-06-20 23:37:58 +00:00
Github Actions
3137ec09e3 Automatic bundle update 2022-06-19 14:58:55 +00:00
1stvaliduser
a30f6325d4 bundle_uk_UA.properties(corrections) (#7045) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2022-06-19 09:14:00 -04:00
Github Actions
8f8ffd1aeb Automatic bundle update 2022-06-18 14:16:59 +00:00
Prosta4okua
54eabee103 Update bundle_uk_UA.properties (#7042) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2022-06-18 10:15:56 -04:00
Github Actions
58e274b29f Automatic bundle update 2022-06-17 22:20:30 +00:00
Github Actions
6db20908b3 Automatic bundle update 2022-06-16 19:35:33 +00:00
Github Actions
22c5002931 Automatic bundle update 2022-06-14 01:10:07 +00:00
Github Actions
5ccc7d44db Automatic bundle update 2022-06-08 14:36:04 +00:00
Github Actions
642f1f74af Automatic bundle update 2022-06-08 13:21:24 +00:00
Github Actions
17bb8738cc Automatic bundle update 2022-06-08 13:06:22 +00:00
Github Actions
91643d94c4 Automatic bundle update 2022-06-08 12:58:35 +00:00
Github Actions
1a07b1514f Automatic bundle update 2022-05-09 21:42:41 +00:00
Github Actions
e69aa6bf49 Automatic bundle update 2022-05-08 16:46:41 +00:00
Github Actions
f5ef01f01e Automatic bundle update 2022-05-08 13:30:05 +00:00
Github Actions
043cd7f5be Automatic bundle update 2022-05-07 04:31:11 +00:00
Github Actions
88821befe6 Automatic bundle update 2022-05-07 00:35:16 +00:00
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