Commit Graph

10865 Commits

Author SHA1 Message Date
ZirKNkium611
ae921bf266
Update bundle_es.properties (#4027)
* Update bundle_es.properties

correcting and improving some translations

* Update bundle_es.properties

correcting team names
2021-01-19 15:22:47 -05:00
Phinner
ca62d2aa07
Rework and Update of the french bundles (Steam and bundle_fr) (#4350)
* Complete rework of bundle_fr

# Complete rework of bundle_fr
## Overview
Hello players. I made a pull in [Mindustry-Suggestions](https://github.com/Anuken/Mindustry-Suggestions/issues/1743) about merging bundle_fr and bundle_fr_be. The cat told he was unable to do that because:
> I don't understand either language, so I would be unable to merge the two bundles with any degree of accuracy. This is best discussed and implemented by other speakers of the language(s).
So I decided to do that with the help of senri on discord and Voila. There is the updated version of the french bundle for Belgians, Frenchs, Quebecois and everyone else who speaks or learns french !
## Changes
There are the words I changed that you may argue about:
```
FPS -> IPS
Raccourci clavier -> Touches
Foreshadow -> Présage
Mace -> Titan
Scepter -> Destructeur
Reign -> Eradicateur
Lancier -> Perforateur (Its just an idea)
Chat -> Tchat
Minuterie -> Compte à rebours (Makes more sense for the waves i think)
Minimap -> Mini-carte
Supporté -> Pas pris en charge (For errors, makes more sense)
Hébergeur -> Hôte (the shorter the better)
Foreuse à vérin -> foreuse pneumatique (I don't think being super precise might help normal players)
Onde -> Vague
Percussion -> Percuteur (C'est un nom qui percute !)
- Deleted the (e) until the file is reviewed by more people
- Made the whole file more coherent, I mean there were upper/lower case letters where it shouldn't be.
- Added translations for V6 content like logic blocks, sector description, turrets, units...
- Some more stuff I may have forgotten
```
## Lines to verify in priority
There are the lines I was strugulling with
```
16, 23, 27, 37, 100, 109, 128, 129, 140, 153, 159, 189, 204, 229, 251, 282, 291, 321, 341, 421, 468, 482, 515, 536, [598 -> 613], 703, 705, 715, 751, 777, 1254, 1402
```
## conclusion
Like I said, I merged fr and fr_be, taking the best translations one by one and translating the missing lines. That would be cool if you look quickly in the file and find some errors I could have made. Thank you for reading and I wish you a good day, or night...

* Hotfix

* Updated steam translations

Updated the achievements and Added the new ones. The only problem I had is the "NEW_ACHIEVEMENT_26_1_DESC", I think there's better translation for that but I'm unable to figure it out for some reasons.

Co-authored-by: Anuken <arnukren@gmail.com>
2021-01-19 15:18:38 -05:00
Anuken
2ba093c640 Merge remote-tracking branch 'origin/master' 2021-01-19 15:13:46 -05:00
Anuken
e3f388692f Misc cleanup & fixes 2021-01-19 15:13:41 -05:00
Loumardes
4fc805abbf
launch core translated to "Lancement du noyau" (#4348) 2021-01-19 14:38:18 -05:00
Loumardes
cd81482b6b
untranslated mods notification strings (#4347) 2021-01-19 14:38:11 -05:00
itcannotbe
3972e34dde
Update bundle.properties (#4375)
Remove flowgate limitation in block description.
2021-01-19 14:37:40 -05:00
Rodrigo
01b24959c8
Typo (#3947)
Í
2021-01-19 13:53:56 -05:00
Anuken
40908589b9 Merge remote-tracking branch 'origin/master' 2021-01-19 10:46:38 -05:00
Anuken
774be56bde #4379 2021-01-19 10:46:33 -05:00
Rodrigo
68f19fdbcf
Update bundle_pt_BR.properties (#4352)
Fixed a dumb error
2021-01-19 10:22:11 -05:00
reNemesic
50aab01a2e
Perfecting of bundle_pt-BR [Finished] (#3863)
* Update bundle_pt_BR.properties

Added sector description [not finished]

* Update 2

Finished first translation of sector descriptions (fixes and did the last one)
Added some translations for not done entries.

* Upgrade #3

Started fixing consistency issues
Redid sector descriptions
Translated last untranslated elements

Co-authored-by: Anuken <arnukren@gmail.com>
2021-01-19 10:21:34 -05:00
RayanZ22
ead0158ef9
Update bundle_pt_BR.properties (#3612)
update
2021-01-19 10:17:08 -05:00
Anuken
d06a74e7a2 Fixed #4376 2021-01-19 09:58:41 -05:00
Anuken
8fab335b9d Merge remote-tracking branch 'origin/master' 2021-01-18 20:18:03 -05:00
Anuken
25b22b4f93 Duplicate IP prevention / Removed overflow inventories 2021-01-18 20:17:59 -05:00
alex
0061690631
Update servers_v6.json (#4342)
Adding a fast paced hex for V6.
2021-01-18 19:50:40 -05:00
Joshua Fan
26ad53ec50
Tweak highlight on plastanium sprite (#4373) 2021-01-18 19:42:47 -05:00
Anuken
4aa2d9097f Merge remote-tracking branch 'origin/master' 2021-01-18 18:04:21 -05:00
Anuken
82f8e78ec8 Fixed various rounding errors in database 2021-01-18 18:04:16 -05:00
Sunny Kim
f91910e84f
conductsTo() returning whether to conduct itself to adjacent builds (#4354)
* conductsTo

* insulated block no longer conducts

* moved both checks to be symmetrical
2021-01-18 17:45:45 -05:00
Joshua Fan
2da128678a
Always allow zoom while controlling unit that can't build (#4371) 2021-01-18 17:44:01 -05:00
genNAowl
18a382b07a
Draw Conveyor Items under Blocks (#4372)
* Draw Conveyor Items under Blocks

* Remove new layer in favor of subtraction

Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
2021-01-18 17:34:17 -05:00
Anuken
83a4f56679 Fixed #4368 2021-01-18 17:23:16 -05:00
Anuken
ffad9cb9a9 Merge remote-tracking branch 'origin/master' 2021-01-17 15:54:49 -05:00
Anuken
6a63956b71 Anuken/Mindustry-Suggestions/issues/1808 / Less fire in rain 2021-01-17 15:54:43 -05:00
Patrick 'Quezler' Mounier
32a1d91faf
Use Player.deathDelay + 1 instead of magic number (#4344) 2021-01-17 15:33:19 -05:00
Anuken
634d9d1a40 Fixed #4357 / Fixed #4349 / Fixed #4345 / Fixed #4343 2021-01-17 15:31:22 -05:00
Anuken
f9adcfeed1 Ground units: Avoid stepping onto dangerous/deep floor 2021-01-17 09:21:11 -05:00
Anuken
02ef633529 Removed redundant parens 2021-01-15 17:10:38 -05:00
Patrick 'Quezler' Mounier
f3b1ef02e3
Scale impact reactor warmup time with boost (#4317) 2021-01-15 17:09:39 -05:00
Anuken
2d3a9b605a Fixed #4337 / Fixed #4336 2021-01-15 17:09:12 -05:00
Anuken
718a40d742 More pattern matching 2021-01-15 16:04:26 -05:00
Anuken
650d47991e Formatting 2021-01-15 12:43:37 -05:00
Anuken
6ec76409ef Fixed #4335 2021-01-15 12:38:42 -05:00
Anuken
136c8cfcd2 Cleanup + Generic cross rendering 2021-01-15 11:34:33 -05:00
Anuken
bceb7b5809 Merge remote-tracking branch 'origin/master' 2021-01-15 11:16:12 -05:00
Anuken
a342a7d638 Cleanup & bugfixes 2021-01-15 11:16:08 -05:00
MEEP of Faith
956f4659c7
Sound stuff (#4332) 2021-01-15 10:13:41 -05:00
Anuken
593a7b060c Fixed #4334 2021-01-15 10:04:56 -05:00
Anuken
81ce3a28a1 More distinct plastanium sprite 2021-01-14 13:46:27 -05:00
Anuken
32070a37f7 Fixed #4325 2021-01-14 11:26:16 -05:00
Anuken
95c04eb085 Minor sector damage calculation changes 2021-01-13 17:09:18 -05:00
Anuken
c2602fe6a0 Fixed #4319 2021-01-13 10:43:04 -05:00
Anuken
9ce5164a7e Merge remote-tracking branch 'origin/master' 2021-01-12 11:53:04 -05:00
Anuken
ee79bc5501 Replaced waves.never with ∞ 2021-01-12 11:52:51 -05:00
彭瑞暄
3dc70be516
Update zh-TW translations (#4290)
* Update zh-TW bundle, surge correction

Changed surge ammo characteristic "shock".
Thought "shock" as in only stunning or making the enemy flinch.
It means shocking the enemy with electricity and deal bonus damage when the unit is covered in water.

* Launch max UI

* Minor correction wave spawning
2021-01-12 11:25:41 -05:00
Anuken
e44c3899e8 Merge remote-tracking branch 'origin/master' 2021-01-12 10:19:36 -05:00
Anuken
e7885a405e Removed 3.5 map image message
Reasoning: 3.5 images and most other map images won't work in the editor. If you try to import a random image, it will give you an empty map. Only maps that were exported as images previously will work correctly.
2021-01-12 10:19:30 -05:00
MEEP of Faith
c6b60a2620
shootLength for other turrets that aren't PointDefenceTurrets (#4312) 2021-01-12 09:39:27 -05:00