mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-04 16:09:23 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,522 Commits 4 Branches 160 Tags 2.4 GiB
2a7da8c80e
Commit Graph

1836 Commits

Author SHA1 Message Date
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
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
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
Patrick 'Quezler' Mounier
58a79d8631
Update to v103 
# 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/content/Blocks.java
#	core/src/mindustry/content/TechTree.java
#	core/src/mindustry/world/blocks/distribution/ItemConveyor.java
 2020-01-24 20:25:03 +01: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
Patrick 'Quezler' Mounier
ed765ad10a
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
 2020-01-10 12:02:07 +01: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
Anuken
c04c825cec Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_fr.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/bundles/bundle_nl.properties
#	core/assets/bundles/bundle_pt.properties
#	core/assets/bundles/bundle_ru.properties
#	core/assets/bundles/bundle_zh_TW.properties
 2020-01-08 11:00:19 -05:00
Anuken
5ad09d6d80 Updated bundles with proper spacing 2020-01-08 10:59:29 -05:00
Patrick 'Quezler' Mounier
4a94a6c059 Update dutch localization (#1315) 
* Run gradle tools:updatebundles for nl

* Update 🇳🇱 bundle

Wow this took several hours, didn’t expect that. 🙈

* Implement @TsjipTsjip’s review

* Oops

* 〃

* 〃

* 〃

* 〃

* 〃

* 〃

* 〃
 2020-01-08 10:52:43 -05:00
Valentin Lorentz
379f0b1c71 Fix translation of "silicon" in fr_BE (#1298) 
This was fixed by 3b9980c01e in the fr translation, but not this one.
 2020-01-08 10:52:19 -05:00
Ali-C-Ila
45aa23f94d Update bundle_zh_TW.properties (#1303) 2020-01-08 10:52:07 -05:00
Petr Gašparík
27f396a1e0 Revision of Czech translation [up to line 564]: consistency with English file, terms, grammar, semantics (#1284) 
* 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
 2020-01-08 10:51:48 -05:00
Artur Quaresma
b44aa8e23a Update bundle_pt.properties (#1334) 2020-01-08 10:30:27 -05:00
Alessandro Maurizio
b5d5bb21b1 Fix Steam Achievement italian translation error (#1324) 
* Fix Steam Achievement italian translation error

* Fix wrong Revenant Factory italian description
 2020-01-08 10:30:11 -05:00
itskatt
3cc0990a94 translate (#1311) 2020-01-08 10:22:15 -05:00
Vanguard
2692b60d21 RU updates (#1277) 
* 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
 2020-01-08 10:21:21 -05:00
GioIacca9
3e636b73ce Updated Italian translations (#1297) 
* Update it-IT translation

* Update bundle_it.properties
 2020-01-08 10:21:09 -05:00
Aaron B
24adec99f4 Updated some german translations (#1295) 
block.tar.name = Teer is right, but the only thing you get from tar is oil so why not name it oil?
 2020-01-08 10:20:56 -05:00
Spico (Spirit Guy)
af1b73be69 Update bundle_tr.properties (#1293) 
Fixed Line 418 not appearing at the right colour
 2020-01-08 10:20:21 -05:00
Rasangus
44e745ac37 Update bundle_pt_BR.properties (#1281) 2020-01-07 19:42:48 -05:00
Anuken
3ae8065cf1 Merge 2020-01-06 17:20:16 -05:00
Patrick 'Quezler' Mounier
9b55eeaa38
Rename batches to something simpler 2020-01-06 18:04:56 +01:00
Patrick 'Quezler' Mounier
1a177ef239
Rephase dotted 2020-01-06 18:00:43 +01:00
Patrick 'Quezler' Mounier
207d95dbd8
Refractor away throughput stat 2020-01-06 17:57:14 +01:00
Patrick 'Quezler' Mounier
6b3dc669eb
Merge branch 'master' into crater 2020-01-06 17:37:47 +01:00
Daniel Dušek
9d9e31948d Add - tutorial localized, description coverage++, fix broken translations (#1327) 2020-01-05 17:41:41 -05:00
Patrick 'Quezler' Mounier
c6299c8f2c
Add throughput stat entry 2020-01-05 15:28:28 +01:00
Patrick 'Quezler' Mounier
095c65f36c
Remove crater from bundle 2020-01-04 21:10:09 +01:00
Patrick 'Quezler' Mounier
e2d0ab5161
Move bundle entries around 2020-01-03 17:42:05 +01:00
Patrick 'Quezler' Mounier
73040de839
Change bundle description 2020-01-03 17:41:05 +01:00
Vanguard
2e114d09ea
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
 2020-01-03 07:27:50 +03:00
Patrick 'Quezler' Mounier
f0bfe24008
Remove crater bundle entry 2020-01-02 21:34:56 +01:00
Vanguard
b44b0f9992
3 changed lines 
quit.confirm.tutorial
setting.coreselect.name
public.confirm
 2020-01-01 18:41:21 +03:00
Patrick 'Quezler' Mounier
1bcfc69206
Tweak stat pages 2020-01-01 14:01:54 +01:00
Patrick 'Quezler' Mounier
c3186b63ce
Rename compression to plastanium 
Breaking change.
 2020-01-01 13:43:14 +01:00
Patrick 'Quezler' Mounier
830f67e001
Merge branch 'master' into crater 2019-12-31 17:31:09 +01:00
CinExPL
62947b9417 Update bundle_pl.properties (#1285) 
- reverted back some changes made by @FarmerThanos,
- fixed some errors,
- compared to english file.
 2019-12-30 23:03:46 -05:00
Patrick 'Quezler' Mounier
bf9207fe4e
Merge branch 'master' into crater 2019-12-30 10:55:06 +01:00
FarmerThanos
565064cd64 Updated bundle_pl.properties (#1273) 
* Updated bundle_pl.properties

Corrected some translations, translated some options and added a description to the Battery Diode.

* Update bundle_pl.properties

Reverted some changes
 2019-12-29 18:52:44 -05:00
Petr Gašparík
9d2e356996 Update bundle_cs.properties (#1267) 
Rewamping Czech translation. First part.
 2019-12-29 18:52:06 -05:00
Ali-C-Ila
ae5685ae46 Update bundle_zh_TW.properties (#1263) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2019-12-29 18:51:58 -05:00
Predator127
2b46b0e38e Update bundle_pt_BR.properties (#1253) 
* Update bundle_pt_BR.properties

Hi there! my name is Zero! also known as Hanko, I've translated for a long time since then.
I've been lookin through the new translations since i've been out for quite a long time, but dont think i forgot that i was a translator!

* Update bundle_pt_BR.properties
 2019-12-29 18:51:52 -05:00
GioIacca9
e200dcee33 Update bundle_it.properties (#1240) 2019-12-29 18:51:45 -05:00
PlayerBrasil13
fe63b46b67 Update bundle_pt_BR.properties (#1232) 2019-12-29 18:51:37 -05:00
SpiffyBadGaster
698e83a28a Make translation better (#1222) 
* Make translation better

* Make something better

* Fix that javaline

* Make Translate better

Not finish

* Make Translate better

Not finish
 2019-12-29 18:51:30 -05:00
Prosta4okua
150d0bf513 [WIP]Update bundle_uk_UA.properties (#1220) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* 17.12.2019
 2019-12-29 18:51:22 -05:00
Prosta4okua
5af7cd1d55 Update bundle_uk_UA.properties (#1275) 2019-12-29 18:50:59 -05:00
Vanguard
616867b4b9
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
 2019-12-30 02:47:49 +03:00
Patrick 'Quezler' Mounier
20a511d940
Merge branch 'master' into crater 2019-12-29 20:50:55 +01:00
Anuken
6edcbb9120 Bugfixes 2019-12-29 14:38:03 -05:00
Patrick 'Quezler' Mounier
326f75cbda
Merge branch 'master' into crater 2019-12-29 19:09:27 +01:00
Anuken
730d30ef98 Added core schematic selection setting 2019-12-29 11:40:52 -05:00
Anuken
8c941c7165 Added update trigger / Server moddability tweaks 2019-12-28 21:34:20 -05:00
Anuken
16ddb91466 Merge remote-tracking branch 'origin/master' 2019-12-28 16:30:46 -05:00
Anuken
e1bf8bdab1 Added BE auto-updater / Server config / Fixed #1266 2019-12-28 16:30:40 -05:00
AmateurPotion
d43b40fab5 Update bundle_ko.properties (#1262) 2019-12-28 11:21:55 -05:00
Patrick 'Quezler' Mounier
e0cfbc7609
All hail the cuteness of this crater roomba critter 2019-12-27 20:45:27 +01:00
Anuken
186a2aaa45 Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework 
# 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/ai/BlockIndexer.java
#	core/src/mindustry/core/World.java
#	core/src/mindustry/entities/traits/Entity.java
#	core/src/mindustry/entities/type/BaseEntity.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/world/blocks/defense/MendProjector.java
#	core/src/mindustry/world/blocks/defense/OverdriveProjector.java
#	core/src/mindustry/world/blocks/production/Drill.java
#	gradle.properties
 2019-12-27 01:41:06 -05:00
Anuken
32d28a4070 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/ctype/ContentType.java
#	core/src/io/anuke/mindustry/ctype/UnlockableContent.java
#	core/src/io/anuke/mindustry/io/LegacyMapIO.java
#	core/src/io/anuke/mindustry/type/WeatherEvent.java
#	gradle.properties
 2019-12-24 12:40:23 -05:00
Vanguard
341121f655
1 changed line 
block.mass-driver.description
 2019-12-24 14:01:38 +03:00
Ali-C-Ila
ba7cf94a6b Update bundle_zh_TW.properties (#1211) 
* 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
 2019-12-22 12:01:27 -05:00
Vanguard
01de18b663 RU updates (#1225) 
* 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
 2019-12-22 12:01:03 -05:00
Wina
41a5c4daf3 Updated Spanish translation (#1227) 
Translated a few items more and fixed gramatical mistakes of the old translation.
 2019-12-22 11:20:59 -05:00
stuffyAI
07e58dc14b Update german language bundle (#1226) 
Mostly adding new things to translate from last few updates, also some missing stuff
 2019-12-22 11:13:38 -05:00
Vanguard
196f37eff1
1 changed line 
item.graphite.description
 2019-12-22 15:27:39 +03:00
Anuken
ede002878e
problem solved 2019-12-21 21:11:30 -08:00
Vanguard
2e110bff20
1 new line 
link.feathub.description
 2019-12-20 18:20:07 +03:00
ado1928
5e568eac0d Added Feathub to the "About" tab (#1234) 
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update Links.java
 2019-12-19 19:33:24 -05:00
Vanguard
f5b21c954e
Merge branch 'master' into master 2019-12-18 13:22:37 +03:00
Vanguard
040f3d0254
2 changed lines 
mods.guide
mod.import.github
 2019-12-18 13:19:33 +03:00
Vanguard
f2687e4a1a
3 new lines, 3 changed lines 
New:
mod.erroredcontent
mod.errors
mod.noerrorplay

Changed:
mod.requiresversion
mod.remove.confirm
details
 2019-12-17 21:27:48 +03:00
Anuken
3cefc085bd Tentative RU bundle changes 2019-12-15 22:11:07 -05:00
Anuken
976d0f54b3 Merge branches 'master' and 'safe-mod-loading' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/mod/Mods.java
 2019-12-15 13:55:30 -05:00
Anuken
1c1db3990f Fully implemented safe content loading 2019-12-15 13:54:51 -05:00
Vanguard
17ae17dced
1 changed line 
tutorial.intro
 2019-12-15 16:15:51 +03:00
Anuken
58e3143e2a Content cleaning 2019-12-14 09:33:07 -05:00
TsjipTsjip
71eb19d4f3
Update core/assets/bundles/bundle_fr.properties 
Co-Authored-By: YaFou <33806646+YaFou@users.noreply.github.com>
 2019-12-14 11:12:12 +01:00
TsjipTsjip
472069855c
Apply French localization. 2019-12-13 19:33:34 +01:00
Vanguard
601f6af3c8
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
 2019-12-13 19:10:59 +03:00
TsjipTsjip
7f5e494709
Update bundle.properties 2019-12-13 14:52:15 +01:00
Anuken
7b1a0a42d4
Merge pull request #1206 from joshuaptfan/zoom-no-hold 
Make scroll zoom by default, remove zoom hold keybind
 2019-12-12 18:35:29 -05:00
Anuken
8c1c54d49a
Merge pull request #1207 from Prosta4okua/master 
1 new line
 2019-12-12 16:31:04 -05:00
Vanguard
e22f853a31
1 new line 
mod.scripts.unsupported
 2019-12-13 00:08:23 +03:00
Anuken
c68eaade94
Merge pull request #1204 from Prosta4okua/master 
Ukrainian translation.
 2019-12-12 16:07:29 -05:00
Anuken
1461b5b357
Merge pull request #1205 from Prosta4okua/patch-2 
True Ukrainian translation
 2019-12-12 16:07:05 -05:00
Anuken
f0dd3b3a39
Merge pull request #1109 from ballgamer56/patch-1 
Thai translation
 2019-12-12 15:54:50 -05:00
Prosta4okua
d60c2c5b63
Merge branch 'master' into patch-2 2019-12-12 22:40:30 +02:00
Prosta4okua
7e696cadaf
Update bundle_uk_UA.properties 2019-12-12 22:36:54 +02:00
Anuken
0f23bf9d08
Merge pull request #1156 from martin-mfg/master 
add and fix some German translations
 2019-12-12 15:34:44 -05:00
Anuken
202d79817a
Merge pull request #1149 from itskatt/french-translation 
Update the French Translation
 2019-12-12 15:34:06 -05:00
joshuaptfan
736737f151 Make scroll zoom by default, remove zoom hold keybind 2019-12-12 12:23:32 -08:00
AmateurPotion
fed4842222
Update bundle_ko.properties 2019-12-12 21:48:38 +09:00
Anuken
6f3d585118
Merge pull request #1183 from GioIacca9/patch-2 
Update bundle_it.properties
 2019-12-11 14:24:37 -05:00
Anuken
962ce7bfa6
Merge pull request #1187 from AmateurPotion/patch-22 
Update bundle_ko.properties
 2019-12-11 14:24:24 -05:00
Anuken
b6ee157adb
Update bundle_zh_TW.properties (#1190) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2019-12-11 14:24:15 -05:00
TsjipTsjip
a45a632726 Update bundle_nl_BE.properties (#1194) 2019-12-11 14:24:07 -05:00
Atan599
f6b9830f82 Update bundle_cs.properties (#1192) 2019-12-11 10:51:34 -05:00
Ali-C-Ila
a2382965f6
Update bundle_zh_TW.properties 2019-12-10 20:17:55 +08:00
Ali-C-Ila
09dbee1401
Update bundle_zh_TW.properties 2019-12-10 20:09:21 +08:00
AmateurPotion
83a3195e34
Update bundle_ko.properties 2019-12-10 10:26:40 +09:00
AmateurPotion
8148f2a0f7
Update bundle_ko.properties 2019-12-10 10:25:42 +09:00
Anuken
0078a8cb8e Fixed scripts not working on older Android phones 2019-12-09 12:48:15 -05:00
GioIacca9
98a083abdd
Update bundle_it.properties 2019-12-08 15:49:03 +01:00