mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-27 08:00:04 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,739 Commits 4 Branches 160 Tags 2.3 GiB
a234949b8c
Commit Graph

2805 Commits

Author SHA1 Message Date
Anuken
ea3e16ee16 Added water check 2020-03-22 09:44:38 -04:00
Anuken
148abaccd9 Cleanup 2020-03-21 16:40:39 -04:00
TheJaaju
998cc9535e
Update bundle_fi.properties 
Titles
 2020-03-19 22:54:08 +02:00
Anuken
c7bc05f560 Unlock tweaks 2020-03-19 12:45:21 -04:00
Anuken
e9994794aa Sector lock state 2020-03-19 11:29:18 -04:00
laohuaji233
da215425e9
Update bundle_zh_CN.properties 2020-03-19 15:53:38 +08:00
TheJaaju
58a4ec1265
Update bundle_fi.properties 2020-03-18 08:42:16 +02:00
Anuken
436c76fd2f Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/src/mindustry/world/blocks/BuildBlock.java
 2020-03-17 20:03:12 -04:00
TheJaaju
b874eecd5f
Update bundle_fi.properties 
+ translations
 2020-03-18 01:40:29 +02:00
Ali-C-Ila
0d19068219
Update bundle_zh_TW.properties (#1718) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2020-03-17 12:02:56 -04:00
TheJaaju
b0dddb2a7c
Update bundle_fi.properties (#1720) 
added translations and fixed a typo
 2020-03-17 12:02:47 -04:00
Prosta4okua
9d24a47b01
Update bundle_uk_UA.properties 2020-03-17 13:01:31 +02:00
Prosta4okua
bc0104b0cc
Update bundle_uk_UA.properties 2020-03-17 09:31:16 +02:00
Anuken
32ffacf8f6 Added sector deployment UI 2020-03-16 23:09:07 -04:00
Olexandr Nesterenko
567eb1e9dd revert some fix 2020-03-16 16:01:23 +02:00
Olexandr Nesterenko
660e27f002 fix uk 2020-03-16 13:24:18 +02:00
Olexandr Nesterenko
f23177fddc Update uk 2020-03-16 12:12:14 +02:00
Olexandr Nesterenko
9a529fc40b Fix uk translation 2020-03-16 11:54:37 +02:00
Vanguard
11b6ae58d7
1 new line, 1 changed line 
New:
rules.deconstructrefundmultiplier

Changed:
stat.deconstructed
 2020-03-16 00:34:58 +03:00
ma44
ec34e27102
map setting refund (#1709) 2020-03-15 14:02:47 -04:00
Anuken
7e781d9ff8 Bugfixes 2020-03-14 12:29:12 -04:00
laohuaji233
377ac2be90
Update bundle_zh_CN.properties 2020-03-12 22:48:34 +08:00
laohuaji233
9e8dbfdc03
Update bundle_zh_CN.properties 2020-03-12 21:33:26 +08:00
Prosta4okua
7db5d14048
Update bundle_uk_UA.properties 2020-03-12 11:37:54 +02:00
Anuken
06e94b1800 Cleaned up weather class 2020-03-11 10:08:27 -04:00
Aldas
680b2bc6b6
Translated launch.skip.confirm line 2020-03-11 12:12:30 +02:00
Anuken
8550995c4e Fixed compilation 2020-03-10 19:51:31 -04:00
Anuken
930c342fb6 Shader cleanup 2020-03-10 19:48:38 -04:00
Vanguard
c4d3c18dda
Merge branch 'master' into master 2020-03-10 05:44:57 +03:00
Vanguard
424514e037
2 new lines 
schematic.replace
schematic.exists
 2020-03-10 05:39:14 +03:00
Prosta4okua
521f367286
Update bundle_uk_UA.properties 2020-03-09 19:17:32 +02:00
Aldas
b4df9e37d7
Grammar corrections 
grammar corrections
 2020-03-09 18:39:43 +02:00
Anuken
d7f9090c0b Fixed #1672 2020-03-09 09:41:39 -04:00
Anuken
7655b65363 Bugfixes / Fixed #1680 2020-03-06 17:06:21 -05:00
Anuken
a02c7989b4 Bugfixes 2020-03-06 16:10:13 -05:00
Anuken
60d28fb01b Bugfixes 2020-03-06 16:07:07 -05:00
Anuken
f8b554aff8 Fixed some basic crashes 2020-03-06 15:30:51 -05:00
Anuken
73c0ebb75f Fixed most errors in block package 2020-03-06 14:41:38 -05:00
Anuken
89a5c957fd
add mod name to js print() (#1677) 
* add mod name to js print()

* add mod name to errors
 2020-03-05 15:58:10 -05:00
Anuken
0534a4da45
Update bundle_zh_TW.properties (#1665) 2020-03-04 13:53:54 -05:00
Anuken
31c9b61358
Updated join.info (#1666) 2020-03-04 13:53:47 -05:00
Anuken
c7112a706a
Update bundle_uk_UA.properties (#1636) 
* Update bundle_uk_UA.properties

* Update uk metadata

* Update uk bundles

* Update achievemnts
 2020-03-04 13:52:20 -05:00
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
bac1648d4b Added support for changing cached floor/terrain 2020-03-03 17:01:09 -05: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
Anuken
7a01719816 Real-time lighting + solar system rendering 2020-02-29 11:58:10 -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
120d96c775 Sun + dynamic lighting 2020-02-28 13:18:06 -05:00
Anuken
1e53ea50b0 Added support for export/import of all basic terrain as image 2020-02-26 19:37:22 -05:00
Anuken
fdaac290ac Better previews 2020-02-26 14:44:06 -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
Anuken
8b7f439ef5 Unfinished sector selection 2020-02-24 23:03:33 -05:00
DeltaNedas
0c01554a6b
add floatf/p and func to global.js (#1633) 2020-02-24 15:06:33 -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
Anuken
68b9bfe907 Cleanup 2020-02-22 19:30:39 -05:00
Anuken
9788f9b981 Tweaks 2020-02-22 17:28:13 -05:00
Vanguard
5735fba4c7
2 changed lines 
unit.thousands
unit.millions
 2020-02-22 20:21:05 +03:00
Anuken
2afb175560 Generation tweaks 2020-02-22 12:05:31 -05: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
Anuken
4a40172782 Cleaned up bullet sprites 2020-02-22 00:28:03 -05:00
Anuken
baa0eb1149 Added cliffs as separate block 2020-02-21 23:45:25 -05:00
Anuken
6871db7155 Visual tweaks 2020-02-21 22:58:18 -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
Anuken
a5e469e96c Complete planet panning 2020-02-21 13:48:50 -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
Anuken
e215772f30 Added backwards compatibility for legacy saves 2020-02-17 11:13: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
Anuken
024f2d62e2 Planet sector metadata 2020-02-14 20:08:07 -05: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
DeltaNedas
948d184c40
:) 2020-02-12 19:28:54 +00:00
Anuken
5c48ae2158 Fixed #1558 / Fixed #1556 2020-02-12 10:16:43 -05: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
3102931cb4 Removed script wrapper 2020-02-11 17:50:16 -05:00
Anuken
fb302d49c7 Improved battery brightness display / Palette tweak / Diffgen buff 2020-02-11 17:27:33 -05:00
Anuken
a4a3e7fc48
Merge pull request #1514 from Arkanic/patch-7 
make batteries glow based on power contents (a redo that works)
 2020-02-11 16:31:14 -05: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
ae7a8e1f65 Minor tweaks 2020-02-09 14:35:22 -05:00
Anuken
c23e923ffb Merged with master 2020-02-09 12:32:29 -05:00
Anuken
a2706a80b1 Merged with master 2020-02-09 12:27:44 -05:00
Anuken
d45d7f21b6 Procedural scorch marks / Bugfixes 2020-02-09 12:07:36 -05:00
Anuken
8814dbe29a Sprite cleanup / Bullets 2020-02-08 14:48:04 -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
Anuken
33e818a757 Entity name mapping 2020-02-07 09:36:51 -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
Anuken
a11f6efe0a Rudimentary rendering 2020-02-05 23:04:48 -05: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
Arkanic
ce7eccf524 i forgot -base 2020-02-05 18:10:57 +00: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
Arkanic
ff06a005a0 become exist 2020-02-05 00:53:15 +00: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