Vanguard
307f9ee297
2 changed lines
...
link.trello.description
link.feathub.description
2020-03-04 19:51:48 +03:00
Vanguard
1bbdedec72
1 changed line
...
join.info
2020-03-04 14:59:57 +03:00
Anuken
f1aadd97a8
Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# Conflicts:
# core/src/mindustry/core/Logic.java
# gradle.properties
2020-03-03 12:12:25 -05:00
Aldas
cdb8682d43
Updated data.import.confirm lane ( #1658 )
...
Updated data.import.confirm lane
2020-03-03 10:36:34 -05:00
Aldas
d3b7dd973f
Grammar corrections ( #1656 )
...
Grammar and logic corrections
2020-03-02 10:02:56 -05:00
Anuken
f88fe898ff
Updated bundle
2020-03-01 21:23:50 -05:00
Lapis+
d93ca520ae
Update bundle_ja.properties ( #1578 )
2020-03-01 21:09:08 -05:00
Vanguard
cdf8514ac8
RU updates ( #1584 )
...
* 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
* 1 changed line
setting.pixelate.name
* 1 line removed
schematic.replace
* 1 new line
rules.solarpowermultiplier
* 2 changed lines
unit.thousands
unit.millions
Co-authored-by: Anuken <arnukren@gmail.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
2020-03-01 21:06:16 -05:00
Dexapnow
62c7b5f691
Update bundle_pl.properties ( #1643 )
2020-03-01 21:04:07 -05:00
AmateurPotion
a6ddb1d187
Update bundle_ko.properties ( #1629 )
2020-03-01 21:03:41 -05:00
StarMiner99
4c28c30228
[Lang] Changed some nl Translations ( #1626 )
...
* fixed translations till line 180
fixed nl translations
* Fixed most nl translations
* small fixes
suggested by Quezler
2020-03-01 21:03:00 -05:00
Anuken
c6fc103bff
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
2020-03-01 12:55:51 -05:00
Prosta4okua
057f3aead7
Update bundle_uk_UA.properties ( #1644 )
2020-02-29 21:46:38 -05:00
Aldas
bcc901b3ef
Add bundle_lt.properties for lithuanian translation ( #1650 )
...
* Create bundle_lt.properties file
Translated first 480 lines. Soon other half will be translated
* Update bundle_lt.properties
* Update bundle_lt.properties
* Update bundle_lt.properties
* Update bundle_lt.properties
* Update bundle_lt.properties
2020-02-29 09:02:45 -05:00
Anuken
04f8282821
Better lighting
2020-02-28 13:44:03 -05:00
Anuken
1e53ea50b0
Added support for export/import of all basic terrain as image
2020-02-26 19:37:22 -05:00
xaumex
c361e5c26d
Update Silicon translation in spanish ( #1639 )
...
Silicone (en) = Silicona (es)
Silicon (en) = Silicio (es)
2020-02-26 11:01:56 -05:00
Ali-C-Ila
251877f561
Update bundle_zh_TW.properties ( #1579 )
...
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
2020-02-24 11:46:20 -05:00
Anuken
cfbe631e66
Merge
2020-02-23 20:14:38 -05:00
soytheLB
c989504bf6
Update bundle_es.properties ( #1624 )
...
Corrected some misspellings.
Added warning text in router.
Changed description of alloy smelter to keep with the translated name of surge alloy.
Added a missed dot from my previous translation.
2020-02-23 10:44:09 -05:00
Vanguard
5735fba4c7
2 changed lines
...
unit.thousands
unit.millions
2020-02-22 20:21:05 +03:00
GioIacca9
47618ac21f
Translated #1593 ( #1621 )
2020-02-22 10:33:22 -05:00
Patrick 'Quezler' Mounier
f891c42847
Remove bundle key space ( #1619 )
2020-02-22 08:43:54 -05:00
Vanguard
2fc17fea2a
1 new line
...
rules.solarpowermultiplier
2020-02-22 04:04:53 +03:00
Petr Gašparík
0a98597ad0
Czech translation - sync with v104 ( #1612 )
...
* Czech translation - sync with changes
* Czech translation - sync with updates
* Czech translation - small fix
2020-02-21 16:27:05 -05:00
DeltaNedas
fe22d334dc
Separate ambient light and solar panel efficiency ( #1593 )
...
* new branch
* Separate ambient light and solar panel efficiency
* Made ambient light -> solar efficiency default
2020-02-21 11:38:56 -05:00
Dexapnow
23e4d1dd84
Update bundle_pl.properties
2020-02-20 14:05:38 +01:00
Dexapnow
3bb4820e79
Update bundle_pl.properties
...
Some things just were confusing
2020-02-20 09:46:37 +01:00
Anuken
32dcae8fd3
Update bundle.properties
2020-02-19 13:49:40 -05:00
Anuken
1d1c73fd6f
Merge
2020-02-19 13:10:25 -05:00
Vanguard
10732ccb5a
1 line removed
...
schematic.replace
2020-02-19 15:33:53 +03:00
Anuken
4a55dde5ee
Bugfixes
2020-02-18 19:54:35 -05:00
Anuken
711faa6e2a
Merge pull request #1597 from GioIacca9/patch-3
...
Update block.pyratite-mixer.description
2020-02-18 11:51:37 -05:00
Anuken
a655e18b87
Merge remote-tracking branch 'origin/master'
2020-02-18 11:35:36 -05:00
Anuken
2038409283
Removed schematic replacement dialog
2020-02-18 11:35:28 -05:00
Anuken
8b14219bab
Merge pull request #1583 from Prosta4okua/patch-9
...
6.0
2020-02-18 10:39:22 -05:00
Anuken
d9ae8e5a28
Merge pull request #1571 from artur309/master
...
Added new lines and some small translation.s
2020-02-18 10:32:30 -05:00
Anuken
507f553295
Merge pull request #1592 from QmelZ/patch-1
...
Translation to Turkish
2020-02-18 10:32:08 -05:00
Anuken
08509dafb1
Merge pull request #1573 from soytheLB/patch-2
...
Update bundle_es to version #149465
2020-02-18 10:31:46 -05:00
GioIacca9
f650963cf4
Update block.pyratite-mixer.description
2020-02-16 19:06:50 +01:00
QmelZ
47f63dd006
Translation to Turkish
...
I translated all the default ones left, fully finished.
2020-02-15 15:15:27 +02:00
Prosta4okua
ff74a212c5
Update bundle_uk_UA.properties
2020-02-14 12:38:58 +02:00
Prosta4okua
a4d42ea22c
6.0
2020-02-14 12:35:17 +02:00
Vanguard
fc46708677
1 changed line
...
setting.pixelate.name
2020-02-14 03:24:27 +03:00
Anuken
47f075133f
Merge
2020-02-13 11:22:29 -05:00
Anuken
0678f54e25
Fixed bloom darkening sprites / Changed pixelate desc
2020-02-13 10:17:43 -05:00
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
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
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
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
Vanguard
d1c2666fdd
1 changed line (new approach)
...
techtree
2020-01-27 16:11:23 +03:00
Petr Gašparík
69069e2ef3
Czech translation - mod display
2020-01-27 11:32:31 +01:00
Nickibosss
1207fb1440
Update bundle_it.properties ( #1431 )
2020-01-25 17:51:43 -05:00
Petr Gašparík
8584fae07a
Czech translation - update ( #1432 )
2020-01-25 17:51:32 -05:00
Ali-C-Ila
0a661766be
Update bundle_zh_TW.properties ( #1438 )
2020-01-25 17:51:24 -05:00
Prosta4okua
fb6cb4829f
Update bundle_uk_UA.properties ( #1434 )
...
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
2020-01-25 17:51:17 -05:00
Vanguard
df3a62b87c
Merge branch 'master' into master
2020-01-25 15:03:05 +03:00
Vanguard
65e2a32722
1 changed line
...
techtree
2020-01-25 14:57:51 +03:00
Vanguard
0103a2b7c6
1 new line
...
mod.display
2020-01-25 04:05:03 +03:00
Prosta4okua
095cb68725
Update bundle_ru.properties
2020-01-25 02:12:21 +02:00
Vanguard
5b9b684ccd
PRE 103 RU_updates ( #1425 )
...
* 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
Co-authored-by: Anuken <arnukren@gmail.com>
2020-01-24 11:31:14 -05:00
Vanguard
5c0f24aa41
1 changed line (reverted)
...
unit.thousands
2020-01-24 19:31:05 +03:00
Petr Gašparík
76d425a920
Czech translation for Android and Steam + continuous updates ( #1383 )
...
* Improving Czech translation, up to line 374 now
* Czech translation, revisited up to line 468
* Translation revision up to line 510.
* Czech translation - small fixes here and there.
* Czech translation - small fixes here and there.
* Czech lang. - Fixed some typos found by @dusekdan
* Czech - revision up to line 564
* Czech tr. - small fixes to fit into GUI
* Czech tr. - small fixes after checking GUI
* Czech tr. - revision up to line 670 done
* Czech tr. - revisited up to line 748.
* Czech tr. - now it has the same length as English
* Czech translation - polished up to line 1062
Only tutorial left...
* Czech translation - small fixes
* Czech tr. - revisited up to line 1070
* Czech translation - revision done up line 1084.
New: tutorial translated, new key incorporated.
* Czech translation done up to line 1100.
* Czech translation up to line 1105
* Czech translation - small corrections, consistency
* Czech translation up to line 1124
* Czech translation - done up to line 1159
* Czech translation up to line 1071
* Czech translation, up to line 1177
* Czech translation, done up to line 1203
* Czech translation REVISION DONE!
* Czech files for Steam!
* Czech - full translation for Android
* Czech translation - fixing typos found by @dusekdan
thank you!
* Czech traslation, back to "Workshop" from "Dílna"
...as it is the same name on Steam
* Czech translation - underflow gate
2020-01-24 11:12:41 -05:00
Prosta4okua
9ef23ace95
[WIP]Update bundle_uk_UA.properties ( #1363 )
...
* Update bundle_uk_UA.properties
* Update bundle_uk_UA.properties
2020-01-24 11:12:33 -05:00
Anuken
1a6436355c
Merge remote-tracking branch 'origin/master'
2020-01-24 10:26:16 -05:00
Anuken
63c277f78e
Implemented mod name display in content desc
2020-01-24 10:26:10 -05:00
xzarfs
dda12af593
Update finnish language properties ( #1396 )
...
Major imporvements to the finish language.
Changed finnish word 'aalto' to 'taso' (both mean wave but 'aalto' is the one in a ocean)
2020-01-24 10:09:48 -05:00
GioIacca9
3dda4badac
Update bundle_it.properties ( #1428 )
2020-01-24 10:04:37 -05:00
Vanguard
17265382ed
1 changed line
...
blocks.affinities
2020-01-24 06:56:28 +03:00
Vanguard
a4031386f1
1 changed line
...
unit.thousands
2020-01-24 06:44:42 +03:00
Vanguard
68aba266df
Merge branch 'master' into master
2020-01-24 06:33:32 +03:00
Vanguard
308ce8aef3
1 changed line
...
block.underflow-gate.name
2020-01-24 06:32:40 +03:00
Vanguard
d99ce73ab4
3 new lines
...
blocks.tiles
blocks.affinities
setting.playerlimit.name
2020-01-24 06:23:41 +03:00
martin-mfg
6ffb470916
Update bundle_de.properties ( #1423 )
...
Again some changes and translations
Co-authored-by: Amon-Senpai <56207045+Amon-Senpai@users.noreply.github.com>
2020-01-23 18:57:24 -05:00
Vanguard
847a1a738e
RU updates ( #1354 )
...
* 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
Co-authored-by: Anuken <arnukren@gmail.com>
2020-01-23 18:10:53 -05:00
Anuken
368a53ee98
Merge branch 'master' into master
2020-01-23 18:10:48 -05:00
LingLan
32b3bb2d89
Update zh_CN translate ( #1412 )
...
* update zh_CN translate
* Update bundle_zh_CN.properties
typo fixed.
* update zh_CN translate
* update translate for underflow-gate
* translate setting.bridgeopacity.name
2020-01-23 18:09:40 -05:00
Ali-C-Ila
9aa04a1584
Update bundle_zh_TW.properties ( #1346 )
...
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
2020-01-23 18:09:33 -05:00
Artur Quaresma
4fca93ff4d
Update bundle_pt_PT.properties ( #1351 )
...
A new update
2020-01-23 18:09:25 -05:00
AmateurPotion
2455738f47
Update bundle_ko.properties ( #1379 )
2020-01-23 18:08:47 -05:00
Avevad
c96931a1b9
Update bundle_ru.properties ( #1410 )
2020-01-23 18:07:37 -05:00
GioIacca9
9efff27b77
Updated underflow gate ( #1416 )
...
Translated:
`block.underflow-gate.name` and `block.underflow-gate.description`.
`data.openfolder`
and other minor strings
2020-01-23 18:07:16 -05:00
Anuken
d031efe1f2
Added Steam player limit + reduced votekick cooldown
2020-01-23 17:49:53 -05:00
Anuken
235142c869
Implemented #1093
2020-01-23 15:50:03 -05:00
Anuken
288da868bf
Merged #1406 manually
2020-01-23 14:53:27 -05:00
Vanguard
ed3474f5f0
2 changed lines
...
unit.thousands
unit.millions
2020-01-22 18:56:33 +03:00
Vanguard
33ef1ca804
2 new lines
...
block.underflow-gate.name
block.underflow-gate.description
2020-01-22 18:02:04 +03:00
Anuken
26676d60e1
Added underflow gates
2020-01-20 18:54:25 -05:00
Anuken
c0844304a6
Merge
2020-01-19 11:10:14 -05:00
Anuken
f044f30829
Merge
2020-01-18 11:16:03 -05:00
Anuken
c3d2351b2d
Various icon changes
2020-01-17 13:57:04 -05:00
Anuken
ce18e32826
Added font icon generate+merge pipeline
2020-01-16 17:05:20 -05:00
Anuken
3eaeac3618
Testing icon font
2020-01-16 11:10:53 -05:00
Petr Gašparík
9b663b548b
Czech translation total revision DONE, please merge ( #1344 )
...
* Improving Czech translation, up to line 374 now
* Czech translation, revisited up to line 468
* Translation revision up to line 510.
* Czech translation - small fixes here and there.
* Czech translation - small fixes here and there.
* Czech lang. - Fixed some typos found by @dusekdan
* Czech - revision up to line 564
* Czech tr. - small fixes to fit into GUI
* Czech tr. - small fixes after checking GUI
* Czech tr. - revision up to line 670 done
* Czech tr. - revisited up to line 748.
* Czech tr. - now it has the same length as English
* Czech translation - polished up to line 1062
Only tutorial left...
* Czech translation - small fixes
* Czech tr. - revisited up to line 1070
* Czech translation - revision done up line 1084.
New: tutorial translated, new key incorporated.
* Czech translation done up to line 1100.
* Czech translation up to line 1105
* Czech translation - small corrections, consistency
* Czech translation up to line 1124
* Czech translation - done up to line 1159
* Czech translation up to line 1071
* Czech translation, up to line 1177
* Czech translation, done up to line 1203
* Czech translation REVISION DONE!
2020-01-14 16:00:51 -05:00
Vanguard
4452c1b38a
1 changed line
...
block.cryofluidmixer.description
2020-01-12 23:33:59 +03:00
Vanguard
6243b9fa3a
1 new line
...
data.openfolder
2020-01-12 19:56:30 +03:00
Anuken
bbf87df373
a revelation
2020-01-11 23:41:12 -05:00
Anuken
7e7d2019af
Made Android files external
2020-01-11 19:21:16 -05:00
Vanguard
9f743ce657
Merge branch 'master' into master
2020-01-11 14:44:27 +03:00
Vanguard
e1130bafc8
3 new lines, 2 removed lines
...
New:
setting.bridgeopacity.name
block.liquid-void.name
block.liquid-void.description
Removed:
block.signal
block.editsignal
2020-01-11 14:41:24 +03:00
FranLamark
1d8de2d222
Update bundle_es.properties (NEW!) ( #1352 )
...
(Nuevas cosas agregadas dentro del juego (Por Anuke) y traducidas al español por mi y otros, aparte de un retoque en algunas traducciones con errores/letras de más)
Solo para la versión en español.
(New things added within the game (By Anuke) and translated into Spanish by me and others, apart from a touch-up in some translations with more errors / lyrics)
Only for the Spanish version.
2020-01-10 22:16:06 -05:00
Anuken
e45df98f26
Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# Conflicts:
# core/src/mindustry/graphics/Bloom.java
# gradle.properties
2020-01-10 15:19:07 -05:00
Anuken
f7791a2bb2
Merge; internal changes
2020-01-10 11:30:42 -05:00
GioIacca9
87442853bb
Added setting.bridgeopacity.name ( #1347 )
2020-01-10 11:17:48 -05:00
Artur Quaresma
f183cf1882
Rename bundle_pt.properties to bundle_pt_PT.properties ( #1339 )
...
It´s better since theres is a bundle_pt_BR, and not being confuse for some
2020-01-09 08:56:00 -05:00
J-VdS
9b82333a69
typo ( #1343 )
2020-01-08 17:36:58 -05:00
GioIacca9
08bae1fa15
Updated liquid void name and description ( #1341 )
2020-01-08 16:57:36 -05:00
Anuken
a7cddf97b8
Implemented bridge opacity from #1006
2020-01-08 16:16:19 -05:00
Anuken
8f208920f7
Merged in liquid void
2020-01-08 11:04:12 -05:00
Anuken
1193e18ee1
Updated bundles post-merge
2020-01-08 11:01:12 -05:00
