Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,902 Commits 4 Branches 180 Tags
bcb248907c8d7bb3fdce5574b4fe455c4084c0c8
Commit Graph

2144 Commits

Author SHA1 Message Date
laohuaji233
93de060ad5 Update bundle_zh_CN.properties 2020-02-13 14:56:46 +08:00
soytheLB
c5fcc30422 Update bundle_es to version #149465 
Added translation to the following:
 Line 62 stat.playtime
Line 108 mod. display
Line 176 servers.local
Line 177 servers.remote
Line 178 servers.global
line 261 data.open.folder
Line 542 block.tiles
Line 543 block.afinities
Line 678 Player.limit
Line 681 bridge.opacity
Changed cancel building from "impiar" to "limpiar"
Changed Lich unit name to "Exánime".
Translated name for scatter turret.
Changed wave name from "Horda" to "Ola". (Horda reffers to enemy waves while ola means sea waves)
Changed name swarmer from "enjambredor" to "enjambre".
changed turrets description to be closer to the english version.
Changed factories descriptions to be closer to english version
 2020-02-12 23:46:27 -03:00
Artur Quaresma
97355263df Added new lines and some small translation.s 
I added new lines and some small transaltions that was missing.
 2020-02-12 21:09:58 +00:00
Anuken
6fd0205495 Merge 2020-02-11 19:55:02 -05:00
Alexander H
68e403557a translated; spelling errors, odd phrases removed 
I've gone through the German translation file looking for missing translations, which I provided, as well as spelling errors and odd phrases, which I continued to remove. I also replaced every [LIGHT_GRAY] tag with [lightgray] for uniformity.
 2020-02-12 01:46:13 +01:00
Anuken
aafecfebbb Merge pull request #1468 from Prosta4okua/patch-7 
Update bundle_uk_UA.properties
 2020-02-11 15:45:12 -05:00
