Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,464 Commits 4 Branches 180 Tags
6c44f506fc1dd84d6392092645adee366bd15c55
Commit Graph
160 Commits
Author SHA1 Message Date
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
MEEP of FaithandGitHub 3910d7769b Add space to bullet.lightning (#5136) 2021-04-22 11:11:08 -04:00
CatchearsandGitHub d04eaa81e0 german translation (#4897) 
* update german translation to https://github.com/Anuken/Mindustry/commit/b75a8d52606b8cf5e6b554844e5fad4ddd3c556b

* update german translation to https://github.com/Anuken/Mindustry/commit/8e52d8a2729727bf145aa816846aeace2bfd5458

* foreshadow improvements

* block info keybind
 2021-03-28 18:41:06 -04:00
CatchearsandGitHub 39cbd607ef update german translation (#4826) 
* update german translation to 781410ea04

* change from stuffyAI

* update german translation to https://github.com/Anuken/Mindustry/commit/ae838b939236271dc6b54532e3d62e82372a6270
 2021-03-05 11:29:18 -05:00
CatchearsGitHubstuffyAI
 		1613f49c16 german translation for build 125, full android translation (#4703) 
* update german translation to https://github.com/Anuken/Mindustry/commit/631e4d9eefca8b94de4fc52e57387b2c2f4ffecf

* update android translation to https://github.com/Anuken/Mindustry/commit/e816f6110de6ec9638b5a6be8a9710bdc49f5f4d

with regard to https://github.com/Anuken/Mindustry/commit/5ec5f1aa93dcac5c813027b23379f529dbf69e3d

* improve translation with ideas from others

* update german steam discription to https://github.com/Anuken/Mindustry/commit/e86a3e9d09d0f41a651d5e66403ea48c70add048

* update german translation to https://github.com/Anuken/Mindustry/commit/1ef7ae70796beb4a28dee8f2c74b626d28348481#diff-5e346bcec4e8e1d545e035b1e438472bc51937398ac3e8e81308605ec82aea2c

* changes from stuffyAI

* cross-platform as suggested by stuffyAI

* stuffyAI

genau, hast recht

Co-authored-by: stuffyAI <59014072+stuffyAI@users.noreply.github.com>

Co-authored-by: stuffyAI <59014072+stuffyAI@users.noreply.github.com>
 2021-02-19 18:32:44 -05:00
CatchearsandGitHub aef0faf79c update german translation to include logic hints (#4654) 
* update german bundle to "force projector heat issues"

https://github.com/Anuken/Mindustry/commit/ea2b57ec4b4ef47847fca6870802655d18b1a8cd
ea2b57ec4b

* Gebäude -> Block to prevent confusion
 2021-02-11 10:01:03 -05:00
CatchearsandGitHub 10c1305eae update german translation for build 124 (#4618) 
* update german translation for build 124

* shorten text to fit on the button without newline
 2021-02-07 17:16:56 -05:00
CatchearsandGitHub 035d7fed77 update german bundle (#4218) 2021-01-01 13:50:30 -05:00
CatchearsandGitHub e17bcd6a01 fix german translation for editor.unsaved (#4169) 2020-12-29 10:40:29 -05:00
Anuken 06f832bfae Merge remote-tracking branch 'origin/master' 2020-12-23 12:21:41 -05:00
CatchearsandGitHub c92f662994 german translation (#3726) 
* german achievement translation

* typo

* change from Ordoviz

* typos

* duzen statt siezen

* update bundle
 2020-12-23 12:10:35 -05:00
Anuken 91692f362f Mod browser cleanup 2020-12-17 21:17:55 -05:00
Lennard Hofmann 5ec5f1aa93 Improve German translation 2020-12-08 17:09:37 +01:00
Wiki Updater 7a81fde64e changes from Shawak 2020-11-28 14:36:55 +01:00
Wiki Updater 1d8fbf7aa9 final changes 2020-11-28 10:50:35 +01:00
Wiki Updater 525643cb17 unit descriptions 2020-11-27 23:10:58 +01:00
Wiki Updater 4fbfb50380 more translations 2020-11-27 21:43:58 +01:00
Wiki Updater ed89a70cbc hints + sector descriptions in german 2020-11-26 21:39:14 +01:00
Wiki Updater 35da950986 german translation 2020-11-26 16:41:46 +01:00
Wiki Updater 7fa9902ee7 änderungen von Ansraer 2020-10-27 19:05:37 +01:00
Wiki Updater 1d4da170ef änderungen von shawak 2020-10-25 14:22:36 +01:00
Wiki Updater 280f0d6e21 Improve german translation for v6 2020-10-24 09:20:57 +02:00
Anuken f81f4ded03 Updated bundles 2020-10-23 11:52:01 -04:00
Anuken 2ff749bd17 Unified stat system 2020-10-19 11:34:52 -04:00
Leonwang4234 14156c1ce7 "cryofluidmixer" to "cryofluid-mixer"fl 2020-09-30 17:54:50 -07:00
Anuken 28b7ef53bb Updated bundle contents 2020-09-23 18:28:25 -04:00
Anuken aec4a07aec Fixed steam-generator bundle name 2020-09-10 10:29:54 -04:00
Anuken 3b5d6860d6 Bugfixes 2020-09-09 23:39:00 -04:00
Anuken b9ff4ba9c5 Bugfixes 2020-08-20 16:21:40 -04:00
Wiki Updater 4df0393e00 Add german translation 2020-08-07 17:19:24 +02:00
Anuken 42d7eb4e05 Bugfixes 2020-07-25 19:08:25 -04:00