Commit Graph
11075 Commits
Author SHA1 Message Date
彭瑞暄andGitHub e3ccde31d8 removed "never", minor updates (#4363) 2021-01-19 17:21:41 -05:00
Vajda SimonandGitHub 32d1d7264c bundle_hu.properties (#4181)
Okay, so a lot of little ones go big.
2021-01-19 17:08:22 -05:00
SharlotteandGitHub 27d9718d4f update KO bundle + android (#4285)
* Update bundle_ko.properties

* oops!

* changelog update

* Update full_description.txt

* oh god, i forgot this again again... sorry

* Update bundle_ko.properties
2021-01-19 16:05:17 -05:00
Anuken f812460164 New unit select fixes 2021-01-19 15:49:30 -05:00
VozDuhandGitHub da8ea84397 New Unit Select (#3672)
* New Unit Select

* Fix

* Facepalm

* Code Fix

* Texture Fix
2021-01-19 15:42:33 -05:00
机械师andGitHub 52e47a28c4 Update servers_v6.json (#4132)
增加两个中国地区服务器,主要为挑战性地图。
Add two China region servers, mainly for challenging maps.
2021-01-19 15:36:27 -05:00
Petr GašparíkandGitHub b9b8fc66b1 Czech translation - ongoing effort (#3841) 2021-01-19 15:28:23 -05:00
YellOw139andGitHub 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
eb75cd5ae8 Update contributors (#3766)
Co-authored-by: Anuken <arnukren@gmail.com>
2021-01-19 15:26:12 -05:00
7e10487926 [Bundle][RU] actual L10n (#4173)
* 1 line changed

- noname

* 1 line changed

- hint.placeTurret

* 3 new lines

- servers.disclaimer
- hint.coreUpgrade
- hint.presetLaunch

----
NOTE from Felix Corvus (@Remint32)

This commit and PR are the last ones I made to the repository.
I want to sincerely thank the people I worked with to enhance the game and translate it into Russian.

I want to thank you separately:
Prosta4ok_ua (@Prosta4okua), Vanguard (@XEN0PHIL), BasedUser (@BasedUser), Summet (@summetdev), Anuke (@Anuken), The_Slaylord (@TheSlaylord), Lonely_Ymomfe (@ymomfe), and XZimur (@XZimur)

* 5 changed lines; 2 new lines

Changed:
globalitems
sector.extractionOutpost.description
hint.launch
hint.launch.mobile
hint.presetLaunch

New:
hint.coreIncinerate
hint.coopCampaign

* 2 changed line

hint.coopCampaign
item.spore-pod.details
-
В споровом стручке всё же множественное число в описании, говорится про сами споры. THEY EMIT - они выделяют, IT EMITS - он выделяет.

* 2 changed lines

hint.coreIncinerate
block.interplanetary-accelerator.description

* 3 new line; 1 changed line

New:
setting.showweather.name
link.bug.description
rules.weather.always

Changed:
keybinds.mobile

* 4 new lines; 1 changed line; 1 deleted line

New:
public.confirm.really
bullet.buildingdamage
stat.ammouse
unit.pershot

Changed:
bullet.knockback

Deleted:
bar.limitreached

* Update bundle_ru.properties

падежи

* Update bundle_ru.properties

мелочи

* 1 changed line

stat.ammouse

* 1 new line

none.found

* 6 changed; 1 deleted

Changed:
mod.featured.dialog.title
mods.browser.add
mods.github.open
mod.import.github
mod.jarwarn
mods.guide

Deleted:
mod.featured.title

* 2 changed lines

link.bug.description
mod.scripts.disable

* Update achievements.vdf

* Update description.txt

* 1 changed line

item.thorium.description

* 1 new line

rules.coreincinerates

* 1 new line

bar.boost

* 1 new line

max

* Update bundle_ru.properties

* Update bundle_ru.properties

* rip v3.5 maps

* Update bundle_ru.properties

* Update bundle_ru.properties

Co-authored-by: Felix Corvus <remint32@yandex.ru>
Co-authored-by: Vanguard <55051135+XEN0PHIL@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
2021-01-19 15:24:59 -05:00
ZirKNkium611andGitHub 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
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
LoumardesandGitHub 4fc805abbf launch core translated to "Lancement du noyau" (#4348) 2021-01-19 14:38:18 -05:00
LoumardesandGitHub cd81482b6b untranslated mods notification strings (#4347) 2021-01-19 14:38:11 -05:00
itcannotbeandGitHub 3972e34dde Update bundle.properties (#4375)
Remove flowgate limitation in block description.
2021-01-19 14:37:40 -05:00
RodrigoandGitHub 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
RodrigoandGitHub 68f19fdbcf Update bundle_pt_BR.properties (#4352)
Fixed a dumb error
2021-01-19 10:22:11 -05:00
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
RayanZ22andGitHub 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
alexandGitHub 0061690631 Update servers_v6.json (#4342)
Adding a fast paced hex for V6.
2021-01-18 19:50:40 -05:00
Joshua FanandGitHub 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 KimandGitHub 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 FanandGitHub 2da128678a Always allow zoom while controlling unit that can't build (#4371) 2021-01-18 17:44:01 -05:00
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' MounierandGitHub 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' MounierandGitHub 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 FaithandGitHub 956f4659c7 Sound stuff (#4332) 2021-01-15 10:13:41 -05:00
Anuken 593a7b060c Fixed #4334 2021-01-15 10:04:56 -05:00