Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,705 Commits 4 Branches 180 Tags
0182e618035cb566b163f70342a2faefe8c18731
Commit Graph
190 Commits
Author SHA1 Message Date
Github Actions 0182e61803 Automatic bundle update 2022-07-07 21:04:47 +00: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
Github Actions 97d077df84 Automatic bundle update 2022-07-01 16:52:44 +00: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
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
end-me-pleaseandGitHub 9b8a09892a Update bundle_de.properties (#6768) 
aHR0cHM6Ly9pLmltZ3VyLmNvbS9NSG1kV0plLnBuZw==
 2022-05-10 18:58:36 -04: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 b40957e28b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/JoinDialog.java
 2022-04-20 14:16:20 -04:00
end-me-pleaseandGitHub cfafc9cc8a Update bundle_de.properties (#6708) 2022-04-14 12:48:50 -04:00
Anuken 9242ae1ecb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2022-03-09 11:42:18 -05:00
Otto Richter (fnetX)andGitHub 6ea4570ae8 Update German translations (#6619) 2022-03-04 17:20:46 -05:00
Anuken 45b81fae37 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-12-21 10:39:49 -05:00
KuhnChrisandGitHub 4b6541ae4e Update missing "core launch animation skip" in german translation file (bundle_de) (#6430) 
* Update settings file (bundle_de)

* Update bundle_de.properties
 2021-12-14 12:52:26 -05:00
Anuken f214f38f08 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-11-25 13:29:51 -05:00
CatchearsGitHubAnuken
 		c24c5c6196 update german translation (#6354) 
Co-authored-by: Anuken <arnukren@gmail.com>
 2021-11-25 12:09:16 -05:00
KuhnChrisandGitHub cd0fbb4d81 (german translation) add missing liquid-container (#6353) 
* (german translation) add missing liquid-container

For some reason the liquid container has been missing in the translation file (at all)

* Update bundle_de.properties

Reorder and remove duplicate entry for description

* Update bundle_de.properties

bblock=>block

* Update bundle_de.properties

* Update bundle_de.properties

Plural->Singular, making sure tanks only store 1 kind of liquid.
 2021-11-25 12:07:50 -05: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 0dc8c6cd25 Updated bundles 2021-11-20 15:06:14 -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
CatchearsandGitHub 15396b6032 update german translation (#6085) 
* update german translation to https://github.com/Anuken/Mindustry/commit/30e6bb2625f7201c710f5a532da2610f04431645

* typo
 2021-10-27 11:38:03 -04:00
itsragedevandGitHub d5babe88e3 Update bundle_de.properties (#6150) 
Changing some strings to match the original a little more.
 2021-10-14 11:38:25 -04:00
SoMall-dumplingandGitHub 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
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
CatchearsandGitHub 2f71a4092f german v7 update (#5631) 2021-07-28 10:45:15 -04:00
CatchearsandGitHub ebd444cc5f final v7 german translation (#5473) 2021-06-25 16:57:20 -04:00
CatchearsandGitHub 8c1702cff5 Initial german translation for v7 (#5394) 
* initial v7 translations

* forgot unsupported.environment

* resolve the duct issues
 2021-06-08 10:20:00 -04:00