Commit Graph

116 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
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
YellOw139
71e38862b9
[Bundle][RO] Update (#5848)
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 254284760f
- Typo fixes & various other improvements

* Update full_description.txt

* Update full_description.txt

* killing confusion

* Update bundle_ro.properties

* deep-tainted-water

* should do for now

* sector.name
2021-09-12 11:21:17 -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
YellOw139
0f019f58bd
[Bundle][RO] Update (#5839)
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 5d4ab9ecd7
- Typo fixes & various other improvements

* new button

* derelict changes
2021-08-23 12:26:15 -04:00
YellOw139
487bc1866a
[Bundle][RO] Update (#5668)
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 5ca5025fb1
- Typo fixes & various other improvements

* Update bundle_ro.properties

* Update bundle_ro.properties

* progress

* derelict

* typo

* Update bundle_ro.properties

* Update bundle_ro.properties

* teamwork

* []

* AI

* Агрессоры

* sector info

* Update bundle_ro.properties

* Update bundle_ro.properties

* Update bundle_ro.properties

* Update bundle_ro.properties
2021-08-15 21:24:27 -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
YellOw139
aa74679998
[Bundle][RO] Update (#5573)
* [Bundle][RO] Update

Changelog:

- New strings/changes up to commit 8041c305ad
- Typo fixes & various other improvements

* Update bundle_ro.properties

* Update bundle_ro.properties

* settings

* Update bundle_ro.properties

* new blocks

* new units I

* new units II

* Update bundle_ro.properties

* Update bundle_ro.properties
2021-07-28 16:57:54 -04:00
YellOw139
e0e124ee57
[Bundle][RO] Update (#5431)
Changelog:

- New strings/changes up to commit 865ee952c9
- Typo fixes & various other improvements
2021-06-25 12:59:45 -04:00
YellOw139
8a51a4be32
[Bundle][RO] Update (v7 pre-alpha) (#5365)
* [Bundle][RO] Update (v7 pre-alpha)

Changelog:

- New strings/changes up to commit 00ca247d0f
- Typo fixes & various other improvements

* old typo

* coolant strength
2021-06-07 16:40:07 -04:00
YellOw139
a6fe1275c7
[Bundle][RO] Update (#4860)
* [Bundle][RO] Update

This PR ~~was~~ will soon be tested in-game ~~and is ready to merge at any time~~.

Changelog:

- New strings/changes up to commit b75a8d5260
- Typo fixes & various other improvements

* Status effects

* Minor change

* Improve, adapt

* After test bundles be like

* cleanup

* typo

* options, options...

* Added block_info keybind name
2021-03-28 18:42:50 -04:00
YellOw139
0ec71750b7
[Bundle][RO] Update (#4750)
* [Bundle][RO] Update

This PR was tested in-game and is ready to merge at any time.

Changelog:

- New strings/changes up to commit f78719afc0
- Typo fixes & various other improvements

* WIP

* typo

* Speaking logically

* Update core/assets/bundles/bundle_ro.properties

Co-authored-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>

* Opted for a better term: controlor, not controller

* double-tap

* Times joined & kicked

Co-authored-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>
2021-03-05 11:30:55 -05:00
Anuken
467402ef73 Various fixes 2021-02-19 19:20:04 -05:00
YellOw139
7bb4b09308
[Bundle][RO] Update (#4725)
* [Bundle][RO] Update

This PR was tested in-game and is ready to merge at any time.

Changelog:

- New strings/changes up to commit 1ef7ae7079
- Typo fixes & various other improvements

* Reducing confusion

* Update bundle_ro.properties
2021-02-19 18:32:07 -05:00
YellOw139
41b50d67af
[Bundle][RO] Update (#4696)
This PR was tested in-game and is ready to merge at any time.

Changelog:

- New strings/changes up to commit 631e4d9eef
- Typo fixes & various other improvements
2021-02-16 13:12:29 -05:00
YellOw139
d5645b8a7b
[Bundle][RO] Update (#4631)
* [Bundle][RO][124.1] Update

This PR was tested in-game and is ready to merge at any time.

Changelog:
- New strings/changes up to commit 64acd6c1e4
- Fixed ancient mod-related bundles not fitting the new install button
- Typo fixes & various other improvements

* Logic tooltips - initial English commit

* Block flags

* Romanian logic hints

* polishing

* Since when is this missing

* Polishing
2021-02-15 10:43:34 -05:00
YellOw139
e86a3e9d09
[Bundle][RO][Ready-for-Stable] Translation & metadata update + minor fix (#4409)
* #3958 hotfix

* update Romanian Steam desc count

* Create title.txt

* Add files via upload

* Sorter gates

* charge

* Polishing

* More mod browser
2021-02-07 12:33:51 -05:00
YellOw139
c026d44cd3
[Bundle][RO] Translation update (#4192)
* [Bundle][RO] Translation update

This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- ~~New strings/changes up to commit~~ TBA
- Sector description improvements
- Typo fixes & various other improvements

* Update bundle_ro.properties

* Max

* repeated typo typo typo

* Welcome to 2020 when maps are no longer images

* <never> forget your position in the 20s
2021-01-19 15:26:36 -05:00
YellOw139
0d643a3ece
[Bundle][RO] Translation update (#4115)
* [Bundle][RO] Translation update

This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- New strings/changes up to commit 43757a247e
- Typo fixes & various other improvements

* no
2020-12-29 17:40:22 -05:00
YellOw139
15b865e550
[Bundle][RO] Translation update (#4039)
* [Bundle][RO] Translation update

This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- New strings/changes up to commit commit
- Typo fixes & various other improvements

* don't do bad choices

* some polishing

* typo

* The 7.0 [combat] experience

* Rebranding
2020-12-23 12:02:37 -05:00
YellOw139
5b11dbc085
[Bundle][RO] Translation Update (#3957)
This PR was tested in-game and is _**ready to merge at any time**_ (unless marked as draft).

Changelog:
- New strings/changes up to commit 98c4ee6e74
- Typo fixes & various other improvements
2020-12-13 23:46:50 -05:00
YellOw139
fdb8da5767
[Bundle][RO][Ready-for-Stable] Translation Update
This PR was tested in-game and is ready to merge at any time (unless marked as draft).
Its strings are ready and _**merging**_ is _**recommended**_ for **_the next stable release._**

Changelog:

- New strings/changes up to commit f9cfc8a2b8
- Typo fixes & various other improvements
2020-12-07 13:50:55 +02:00
YellOw139
5ac1c32652
coreIncinerate 2020-12-04 22:19:56 +02:00
YellOw139
39b8627a60
[Bundle][RO] Translation Update
This PR was tested in-game and is ready to merge at any time (unless marked as draft).

Changelog:

- New strings/changes up to commit 48c8357ff7
- Abilities should now be clear enough. Less of a mess.
- Typo fixes & various other improvements
2020-12-04 09:32:35 +02:00
YellOw139
fb580326b2
Easier reading for the monolingual 2020-11-30 11:53:52 +02:00
YellOw139
f4c6870ee9
And so ability.unitspawn works thanks new wiki 2020-11-28 21:18:00 +02:00
YellOw139
340efc3298
Typo 2020-11-28 20:49:33 +02:00
YellOw139
2c0884ed46
Fixes 2020-11-28 11:21:46 +02:00
YellOw139
ef63c5073a
Legacy prompts 2020-11-26 21:11:55 +02:00
YellOw139
91b05e4789
Reconnecting 2020-11-25 22:29:32 +02:00
YellOw139
e0f2c2f46f
Sector descriptions: additions and revisions
Romanian is gonna hit stable soon.
2020-11-25 10:40:02 +02:00
YellOw139
ea653bf5c3
Finished (for now) 2020-11-24 20:48:40 +02:00
YellOw139
7a59c7bc24
translation checkpoint 2020-11-24 13:22:42 +02:00
YellOw139
23c33d87c1
Update bundle_ro.properties
This is not ready, hence will be a draft. ea377c6f16 still unfinished. Do not merge as-is. It is unfinished and untested.

This is a rushed submission. I did not want to lose my progress; don't have time to finish it right now.
2020-11-23 14:56:18 +02:00
YellOw139
0da32c969c
Removed block select timeout 2020-11-22 23:07:27 +02:00
YellOw139
925cc7318b
Sector display polishes + Hints 2020-11-22 17:10:03 +02:00
YellOw139
0662fd8427
Sector not found 2020-11-21 20:55:53 +02:00
YellOw139
88535665e8
revert 2020-11-20 07:36:11 +02:00
YellOw139
75744256f9
Brief test 2020-11-20 07:31:50 +02:00
YellOw139
babb6616ef
Interplanetary strings 2020-11-19 10:02:32 +02:00
YellOw139
9fe01eec38
Translation Allowed + few commit bumps 2020-11-18 10:55:41 +02:00
YellOw139
73955611d1
sector stuff 2020-11-17 11:22:04 +02:00
YellOw139
f56c944329
translation forbidden 2020-11-16 07:55:48 +02:00
YellOw139
7affde5a2e
oh no no ui 2020-11-15 23:49:30 +02:00