Anuken
de9a14c903 Czech translation for 103.x changelog (#1455) 
* Czech translation for 103.x changelog

* Czech translation - mod display

* Czech translation - fix typos

* Czech: added Time played + small format corr.

* Czech for server categories!
 2020-02-11 15:40:33 -05:00
Ali-C-Ila
5ab47f4fe0 Update bundle_zh_TW.properties (#1454) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-02-11 15:40:24 -05:00
Vanguard
435860eda4 RU updates (#1442) 
* 1 changed line, 1 removed line

Changed:
keybind.zoom.name

Removed:
keybind.zoom_hold.name

Moved some lines around to keep them in the same order with bundle.properties

* 1 changed line

tutorial.intro

* 3 new lines, 3 changed lines

New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details

* 2 changed lines

mods.guide
mod.import.github

* 1 new line

link.feathub.description

* 1 changed line

item.graphite.description

* 1 changed line

block.mass-driver.description

* 9 new lines, 1 changed line

New:
be.update
be.update.confirm
be.updating
be.ignore
be.noupdates
be.check
server.kicked.serverRestarting
setting.coreselect.name
rules.blockhealthmultiplier

Changed:
wave.enemy

* 3 changed lines

quit.confirm.tutorial
setting.coreselect.name
public.confirm

* 22 changed lines

mod.missing
item.plastanium.name
block.plastanium-wall.name
block.plastanium-wall-large.name
block.plastanium-compressor.name
item.scrap.description
item.spore-pod.description
item.blast-compound.description
liquid.oil.description
unit.revenant.description
block.multi-press.description
block.plastanium-compressor.description
block.spore-press.description
block.power-source.description
block.force-projector.description
block.conveyor.description
block.mass-driver.description
block.liquid-junction.description
block.phase-conduit.description
block.thorium-reactor.description
block.blast-drill.description
block.cyclone.description

* 3 new lines, 2 removed lines

New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description

Removed:
block.signal
block.editsignal

* 1 new line

data.openfolder

* 1 changed line

block.cryofluidmixer.description

* 2 new lines

block.underflow-gate.name
block.underflow-gate.description

* 2 changed lines

unit.thousands
unit.millions

* 3 new lines

blocks.tiles
blocks.affinities
setting.playerlimit.name

* 1 changed line

block.underflow-gate.name

* 1 changed line

unit.thousands

* 1 changed line

blocks.affinities

* 1 changed line (reverted)

unit.thousands

* Update bundle_ru.properties

* 1 new line

mod.display

* 1 changed line

techtree

* 1 changed line (new approach)

techtree

* 1 changed line

editor.generate

* 1 new line

stat.playtime

* 3 new lines

servers.local
servers.remote
servers.global

* 3 changed lines

servers.local
servers.remote
servers.global

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
 2020-02-11 15:40:17 -05:00
AmateurPotion
5611a8684c Update bundle_ko.properties (#1490) 
* Update bundle_ko.properties

Finish! yeeeee!

* Update bundle_ko.properties
 2020-02-11 15:33:25 -05:00
LauweJoster
f06550fc3c Update bundle_nl.properties (#1501) 
Grammar and sentence improvements. Also added translations
 2020-02-11 15:32:18 -05:00
Ali-C-Ila
652c143ff6 Update bundle_zh_TW.properties (#1519) 2020-02-11 15:25:53 -05:00
Rasangus
64ade54336 Update bundle_pt_BR.properties (#1525) 2020-02-11 15:25:38 -05:00
Petr Gašparík
29a6b1a8da Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-11 11:18:54 +01:00
Patrick 'Quezler' Mounier
562fa07755 Merge branch 'master' into crater 2020-02-10 12:09:14 +01:00
GioIacca9
941449c502 Updated "Full implementation of #1494" (#1541) 2020-02-09 22:26:47 -05:00
Anuken
a2706a80b1 Merged with master 2020-02-09 12:27:44 -05:00
Prosta4okua
0a53c4c1be Update bundle_uk_UA.properties 2020-02-08 12:26:09 +02:00
Prosta4okua
d7eb0d3ba3 Update bundle_uk_UA.properties 2020-02-08 12:23:50 +02:00
Anuken
c8455ddbc8 Added message for non-building units 2020-02-07 21:56:55 -05:00
valtsu41
9b36125b0c Finnish translation & grammar update (#1473) 
* Finnish translation & grammar update

* More grammar correcting and making things more native

* Just a little more fine-tuning

* Fixes
 2020-02-07 20:42:14 -05:00
Petr Gašparík
e98808bc46 Czech for server categories! 2020-02-07 12:35:09 +01:00
Petr Gašparík
bc37415a10 Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-07 12:32:33 +01:00
Prosta4okua
619b2ba897 Update bundle_uk_UA.properties 2020-02-07 12:42:59 +02:00
Prosta4okua
59431b223b Update bundle_uk_UA.properties 2020-02-06 23:38:45 +02:00
Patrick 'Quezler' Mounier
99d1a2829f Merge branch 'master' into crater 2020-02-06 19:33:57 +01:00
Vanguard
9b30b452a1 3 changed lines 
servers.local
servers.remote
servers.global
 2020-02-06 03:39:32 +03:00
Vanguard
c254a702fc 3 new lines 
servers.local
servers.remote
servers.global
 2020-02-06 03:34:19 +03:00
Anuken
4a2c6c571f Merge remote-tracking branch 'origin/master' 2020-02-05 19:02:02 -05:00
Anuken
a5fd881f8d Full implementation of #1494 2020-02-05 19:01:53 -05:00
martin-mfg
d59b23b835 bundle_de.properties: merge PRs + further improvements (#1482) 
* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* Update bundle_de.properties

* add minor missing changes from discussion in #799

* fix duplicated text in german translation (configure.locked)

* apply German translation suggestions from PR comment

This commit applies suggestions from the comment at https://github.com/Anuken/Mindustry/pull/783#pullrequestreview-299643677

Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Silvério Santos <ssantos@web.de>
 2020-02-05 18:37:21 -05:00
Patrick 'Quezler' Mounier
e06d8eabec [formatting] add newline to file(s) (#1508) 
* Trail appropriate files with a new line

* For some ironic reason it ignored itself

Probably because it wasn’t tracked/commited yet.

* Rename newlines to server executable naming pattern
 2020-02-05 18:36:56 -05:00
Anuken
f6b1420103 c l e a n u p 2020-02-05 18:28:19 -05:00
Patrick 'Quezler' Mounier
05ccdfd51b Merge branch 'master' into crater 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/world/modules/ItemModule.java
 2020-02-05 10:26:34 +01:00
Petr Gašparík
39b35dd9cb Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-02-05 08:34:59 +01:00
Anuken
be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/Vars.java
#	core/src/mindustry/entities/traits/SaveTrait.java
#	core/src/mindustry/maps/generators/MapGenerator.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/world/blocks/Floor.java
#	desktop/src/mindustry/desktop/DesktopLauncher.java
#	gradle.properties
 2020-02-04 12:25:18 -05:00
GioIacca9
b4be655d0c Translated stat.playtime (#1485) 2020-02-03 12:54:06 -05:00
LauweJoster
19da1e1306 Update bundle_nl.properties (#1499) 
Improved some grammar and sentencing. Also added a few translations.
 2020-02-03 12:37:28 -05:00
Anuken
f2f31120a0 Gradual component conversion 2020-02-02 20:17:22 -05:00
Vanguard
6aed5f081c 1 new line 
stat.playtime
 2020-02-01 04:21:50 +03:00
Petr Gašparík
b4e9e6be32 Czech: added Time played + small format corr. 2020-01-31 13:16:27 +01:00
Petr Gašparík
737e3145ec Merge branch 'master' of https://github.com/Anuken/Mindustry into v103.3 2020-01-31 13:13:51 +01:00
Anuken
2721aa550d Implemented #1444 2020-01-30 22:56:17 -05:00
Vanguard
91d1abf1e9 1 changed line 
editor.generate
 2020-01-30 04:17:46 +03:00
Prosta4okua
6a48a1e0a3 Update bundle_uk_UA.properties 2020-01-29 01:12:12 +02:00
Prosta4okua
d0faecbea5 Update bundle_uk_UA.properties 2020-01-29 01:07:24 +02:00
Anuken
ad6e0bcd0f Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework 
# Conflicts:
#	android/src/mindustry/android/AndroidLauncher.java
#	annotations/src/main/java/mindustry/annotations/SerializeAnnotationProcessor.java
#	annotations/src/main/java/mindustry/annotations/impl/AssetsAnnotationProcessor.java
#	build.gradle
#	core/assets-raw/fontgen/config.json
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/fonts/font.ttf
#	core/assets/fonts/icon.ttf
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/UnitTypes.java
#	core/src/mindustry/core/NetClient.java
#	core/src/mindustry/core/NetServer.java
#	core/src/mindustry/entities/bullet/BulletType.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/maps/filters/FilterOption.java
#	core/src/mindustry/mod/Scripts.java
#	core/src/mindustry/ui/Fonts.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/ui/fragments/HudFragment.java
#	core/src/mindustry/ui/fragments/MenuFragment.java
#	core/src/mindustry/world/blocks/production/Cultivator.java
#	core/src/mindustry/world/blocks/units/CommandCenter.java
#	gradle.properties
#	tools/src/mindustry/tools/FontGenerator.java
 2020-01-27 15:51:02 -05:00
Patrick 'Quezler' Mounier
8edcebd3a6 Undo moving other bundle keys into their place 
Should be a different commit/pull
 2020-01-27 19:42:27 +01:00
Patrick 'Quezler' Mounier
9a289c83e6 Fuse with conveyor optimization 
# Conflicts:
#	core/src/mindustry/world/blocks/distribution/ItemConveyor.java
 2020-01-27 18:06:48 +01:00
Vanguard
d1c2666fdd 1 changed line (new approach) 
techtree
 2020-01-27 16:11:23 +03:00